Merge branch 'dev' into feat/add-ccs-sdks

Author: musale

.azure-pipelines/generation-pipeline.yml

@@ -43,11 +43,6 @@ resources:
      endpoint: microsoftgraph (22)
      name: microsoftgraph/msgraph-beta-typescript-typings
      ref: main
-   - repository: msgraph-sdk-objc-models
-     type: github
-     endpoint: microsoftgraph (22)
-     name: microsoftgraph/msgraph-sdk-objc-models
-     ref: dev
    - repository: msgraph-sdk-java
      type: github
      endpoint: microsoftgraph (22)
@@ -73,11 +68,6 @@ resources:
      endpoint: microsoftgraph (22)
      name: microsoftgraph/msgraph-sdk-ruby
      ref: main
-   - repository: msgraph-beta-sdk-ruby
-     type: github
-     endpoint: microsoftgraph (22)
-     name: microsoftgraph/msgraph-beta-sdk-ruby
-     ref: main
    - repository: msgraph-sdk-typescript
      type: github
      endpoint: microsoftgraph (22)
@@ -418,35 +408,6 @@ stages:
             repoName: msgraph-sdk-ruby
             barrelFileName: microsoft_graph.rb
 
-- stage: stage_ruby_beta
-  dependsOn:
-  - stage_build_and_publish_kiota
-  - stage_beta_openapi
-  condition: |
-    and
-    (
-      eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'),
-      in(dependencies.stage_beta_openapi.result, 'Succeeded', 'Skipped')
-    )
-  jobs:
-  - job: ruby_beta
-    steps:
-    - template: generation-templates/language-generation-kiota.yml
-      parameters:
-        language: 'ruby'
-        version: 'beta'
-        repoName: 'msgraph-beta-sdk-ruby'
-        branchName: $(betaBranch)
-        targetClassName: "GraphBaseServiceClient"
-        targetNamespace: "MicrosoftGraphBeta"
-        cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
-        customArguments: "-e '/me' -e '/me/**'" # Exclude me
-        languageSpecificSteps:
-        - template: generation-templates/ruby.yml
-          parameters:
-            repoName: msgraph-beta-sdk-ruby
-            barrelFileName: microsoft_graph_beta.rb
-
 - stage: stage_java_v1_kiota
   dependsOn:
   - stage_build_and_publish_kiota

.azure-pipelines/generation-templates/capture-metadata.yml

@@ -52,7 +52,10 @@ steps:
 
 - template: download-typewriter.yml
 
+# required for typewriter
 - template: use-dotnet-sdk.yml
+  parameters:
+    version: '8.x'
 
 ## Only run if the previous step was successful
 - pwsh: '$(scriptsDirectory)/run-typewriter-clean-metadata.ps1'
@@ -113,7 +116,13 @@ steps:
 
 # Use the clean metadata from the last step to generate DotNet files.
 
+# required for the hidi installation validation
 - template: use-dotnet-sdk.yml
+  parameters:
+    version: '9.x'
+
+- pwsh: dotnet tool install -g Microsoft.OpenApi.Hidi
+  displayName: 'Install hidi tool'
 
 # verify that generated metadata is parsable as an Edm model
 - pwsh: $(Build.SourcesDirectory)/msgraph-metadata/scripts/run-metadata-validation.ps1 -repoDirectory "$(Build.SourcesDirectory)/msgraph-metadata/" -version "${{ parameters.endpoint }}"

.azure-pipelines/generation-templates/capture-openapi.yml

@@ -61,7 +61,16 @@ jobs:
     persistCredentials: true
 
   - template: checkout-metadata.yml
+
+  # required for the hidi to run
+  - template: use-dotnet-sdk.yml
+    parameters:
+      version: '8.x'
+
+  # required for the hidi installation validation
   - template: use-dotnet-sdk.yml
+    parameters:
+      version: '9.x'
 
   - pwsh: dotnet tool install --global Microsoft.OpenApi.Hidi
     displayName: install hidi

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

@@ -7,18 +7,17 @@ parameters:
     default: Microsoft.Graph
 
 steps:
-- pwsh: '$(scriptsDirectory)/copy-dotnet-models-kiota.ps1'
-  displayName: 'Update models'
-  env:
-    BuildConfiguration: $(buildConfiguration)
-    OutputFullPath: $(kiotaDirectory)/output/*
-    RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/${{ parameters.packageName }}/Generated/
+  - pwsh: "$(scriptsDirectory)/copy-dotnet-models-kiota.ps1"
+    displayName: "Update models"
+    env:
+      BuildConfiguration: $(buildConfiguration)
+      OutputFullPath: $(kiotaDirectory)/output/*
+      RepoModelsDir: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/${{ parameters.packageName }}/Generated/
 
-- pwsh: 'dotnet restore'
-  displayName: Restore dependencies for ${{ parameters.repoName }}
-  workingDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}
-
-- pwsh: 'dotnet build --configuration $(buildConfiguration) -f netstandard2.0 --no-restore'
-  displayName: Build dll for ${{ parameters.repoName }}
-  workingDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/${{ parameters.packageName }}/
+  - pwsh: "dotnet restore"
+    displayName: Restore dependencies for ${{ parameters.repoName }}
+    workingDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}
 
+  - pwsh: "dotnet build --configuration $(buildConfiguration) -f netstandard2.0 --no-restore"
+    displayName: Build dll for ${{ parameters.repoName }}
+    workingDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src/${{ parameters.packageName }}/

.azure-pipelines/generation-templates/objc.yml

@@ -16,12 +16,12 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="MSTest.TestAdapter">
       <Version>3.8.3</Version>
     </PackageReference>
     <PackageReference Include="MSTest.TestFramework">
-      <Version>3.8.2</Version>
+      <Version>3.8.3</Version>
     </PackageReference>
   </ItemGroup>
 </Project>

GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj

@@ -44,7 +44,7 @@
     <PackageReference Include="NLog.Config">
       <Version>4.7.15</Version>
     </PackageReference>
-    <PackageReference Include="System.CodeDom" Version="8.0.0" />
+    <PackageReference Include="System.CodeDom" Version="9.0.4" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
   </ItemGroup>

apidoctor

@@ -17,16 +17,16 @@
       <Version>2.9.1</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="9.0.3" />
     <PackageReference Include="Nito.AsyncEx">
       <Version>5.1.2</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>5.3.4</Version>
+      <Version>5.4.0</Version>
     </PackageReference>
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>