From c44bf34eb48ec78fafa68c1fef05fa33c249555d Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Wed, 13 Nov 2024 10:26:36 +0300 Subject: [PATCH 1/3] feat: support for net9.0 --- .azure-pipelines/ci-build.yml | 4 ++-- .github/workflows/build-and-test.yml | 6 +++--- .github/workflows/sonarcloud.yml | 6 +++--- CHANGELOG.md | 6 ++++++ Directory.Build.props | 2 +- src/abstractions/Microsoft.Kiota.Abstractions.csproj | 2 +- .../azure/Microsoft.Kiota.Authentication.Azure.csproj | 2 +- .../Microsoft.Kiota.Http.HttpClientLibrary.csproj | 4 ++-- .../json/Microsoft.Kiota.Serialization.Json.csproj | 2 +- tests/Directory.Build.props | 2 +- .../Microsoft.Kiota.Trimming.Validation.csproj | 4 ++-- 11 files changed, 23 insertions(+), 17 deletions(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index 45d360f7..d820b824 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -44,7 +44,7 @@ extends: - task: UseDotNet@2 displayName: 'Use .NET 8' inputs: - version: 8.x + version: 9.x - task: PowerShell@2 displayName: 'Enable signing' @@ -84,7 +84,7 @@ extends: inputs: command: test projects: '$(Build.SourcesDirectory)\Microsoft.Kiota.sln' - arguments: '--configuration $(BuildConfiguration) --no-build --framework net8.0' + arguments: '--configuration $(BuildConfiguration) --no-build --framework net9.0' - task: EsrpCodeSigning@5 displayName: 'ESRP DLL Strong Name' diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index f9bf65fc..c9278be2 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 8.x + dotnet-version: 9.x - name: Initialize CodeQL uses: github/codeql-action/init@v3 with: @@ -35,7 +35,7 @@ jobs: run: dotnet build ${{ env.solutionName }} --no-restore /p:UseSharedCompilation=false - name: Test for net462 run: dotnet test ${{ env.solutionName }} --no-build --verbosity normal --framework net462 - - name: Test for net8.0 and collect coverage - run: dotnet test ${{ env.solutionName }} --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=opencover --framework net8.0 + - name: Test for net9.0 and collect coverage + run: dotnet test ${{ env.solutionName }} --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=opencover --framework net9.0 - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index f11beac3..bb242f2d 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -43,7 +43,7 @@ jobs: with: # At the moment the scanner requires dotnet 5 https://www.nuget.org/packages/dotnet-sonarscanner dotnet-version: | 5.x - 8.x + 9.x - uses: actions/checkout@v4 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis @@ -62,8 +62,8 @@ jobs: CoverletOutputFormat: "opencover" # https://github.com/microsoft/vstest/issues/4014#issuecomment-1307913682 shell: pwsh run: | - dotnet tool run dotnet-sonarscanner begin /k:"microsoft_kiota-abstractions-dotnet" /o:"microsoft" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="tests/abstractions/coverage.net8.0.opencover.xml,tests/authentication/azure/coverage.net8.0.opencover.xml,tests/http/httpClient/coverage.net8.0.opencover.xml,tests/serialization/json/coverage.net8.0.opencover.xml,tests/serialization/text/coverage.net8.0.opencover.xml,tests/serialization/form/coverage.net8.0.opencover.xml,tests/serialization/multipart/coverage.net8.0.opencover.xml,tests/bundle/coverage.net8.0.opencover.xml" + dotnet tool run dotnet-sonarscanner begin /k:"microsoft_kiota-abstractions-dotnet" /o:"microsoft" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="tests/abstractions/coverage.net9.0.opencover.xml,tests/authentication/azure/coverage.net8.0.opencover.xml,tests/http/httpClient/coverage.net8.0.opencover.xml,tests/serialization/json/coverage.net8.0.opencover.xml,tests/serialization/text/coverage.net8.0.opencover.xml,tests/serialization/form/coverage.net8.0.opencover.xml,tests/serialization/multipart/coverage.net8.0.opencover.xml,tests/bundle/coverage.net8.0.opencover.xml" dotnet workload restore dotnet build - dotnet test Microsoft.Kiota.sln --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --framework net8.0 + dotnet test Microsoft.Kiota.sln --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --framework net9.0 dotnet tool run dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f5f00d1..754e90a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.15.0] - 2024-11-13 + +### Added + +- Added support for `net9.0`. + ## [1.14.0] - 2024-11-06 ### Added diff --git a/Directory.Build.props b/Directory.Build.props index a0dfeef6..c3fc775a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 1.14.0 + 1.15.0 false diff --git a/src/abstractions/Microsoft.Kiota.Abstractions.csproj b/src/abstractions/Microsoft.Kiota.Abstractions.csproj index 7db14fc5..84eff2f3 100644 --- a/src/abstractions/Microsoft.Kiota.Abstractions.csproj +++ b/src/abstractions/Microsoft.Kiota.Abstractions.csproj @@ -19,6 +19,6 @@ - + diff --git a/src/authentication/azure/Microsoft.Kiota.Authentication.Azure.csproj b/src/authentication/azure/Microsoft.Kiota.Authentication.Azure.csproj index cde2cebd..8925ac3c 100644 --- a/src/authentication/azure/Microsoft.Kiota.Authentication.Azure.csproj +++ b/src/authentication/azure/Microsoft.Kiota.Authentication.Azure.csproj @@ -20,6 +20,6 @@ - + diff --git a/src/http/httpClient/Microsoft.Kiota.Http.HttpClientLibrary.csproj b/src/http/httpClient/Microsoft.Kiota.Http.HttpClientLibrary.csproj index 9de13f58..5f3543c2 100644 --- a/src/http/httpClient/Microsoft.Kiota.Http.HttpClientLibrary.csproj +++ b/src/http/httpClient/Microsoft.Kiota.Http.HttpClientLibrary.csproj @@ -15,11 +15,11 @@ - + - + diff --git a/src/serialization/json/Microsoft.Kiota.Serialization.Json.csproj b/src/serialization/json/Microsoft.Kiota.Serialization.Json.csproj index 75a4983c..526f7d4c 100644 --- a/src/serialization/json/Microsoft.Kiota.Serialization.Json.csproj +++ b/src/serialization/json/Microsoft.Kiota.Serialization.Json.csproj @@ -16,7 +16,7 @@ - + diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 106042dc..efbf5188 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,7 +1,7 @@ - net8.0;net462 + net9.0;net462 true true latest diff --git a/tests/trimming/Microsoft.Kiota.Trimming.Validation/Microsoft.Kiota.Trimming.Validation.csproj b/tests/trimming/Microsoft.Kiota.Trimming.Validation/Microsoft.Kiota.Trimming.Validation.csproj index 8d197b98..6eb852ff 100644 --- a/tests/trimming/Microsoft.Kiota.Trimming.Validation/Microsoft.Kiota.Trimming.Validation.csproj +++ b/tests/trimming/Microsoft.Kiota.Trimming.Validation/Microsoft.Kiota.Trimming.Validation.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net8.0 + net6.0;net9.0 enable enable true @@ -10,7 +10,7 @@ false + Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))"> true Date: Wed, 13 Nov 2024 10:28:38 +0300 Subject: [PATCH 2/3] missed a few spots --- .github/workflows/sonarcloud.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index bb242f2d..2ef3c749 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -62,7 +62,7 @@ jobs: CoverletOutputFormat: "opencover" # https://github.com/microsoft/vstest/issues/4014#issuecomment-1307913682 shell: pwsh run: | - dotnet tool run dotnet-sonarscanner begin /k:"microsoft_kiota-abstractions-dotnet" /o:"microsoft" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="tests/abstractions/coverage.net9.0.opencover.xml,tests/authentication/azure/coverage.net8.0.opencover.xml,tests/http/httpClient/coverage.net8.0.opencover.xml,tests/serialization/json/coverage.net8.0.opencover.xml,tests/serialization/text/coverage.net8.0.opencover.xml,tests/serialization/form/coverage.net8.0.opencover.xml,tests/serialization/multipart/coverage.net8.0.opencover.xml,tests/bundle/coverage.net8.0.opencover.xml" + dotnet tool run dotnet-sonarscanner begin /k:"microsoft_kiota-abstractions-dotnet" /o:"microsoft" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.opencover.reportsPaths="tests/abstractions/coverage.net9.0.opencover.xml,tests/authentication/azure/coverage.net9.0.opencover.xml,tests/http/httpClient/coverage.net9.0.opencover.xml,tests/serialization/json/coverage.net9.0.opencover.xml,tests/serialization/text/coverage.net9.0.opencover.xml,tests/serialization/form/coverage.net9.0.opencover.xml,tests/serialization/multipart/coverage.net9.0.opencover.xml,tests/bundle/coverage.net9.0.opencover.xml" dotnet workload restore dotnet build dotnet test Microsoft.Kiota.sln --no-build --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover --framework net9.0 From f31544ca4fe2c46a967310d382aff0b5d2c67987 Mon Sep 17 00:00:00 2001 From: Andrew Omondi Date: Wed, 13 Nov 2024 10:45:55 +0300 Subject: [PATCH 3/3] proper name for the step --- .azure-pipelines/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml index d820b824..a73f960d 100644 --- a/.azure-pipelines/ci-build.yml +++ b/.azure-pipelines/ci-build.yml @@ -42,7 +42,7 @@ extends: version: 6.x - task: UseDotNet@2 - displayName: 'Use .NET 8' + displayName: 'Use .NET 9' inputs: version: 9.x