Merge branch 'feat/add-ccs-sdks' of https://github.com/microsoftgraph/MSGraph-SDK-Code-Generator into feat/add-ccs-sdks

Author: musale

.azure-pipelines/generation-pipeline.yml

@@ -845,6 +845,7 @@ stages:
         customArguments: "-b -i '**/copilot/**'" # Enable the backing store, include only copilot paths
         cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
         pathExclusionArguments: ''
+        isCopilotGeneration: true
         languageSpecificSteps:
         - template: generation-templates/dotnet-kiota.yml
           parameters:
@@ -878,6 +879,7 @@ stages:
         cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
         commitMessagePrefix: "feat(generation): update request builders and models"
         pathExclusionArguments: ''
+        isCopilotGeneration: true
         languageSpecificSteps:
         - template: generation-templates/python.yml
           parameters:
@@ -911,6 +913,7 @@ stages:
         customArguments: "-b -i '**/copilot/**'" # Enable the backing store, include only copilot paths
         cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
         pathExclusionArguments: ''
+        isCopilotGeneration: true
         languageSpecificSteps:
         - template: generation-templates/ccs-typescript-sdk.yml
           parameters:

.azure-pipelines/generation-templates/ccs-typescript-sdk.yml

@@ -1,7 +1,13 @@
 parameters:
   - name: repoName
     type: string
+  - name: packageName
+    type: string
+    default: '@microsoft/copilot-beta-sdk'
 
 steps:
-  - pwsh: '$(scriptsDirectory)/copy-ccs-typescript-sdk-models.ps1 -sourceDirectory "$(kiotaDirectory)/output/" -targetDirectory "$(Build.SourcesDirectory)/${{ parameters.repoName }}/packages/"'
+  - pwsh: '$(scriptsDirectory)/clean-typescript-files.ps1 -targetDirectory "$(Build.SourcesDirectory)/${{ parameters.repoName }}/packages/" -packageName "${{ parameters.packageName }}"'
+    displayName: 'Remove generated models and requests from the repo folder'
+
+  - pwsh: '$(scriptsDirectory)/copy-ccs-typescript-sdk-models.ps1 -sourceDirectory "$(kiotaDirectory)/output/*" -targetDirectory "$(Build.SourcesDirectory)/${{ parameters.repoName }}/packages/"'
     displayName: "Update models"

.azure-pipelines/generation-templates/language-generation-kiota.yml

@@ -40,6 +40,10 @@ parameters:
   type: boolean
   displayName: Generate PR after publish changes?
 
+- name: isCopilotGeneration
+  default: false
+  type: boolean
+
 - name: customArguments
   type: string
   default: ''
@@ -60,6 +64,7 @@ steps:
 - template: set-up-for-generation-kiota.yml
   parameters:
     cleanMetadataFolder: ${{ parameters.cleanMetadataFolder }}
+    isCopilotGeneration: ${{ parameters.isCopilotGeneration }}
     downloadSteps:
     - template: download-kiota.yml
 

.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml

@@ -6,6 +6,8 @@ parameters:
     default:
     - pwsh: |
         Write-Error "No download step is provided"
+  - name: isCopilotGeneration
+    type: boolean
 
 steps:
 - template: set-user-config.yml
@@ -23,13 +25,29 @@ steps:
   submodules: recursive
   condition: or(eq(variables.skipMetadataCaptureAndClean, true), eq(variables.skipOpenApiCaptureAndClean, true))
 
+- checkout: ccs-beta-sdk-dotnet
+  displayName: checkout ccs-beta-sdk-dotnet to grab the openapi.yaml
+  fetchDepth: 1
+  persistCredentials: true
+  submodules: recursive
+  condition: ${{ eq(parameters.isCopilotGeneration, true) }}
+
+- pwsh: |
+    md $(Build.SourcesDirectory)/msgraph-metadata/clean_v10_openapi
+    md $(Build.SourcesDirectory)/msgraph-metadata/clean_beta_openapi
+    Copy-Item -Path $(Build.SourcesDirectory)/ccs-beta-sdk-dotnet/openApiDocs/ccs-beta-review-openapi.yml -Destination $(Build.SourcesDirectory)/msgraph-metadata/clean_v10_openapi/openapi.yaml
+    Copy-Item -Path $(Build.SourcesDirectory)/ccs-beta-sdk-dotnet/openApiDocs/ccs-beta-review-openapi.yml -Destination $(Build.SourcesDirectory)/msgraph-metadata/clean_beta_openapi/openapi.yaml
+  displayName: Move Custom CCS metadata to expected location
+  condition: ${{ eq(parameters.isCopilotGeneration, true) }}
+
+
 - pwsh: |
     md $(Build.SourcesDirectory)/msgraph-metadata/clean_v10_openapi
     md $(Build.SourcesDirectory)/msgraph-metadata/clean_beta_openapi
     Move-Item -Path $(Build.SourcesDirectory)/msgraph-metadata/openapi/v1.0/openapi.yaml -Destination $(Build.SourcesDirectory)/msgraph-metadata/clean_v10_openapi/
     Move-Item -Path $(Build.SourcesDirectory)/msgraph-metadata/openapi/beta/openapi.yaml -Destination $(Build.SourcesDirectory)/msgraph-metadata/clean_beta_openapi/
   displayName: Move metadata to expected location
-  condition: or(eq(variables.skipMetadataCaptureAndClean, true), eq(variables.skipOpenApiCaptureAndClean, true))
+  condition: and(or(eq(variables.skipMetadataCaptureAndClean, true), eq(variables.skipOpenApiCaptureAndClean, true)), ${{ eq(parameters.isCopilotGeneration, false) }})
 
 # if capture and clean step is not skipped
 # then download the artifact from capture and clean steps
@@ -41,5 +59,5 @@ steps:
     downloadType: 'single'
     artifactName: ${{ parameters.cleanMetadataFolder }}
     downloadPath: '$(Build.SourcesDirectory)/msgraph-metadata'
-  condition: and(eq(variables.skipMetadataCaptureAndClean, false), eq(variables.skipOpenApiCaptureAndClean, false))
+  condition: and(eq(variables.skipMetadataCaptureAndClean, false), eq(variables.skipOpenApiCaptureAndClean, false), ${{ eq(parameters.isCopilotGeneration, false) }})
   displayName: Downloading metadata from artifacts

scripts/copy-ccs-typescript-sdk-models.ps1

@@ -12,4 +12,4 @@ param (
 Write-Host "Path to repo models directory: $targetDirectory"
 $mainPackageDirectoryName = $packageName.Split("/")[1]
 $modelsPackagePath = Join-Path $targetDirectory -ChildPath $mainPackageDirectoryName
-Copy-Item (Join-Path $sourceDirectory -ChildPath "models") -Destination $modelsPackagePath -Recurse -Force
+Copy-Item $sourceDirectory -Destination $modelsPackagePath -Recurse -Force

src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj

@@ -36,7 +36,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Inflector.NetStandard" Version="1.2.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Mono.TextTemplating">
       <Version>3.0.0</Version>

test/Typewriter.Test/Typewriter.Test.csproj

@@ -42,7 +42,7 @@
       <Version>4.3.2</Version>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
-      <Version>4.6.0</Version>
+      <Version>5.0.0</Version>
     </PackageReference>
   </ItemGroup>
 </Project>