From c1d8f634f32e49453fb900286ceb6e738dbbf6af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Jan 2025 03:48:05 +0000 Subject: [PATCH 1/3] chore(deps): bump MSTest.TestAdapter from 3.6.4 to 3.7.1 Bumps [MSTest.TestAdapter](https://github.com/microsoft/testfx) from 3.6.4 to 3.7.1. - [Release notes](https://github.com/microsoft/testfx/releases) - [Changelog](https://github.com/microsoft/testfx/blob/main/docs/Changelog.md) - [Commits](https://github.com/microsoft/testfx/compare/v3.6.4...v3.7.1) --- updated-dependencies: - dependency-name: MSTest.TestAdapter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../GraphODataTemplateWriter.Test.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj b/GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj index adf631dbd..5ab1c034e 100644 --- a/GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj +++ b/GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj @@ -18,7 +18,7 @@ - 3.6.4 + 3.7.1 3.6.4 From 31c9265b7f4260d9ef9dd298a4a639071018efa1 Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Tue, 21 Jan 2025 14:27:57 +0300 Subject: [PATCH 2/3] Fix SDK generation --- .../generation-templates/build-and-publish-kiota.yml | 2 ++ .../generation-templates/set-up-for-generation-kiota.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.azure-pipelines/generation-templates/build-and-publish-kiota.yml b/.azure-pipelines/generation-templates/build-and-publish-kiota.yml index e33ce0e71..fffe6d5ca 100644 --- a/.azure-pipelines/generation-templates/build-and-publish-kiota.yml +++ b/.azure-pipelines/generation-templates/build-and-publish-kiota.yml @@ -1,5 +1,7 @@ steps: - template: use-dotnet-sdk.yml + parameters: + version: "9.x" #kiota uses a net9 target - checkout: kiota displayName: checkout kiota diff --git a/.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml b/.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml index 6956a81a9..62b8eb9e5 100644 --- a/.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml +++ b/.azure-pipelines/generation-templates/set-up-for-generation-kiota.yml @@ -10,6 +10,8 @@ parameters: steps: - template: set-user-config.yml - template: use-dotnet-sdk.yml + parameters: + version: "9.x" #kiota uses a net9 target - ${{ parameters.downloadSteps }} From ce225b359f2c4bc9ced50fdd6e0fc25c0c02f257 Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Tue, 21 Jan 2025 14:34:10 +0300 Subject: [PATCH 3/3] fix: use the net9 binaries for the generation phase. --- .../generation-templates/build-and-publish-kiota.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/generation-templates/build-and-publish-kiota.yml b/.azure-pipelines/generation-templates/build-and-publish-kiota.yml index fffe6d5ca..3cbf74aad 100644 --- a/.azure-pipelines/generation-templates/build-and-publish-kiota.yml +++ b/.azure-pipelines/generation-templates/build-and-publish-kiota.yml @@ -12,7 +12,7 @@ steps: - task: CopyFiles@2 inputs: - sourceFolder: '$(Build.SourcesDirectory)/src/kiota/bin/$(BuildConfiguration)/net8.0' + sourceFolder: '$(Build.SourcesDirectory)/src/kiota/bin/$(BuildConfiguration)/net9.0' contents: '**/*' targetFolder: '$(Build.ArtifactStagingDirectory)' displayName: Copy Kiota executable