From 01d8b666d80a869547ede4313be3f0581d0b884f Mon Sep 17 00:00:00 2001 From: jennyf19 Date: Tue, 12 Nov 2024 19:13:15 -0800 Subject: [PATCH 1/2] update dependencies to .net 9 --- build/template-install-dependencies.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/template-install-dependencies.yaml b/build/template-install-dependencies.yaml index e9897c267..5e33b6272 100644 --- a/build/template-install-dependencies.yaml +++ b/build/template-install-dependencies.yaml @@ -26,8 +26,7 @@ steps: - task: UseDotNet@2 displayName: 'Use .Net Core SDK 9' inputs: - version: 9.0.100-rc.2.24474.11 - includePreviewVersions: true + version: 9.x condition: eq(variables['TargetNet9'], 'True') # Run Nuget Tool Installer From 70e2d16e9b1cb4581507a70f457badeb2e40eb1c Mon Sep 17 00:00:00 2001 From: jennyf19 Date: Tue, 12 Nov 2024 19:42:31 -0800 Subject: [PATCH 2/2] Update dotnetcore.yml --- .github/workflows/dotnetcore.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 941c70a8f..b86015628 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -44,7 +44,7 @@ jobs: - name: Setup .NET 9.0.x uses: actions/setup-dotnet@v4.0.1 with: - dotnet-version: 9.0.100-rc.2.24474.11 + dotnet-version: 9.0.x - name: 'Setup MSBuild' uses: microsoft/setup-msbuild@v2 @@ -60,12 +60,12 @@ jobs: - name: Test with .NET 6.0.x run: dotnet test --no-restore --no-build Microsoft.Identity.Web.sln -f net6.0 -v normal -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)&(FullyQualifiedName!~TokenAcquirerTests)" - - name: Test with .NET 7.0.x - run: dotnet test --no-restore --no-build Microsoft.Identity.Web.sln -f net7.0 -v normal -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)&(FullyQualifiedName!~TokenAcquirerTests)" - - name: Test with .NET 8.0.x run: dotnet test --no-restore --no-build Microsoft.Identity.Web.sln -f net8.0 -v normal -p:FROM_GITHUB_ACTION=true --configuration Release --collect "Xplat Code Coverage" --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)&(FullyQualifiedName!~TokenAcquirerTests)" + - name: Test with .NET 9.0.x + run: dotnet test --no-restore --no-build Microsoft.Identity.Web.sln -f net9.0 -v normal -p:FROM_GITHUB_ACTION=true --configuration Release --collect "Xplat Code Coverage" --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)&(FullyQualifiedName!~TokenAcquirerTests)" + - name: Create code coverage report run: | dotnet tool install -g dotnet-reportgenerator-globaltool