Merge pull request #1078 from microsoftgraph/dev

Merge dev to main

Author: andrueastman

.azure-pipelines/generation-pipeline.yml

@@ -806,7 +806,7 @@ stages:
         - template: generation-templates/cli-kiota.yml
           parameters:
             repoName: msgraph-cli
-            projectFile: ./msgraph-cli.csproj
+            projectFile: src/msgraph-cli.csproj
 
 - stage: stage_cli_beta_kiota
   dependsOn:
@@ -836,7 +836,7 @@ stages:
         - template: generation-templates/cli-kiota.yml
           parameters:
             repoName: msgraph-beta-cli
-            projectFile: ./msgraph-beta-cli.csproj
+            projectFile: src/msgraph-beta-cli.csproj
 
 # - stage: stage_objc_v1
 #   dependsOn:

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

@@ -23,9 +23,9 @@ steps:
   inputs:
     command: restore
     includeNuGetOrg: true
-    workingDirectory: $(Build.SourcesDirectory)/${{ parameters.repoName }}
     restoreArguments: --use-lock-file --locked-mode ${{parameters.extraRestoreArgs}}
     restoreDirectory: ${{parameters.restorePath}}
+    projects: $(Build.SourcesDirectory)/${{ parameters.repoName }}/${{ parameters.projectFile }}
 
 - pwsh: 'dotnet build --configuration $(buildConfiguration) --no-restore ${{ parameters.restorePath }} --runtime linux-x64'
   displayName: Build project ${{ parameters.repoName }}

.github/workflows/dotnet.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Setup .NET

GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj

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

apidoctor

@@ -26,7 +26,7 @@
       <Version>5.1.2</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>5.2.3</Version>
+      <Version>5.2.4</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.7.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
     <PackageReference Include="NUnit">
       <Version>3.13.3</Version>
     </PackageReference>