Merge pull request #1065 from microsoftgraph/dev

Merge dev to main

Author: andrueastman

.azure-pipelines/generation-pipeline.yml

@@ -98,6 +98,11 @@ resources:
      endpoint: microsoftgraph
      name: microsoftgraph/msgraph-cli
      ref: main
+   - repository: msgraph-beta-cli
+     type: github
+     endpoint: microsoftgraph
+     name: microsoftgraph/msgraph-beta-cli
+     ref: main
    - repository: msgraph-metadata
      type: github
      endpoint: microsoftgraph
@@ -492,7 +497,7 @@ stages:
         targetClassName: "BaseGraphServiceClient"
         targetNamespace: "com.Microsoft.Graph"
         cleanMetadataFolder: $(cleanOpenAPIFolderV1)
-        customArguments: "-e '/me' -e '/me/**'" # Exclude /me 
+        customArguments: "-e '/me' -e '/me/**'" # Exclude /me
         languageSpecificSteps:
         - template: generation-templates/java-kiota.yml
           parameters:
@@ -738,7 +743,7 @@ stages:
         branchName: $(v1Branch)
         targetClassName: "BaseGraphServiceClient"
         targetNamespace: "msgraph.generated"
-        customArguments: "-e '/me' -e '/me/**'" # Exclude me
+        customArguments: "-b -e '/me' -e '/me/**'" # Enable backing store, Exclude me
         cleanMetadataFolder: $(cleanOpenAPIFolderV1)
         languageSpecificSteps:
         - template: generation-templates/python.yml
@@ -766,7 +771,7 @@ stages:
         branchName: $(betaBranch)
         targetClassName: "BaseGraphServiceClient"
         targetNamespace: "msgraph.generated"
-        customArguments: "-e '/me' -e '/me/**'" # Exclude me
+        customArguments: "-b -e '/me' -e '/me/**'" # Enable backing store, Exclude me
         cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
         languageSpecificSteps:
         - template: generation-templates/python.yml
@@ -788,7 +793,7 @@ stages:
     steps:
     - template: generation-templates/language-generation-kiota.yml
       parameters:
-        language: 'shell'
+        language: 'cli'
         version: ''
         repoName: 'msgraph-cli'
         baseBranchName : 'main'
@@ -801,6 +806,37 @@ stages:
         - template: generation-templates/cli-kiota.yml
           parameters:
             repoName: msgraph-cli
+            projectFile: ./msgraph-cli.csproj
+
+- stage: stage_cli_beta_kiota
+  dependsOn:
+  - stage_build_and_publish_kiota
+  - stage_beta_openapi
+  condition: |
+    and
+    (
+      eq(dependencies.stage_build_and_publish_kiota.result, 'Succeeded'),
+      eq(dependencies.stage_beta_openapi.result, 'Succeeded')
+    )
+  jobs:
+  - job: cli_beta_kiota
+    steps:
+    - template: generation-templates/language-generation-kiota.yml
+      parameters:
+        language: 'cli'
+        version: ''
+        repoName: 'msgraph-cli'
+        baseBranchName : 'main'
+        branchName: 'kiota/$(betaBranch)'
+        targetClassName: "GraphClient"
+        targetNamespace: "ApiSdk"
+        customArguments: "-e '/me' -e '/me/**'"
+        cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
+        languageSpecificSteps:
+        - template: generation-templates/cli-kiota.yml
+          parameters:
+            repoName: msgraph-beta-cli
+            projectFile: ./msgraph-beta-cli.csproj
 
 # - stage: stage_objc_v1
 #   dependsOn:

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

@@ -4,6 +4,9 @@ parameters:
   - name: restorePath
     type: string
     default:
+  - name: projectFile
+    type: string
+    default:
   - name: extraRestoreArgs
     type: string
     default:
@@ -24,6 +27,6 @@ steps:
     restoreArguments: --use-lock-file --locked-mode ${{parameters.extraRestoreArgs}}
     restoreDirectory: ${{parameters.restorePath}}
 
-- pwsh: 'dotnet build --configuration $(buildConfiguration) --no-restore ./msgraph-cli.csproj --runtime linux-x64'
+- pwsh: 'dotnet build --configuration $(buildConfiguration) --no-restore ${{ parameters.restorePath }} --runtime linux-x64'
   displayName: Build project ${{ parameters.repoName }}
   workingDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}/src

GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj

@@ -16,7 +16,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="MSTest.TestAdapter">
       <Version>3.1.1</Version>
     </PackageReference>

apidoctor

@@ -51,7 +51,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Inflector.NetStandard" Version="1.2.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Mono.TextTemplating">
       <Version>2.3.1</Version>

src/GraphODataTemplateWriter/GraphODataTemplateWriter.csproj

@@ -26,7 +26,7 @@
       <Version>5.1.2</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>5.2.2</Version>
+      <Version>5.2.3</Version>
     </PackageReference>
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>

src/Typewriter/Typewriter.csproj

@@ -55,7 +55,7 @@
     <ProjectReference Include="..\..\Templates\Templates.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="NUnit">
       <Version>3.13.3</Version>
     </PackageReference>