From 32abdb7df6cfd2b5e0320f813b049f572e3695d1 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Fri, 8 Nov 2024 19:09:41 -0800
Subject: [PATCH 01/15] Update to .NET 9 GA. Update some test dependencies.
---
.github/workflows/dotnetcore.yml | 8 +++----
Directory.Build.props | 11 ++++-----
build/template-install-dependencies.yaml | 14 +++++------
build/template-postbuild-code-analysis.yaml | 2 --
.../Microsoft.Identity.Web.UI.csproj | 5 ++--
tests/DevApps/Directory.Build.props | 5 ++--
tests/Directory.Build.props | 23 +++++++------------
.../IntegrationTestService.csproj | 5 ++--
.../TokenAcquirerTests.csproj | 3 +--
.../WebAppUiTests/WebAppUiTests.csproj | 3 +--
.../Microsoft.Identity.Web.Test.Common.csproj | 5 ++--
...osoft.Identity.Web.Test.Integration.csproj | 5 ++--
...crosoft.Identity.Web.Perf.Benchmark.csproj | 5 ++--
.../Microsoft.Identity.Web.Perf.Client.csproj | 5 ++--
14 files changed, 38 insertions(+), 61 deletions(-)
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 941c70a8f..56f5c4aa8 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
@@ -65,6 +65,9 @@ jobs:
- 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: |
@@ -91,9 +94,6 @@ jobs:
body: process.env.COMMENT_CONTENT_ENV_VAR
})
- - 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 -p:TargetNet9=True --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)&(FullyQualifiedName!~TokenAcquirerTests)"
-
- name: Test with .NET 462
run: dotnet test --no-restore --no-build Microsoft.Identity.Web.sln -f net462 -v normal -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName!~IntegrationTests)"
diff --git a/Directory.Build.props b/Directory.Build.props
index da15dbaa8..698ebebf4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -26,8 +26,7 @@
- net6.0; net7.0; net8.0; net462; net472; netstandard2.0
- $(TargetFrameworks); net9.0
+ net462; net472; netstandard2.0; net6.0; net7.0; net8.0; net9.0
true
../../build/MSAL.snk
true
@@ -42,9 +41,7 @@
-
- true
-
+ true
@@ -92,8 +89,6 @@
4.57.0-preview
3.1.3
7.2.0
- 9.0.0-rc.2.24473.5
- 9.0.0-rc.2.24474.3
8.0.5
@@ -103,6 +98,8 @@
+ 9.0.0
+ 9.0.0
$(AspNetCoreNineRuntimeVersion)
$(AspNetCoreNineRuntimeVersion)
$(NetNineRuntimeVersion)
diff --git a/build/template-install-dependencies.yaml b/build/template-install-dependencies.yaml
index e9897c267..ac5950787 100644
--- a/build/template-install-dependencies.yaml
+++ b/build/template-install-dependencies.yaml
@@ -4,31 +4,29 @@
steps:
- task: UseDotNet@2
- displayName: 'Use .Net Core SDK 3.1'
+ displayName: 'Use .NET Core SDK 3.1.x'
inputs:
version: 3.1.x
- task: UseDotNet@2
- displayName: 'Use .Net Core SDK 6'
+ displayName: 'Use .NET SDK 6.0.x'
inputs:
version: 6.0.x
- task: UseDotNet@2
- displayName: 'Use .Net Core SDK 7'
+ displayName: 'Use .NET SDK 7.0.x'
inputs:
version: 7.0.x
- task: UseDotNet@2
- displayName: 'Use .Net Core SDK 8'
+ displayName: 'Use .NET SDK 8.0.x'
inputs:
version: 8.x
- task: UseDotNet@2
- displayName: 'Use .Net Core SDK 9'
+ displayName: 'Use .NET SDK 9.0.x'
inputs:
- version: 9.0.100-rc.2.24474.11
- includePreviewVersions: true
- condition: eq(variables['TargetNet9'], 'True')
+ version: 9.0.x
# Run Nuget Tool Installer
diff --git a/build/template-postbuild-code-analysis.yaml b/build/template-postbuild-code-analysis.yaml
index 6b0702d3e..dc47764d8 100644
--- a/build/template-postbuild-code-analysis.yaml
+++ b/build/template-postbuild-code-analysis.yaml
@@ -4,7 +4,6 @@
steps:
- task: securedevelopmentteam.vss-secure-development-tools.build-task-roslynanalyzers.RoslynAnalyzers@3
displayName: 'Run Roslyn Analyzers'
- condition: eq(variables['TargetNet9'], 'False')
inputs:
copyLogsOnly: true
env:
@@ -13,6 +12,5 @@ steps:
- task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@2
displayName: 'Check Roslyn Results '
- condition: eq(variables['TargetNet9'], 'False')
inputs:
RoslynAnalyzers: true
diff --git a/src/Microsoft.Identity.Web.UI/Microsoft.Identity.Web.UI.csproj b/src/Microsoft.Identity.Web.UI/Microsoft.Identity.Web.UI.csproj
index d639adc1b..280563aa5 100644
--- a/src/Microsoft.Identity.Web.UI/Microsoft.Identity.Web.UI.csproj
+++ b/src/Microsoft.Identity.Web.UI/Microsoft.Identity.Web.UI.csproj
@@ -1,12 +1,11 @@
-
+
Microsoft Identity Web UI
Microsoft Identity Web UI
This package enables UI for ASP.NET Core Web apps that use Microsoft.Identity.Web.
{C6CB0D5B-917A-4127-9984-7592C757BBDE}
- net6.0;net7.0;net8.0
- $(TargetFrameworks); net9.0
+ net6.0;net7.0;net8.0;net9.0
enable
enable
true
diff --git a/tests/DevApps/Directory.Build.props b/tests/DevApps/Directory.Build.props
index f1ff13bb8..b033632f7 100644
--- a/tests/DevApps/Directory.Build.props
+++ b/tests/DevApps/Directory.Build.props
@@ -1,8 +1,7 @@
- net6.0; net7.0; net8.0
- $(TargetFrameworks); net9.0
+ net6.0; net7.0; net8.0; net9.0
true
false
12
@@ -24,7 +23,7 @@
- 9.0.0-rc.2.24474.1
+ 9.0.0
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index f0578133c..8af5498e4 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -2,8 +2,7 @@
false
- net6.0; net7.0; net8.0; net462; net472
- $(TargetFrameworks); net9.0
+ net462; net472; net6.0; net7.0; net8.0; net9.0
True
false
false
@@ -12,15 +11,15 @@
7.0.0
- 17.4.0
+ 17.11.1
- 13.0.2
+ 13.0.3
2.9.2
2.8.2
2.9.2
2.9.2
- 4.2.2
- 1.0.13
+ 5.3.0
+ 1.0.17
6.0.2
4.8.0
108.0.5359.7100
@@ -47,21 +46,15 @@
- 8.0.0-preview.5.23302.2
- 17.6.3
- 13.0.3
+ 8.0.10
- $(AspNetCoreNineRuntimeVersion)
- 17.6.3
- 13.0.3
+ 9.0.0
-
- true
-
+ true
diff --git a/tests/E2E Tests/IntegrationTestService/IntegrationTestService.csproj b/tests/E2E Tests/IntegrationTestService/IntegrationTestService.csproj
index 2b8374375..6a0c041ab 100644
--- a/tests/E2E Tests/IntegrationTestService/IntegrationTestService.csproj
+++ b/tests/E2E Tests/IntegrationTestService/IntegrationTestService.csproj
@@ -1,8 +1,7 @@
-
+
- net6.0; net7.0; net8.0
- $(TargetFrameworks); net9.0
+ net6.0; net7.0; net8.0; net9.0
false
true
ce2cc20c-397d-48f2-9023-daf7c8550c53
diff --git a/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj b/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj
index 2f003abdd..7d52e0fe2 100644
--- a/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj
+++ b/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj
@@ -1,8 +1,7 @@
- net7.0; net8.0
- $(TargetFrameworks); net9.0
+ net7.0; net8.0; net9.0
../../../build/MSAL.snk
diff --git a/tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj b/tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj
index 95a980e45..32ab2d602 100644
--- a/tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj
+++ b/tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj
@@ -1,8 +1,7 @@
- net8.0
-
+ net8.0; net9.0
../../../build/MSAL.snk
false
diff --git a/tests/Microsoft.Identity.Web.Test.Common/Microsoft.Identity.Web.Test.Common.csproj b/tests/Microsoft.Identity.Web.Test.Common/Microsoft.Identity.Web.Test.Common.csproj
index bd7a9a35f..06197b873 100644
--- a/tests/Microsoft.Identity.Web.Test.Common/Microsoft.Identity.Web.Test.Common.csproj
+++ b/tests/Microsoft.Identity.Web.Test.Common/Microsoft.Identity.Web.Test.Common.csproj
@@ -1,8 +1,7 @@
-
+
- net462; net472; net6.0; net7.0; net8.0
- $(TargetFrameworks); net9.0
+ net462; net472; net6.0; net7.0; net8.0; net9.0
false
true
../../build/MSAL.snk
diff --git a/tests/Microsoft.Identity.Web.Test.Integration/Microsoft.Identity.Web.Test.Integration.csproj b/tests/Microsoft.Identity.Web.Test.Integration/Microsoft.Identity.Web.Test.Integration.csproj
index 9faa84802..ee936c6da 100644
--- a/tests/Microsoft.Identity.Web.Test.Integration/Microsoft.Identity.Web.Test.Integration.csproj
+++ b/tests/Microsoft.Identity.Web.Test.Integration/Microsoft.Identity.Web.Test.Integration.csproj
@@ -1,8 +1,7 @@
-
+
- net6.0; net7.0; net8.0
- $(TargetFrameworks); net9.0
+ net6.0; net7.0; net8.0; net9.0
false
true
diff --git a/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Benchmark/Microsoft.Identity.Web.Perf.Benchmark.csproj b/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Benchmark/Microsoft.Identity.Web.Perf.Benchmark.csproj
index 75e9577c8..b8ff523bf 100644
--- a/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Benchmark/Microsoft.Identity.Web.Perf.Benchmark.csproj
+++ b/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Benchmark/Microsoft.Identity.Web.Perf.Benchmark.csproj
@@ -1,9 +1,8 @@
-
+
Exe
- net6.0; net7.0; net8.0
- $(TargetFrameworks); net9.0
+ net6.0; net7.0; net8.0; net9.0
..\..\..\.sonarlint\azuread_microsoft-identity-webcsharp.ruleset
../../../build/MSAL.snk
diff --git a/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Client/Microsoft.Identity.Web.Perf.Client.csproj b/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Client/Microsoft.Identity.Web.Perf.Client.csproj
index 01820c823..252a09ee7 100644
--- a/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Client/Microsoft.Identity.Web.Perf.Client.csproj
+++ b/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Client/Microsoft.Identity.Web.Perf.Client.csproj
@@ -1,9 +1,8 @@
-
+
Exe
- net6.0; net7.0; net8.0
- $(TargetFrameworks); net9.0
+ net6.0; net7.0; net8.0; net9.0
..\..\..\.sonarlint\azuread_microsoft-identity-webcsharp.ruleset
../../../build/MSAL.snk
disable
From e6b0e7a77e964671f2cd8d1b940562ed337ff55c Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Mon, 11 Nov 2024 23:17:30 -0800
Subject: [PATCH 02/15] Don't install extra SDKs.
---
.github/workflows/dotnetcore.yml | 15 ---------------
build/template-install-dependencies.yaml | 20 --------------------
2 files changed, 35 deletions(-)
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 56f5c4aa8..d6db8c754 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -26,21 +26,6 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4.2.1
- - name: Setup .NET 6.0.x
- uses: actions/setup-dotnet@v4.0.1
- with:
- dotnet-version: 6.0.x
-
- - name: Setup .NET 7.0.x
- uses: actions/setup-dotnet@v4.0.1
- with:
- dotnet-version: 7.0.x
-
- - name: Setup .NET 8.0.x
- uses: actions/setup-dotnet@v4.0.1
- with:
- dotnet-version: 8.0.x
-
- name: Setup .NET 9.0.x
uses: actions/setup-dotnet@v4.0.1
with:
diff --git a/build/template-install-dependencies.yaml b/build/template-install-dependencies.yaml
index ac5950787..f0213ea4b 100644
--- a/build/template-install-dependencies.yaml
+++ b/build/template-install-dependencies.yaml
@@ -3,26 +3,6 @@
#install dotnet core
steps:
-- task: UseDotNet@2
- displayName: 'Use .NET Core SDK 3.1.x'
- inputs:
- version: 3.1.x
-
-- task: UseDotNet@2
- displayName: 'Use .NET SDK 6.0.x'
- inputs:
- version: 6.0.x
-
-- task: UseDotNet@2
- displayName: 'Use .NET SDK 7.0.x'
- inputs:
- version: 7.0.x
-
-- task: UseDotNet@2
- displayName: 'Use .NET SDK 8.0.x'
- inputs:
- version: 8.x
-
- task: UseDotNet@2
displayName: 'Use .NET SDK 9.0.x'
inputs:
From 533e6a5a1255ec625a4a86363874f63293156846 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Mon, 11 Nov 2024 23:18:24 -0800
Subject: [PATCH 03/15] Add TargetNetNext flag.
---
Directory.Build.props | 1 +
src/Microsoft.Identity.Web.UI/Microsoft.Identity.Web.UI.csproj | 3 ++-
tests/DevApps/Directory.Build.props | 1 +
tests/Directory.Build.props | 1 +
.../IntegrationTestService/IntegrationTestService.csproj | 1 +
tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj | 1 +
tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj | 1 +
.../Microsoft.Identity.Web.Test.Common.csproj | 1 +
.../Microsoft.Identity.Web.Test.Integration.csproj | 1 +
.../Microsoft.Identity.Web.Perf.Benchmark.csproj | 1 +
.../Microsoft.Identity.Web.Perf.Client.csproj | 1 +
11 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 698ebebf4..9bcdd13b5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -27,6 +27,7 @@
net462; net472; netstandard2.0; net6.0; net7.0; net8.0; net9.0
+ $(TargetFrameworks);
true
../../build/MSAL.snk
true
diff --git a/src/Microsoft.Identity.Web.UI/Microsoft.Identity.Web.UI.csproj b/src/Microsoft.Identity.Web.UI/Microsoft.Identity.Web.UI.csproj
index 280563aa5..fcdd3667d 100644
--- a/src/Microsoft.Identity.Web.UI/Microsoft.Identity.Web.UI.csproj
+++ b/src/Microsoft.Identity.Web.UI/Microsoft.Identity.Web.UI.csproj
@@ -5,7 +5,8 @@
Microsoft Identity Web UI
This package enables UI for ASP.NET Core Web apps that use Microsoft.Identity.Web.
{C6CB0D5B-917A-4127-9984-7592C757BBDE}
- net6.0;net7.0;net8.0;net9.0
+ net6.0; net7.0; net8.0; net9.0
+ $(TargetFrameworks);
enable
enable
true
diff --git a/tests/DevApps/Directory.Build.props b/tests/DevApps/Directory.Build.props
index b033632f7..4d9c4741d 100644
--- a/tests/DevApps/Directory.Build.props
+++ b/tests/DevApps/Directory.Build.props
@@ -2,6 +2,7 @@
net6.0; net7.0; net8.0; net9.0
+ $(TargetFrameworks);
true
false
12
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 8af5498e4..7f51dc41d 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -3,6 +3,7 @@
false
net462; net472; net6.0; net7.0; net8.0; net9.0
+ $(TargetFrameworks);
True
false
false
diff --git a/tests/E2E Tests/IntegrationTestService/IntegrationTestService.csproj b/tests/E2E Tests/IntegrationTestService/IntegrationTestService.csproj
index 6a0c041ab..595bad647 100644
--- a/tests/E2E Tests/IntegrationTestService/IntegrationTestService.csproj
+++ b/tests/E2E Tests/IntegrationTestService/IntegrationTestService.csproj
@@ -2,6 +2,7 @@
net6.0; net7.0; net8.0; net9.0
+ $(TargetFrameworks);
false
true
ce2cc20c-397d-48f2-9023-daf7c8550c53
diff --git a/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj b/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj
index 7d52e0fe2..f9480ffeb 100644
--- a/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj
+++ b/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj
@@ -2,6 +2,7 @@
net7.0; net8.0; net9.0
+ $(TargetFrameworks);
../../../build/MSAL.snk
diff --git a/tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj b/tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj
index 32ab2d602..94145d02c 100644
--- a/tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj
+++ b/tests/E2E Tests/WebAppUiTests/WebAppUiTests.csproj
@@ -2,6 +2,7 @@
net8.0; net9.0
+ $(TargetFrameworks);
../../../build/MSAL.snk
false
diff --git a/tests/Microsoft.Identity.Web.Test.Common/Microsoft.Identity.Web.Test.Common.csproj b/tests/Microsoft.Identity.Web.Test.Common/Microsoft.Identity.Web.Test.Common.csproj
index 06197b873..b7719c606 100644
--- a/tests/Microsoft.Identity.Web.Test.Common/Microsoft.Identity.Web.Test.Common.csproj
+++ b/tests/Microsoft.Identity.Web.Test.Common/Microsoft.Identity.Web.Test.Common.csproj
@@ -2,6 +2,7 @@
net462; net472; net6.0; net7.0; net8.0; net9.0
+ $(TargetFrameworks);
false
true
../../build/MSAL.snk
diff --git a/tests/Microsoft.Identity.Web.Test.Integration/Microsoft.Identity.Web.Test.Integration.csproj b/tests/Microsoft.Identity.Web.Test.Integration/Microsoft.Identity.Web.Test.Integration.csproj
index ee936c6da..f98235164 100644
--- a/tests/Microsoft.Identity.Web.Test.Integration/Microsoft.Identity.Web.Test.Integration.csproj
+++ b/tests/Microsoft.Identity.Web.Test.Integration/Microsoft.Identity.Web.Test.Integration.csproj
@@ -2,6 +2,7 @@
net6.0; net7.0; net8.0; net9.0
+ $(TargetFrameworks);
false
true
diff --git a/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Benchmark/Microsoft.Identity.Web.Perf.Benchmark.csproj b/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Benchmark/Microsoft.Identity.Web.Perf.Benchmark.csproj
index b8ff523bf..c7e7f3109 100644
--- a/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Benchmark/Microsoft.Identity.Web.Perf.Benchmark.csproj
+++ b/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Benchmark/Microsoft.Identity.Web.Perf.Benchmark.csproj
@@ -3,6 +3,7 @@
Exe
net6.0; net7.0; net8.0; net9.0
+ $(TargetFrameworks);
..\..\..\.sonarlint\azuread_microsoft-identity-webcsharp.ruleset
../../../build/MSAL.snk
diff --git a/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Client/Microsoft.Identity.Web.Perf.Client.csproj b/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Client/Microsoft.Identity.Web.Perf.Client.csproj
index 252a09ee7..4b13b012f 100644
--- a/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Client/Microsoft.Identity.Web.Perf.Client.csproj
+++ b/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Client/Microsoft.Identity.Web.Perf.Client.csproj
@@ -3,6 +3,7 @@
Exe
net6.0; net7.0; net8.0; net9.0
+ $(TargetFrameworks);
..\..\..\.sonarlint\azuread_microsoft-identity-webcsharp.ruleset
../../../build/MSAL.snk
disable
From c17c8e4dc4a8c12b2b2a3add3e4c73cb26e6e9a9 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Tue, 12 Nov 2024 22:56:56 -0800
Subject: [PATCH 04/15] Revert framework order.
---
Directory.Build.props | 2 +-
tests/Directory.Build.props | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 9bcdd13b5..8a4bd16d5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -26,7 +26,7 @@
- net462; net472; netstandard2.0; net6.0; net7.0; net8.0; net9.0
+ net6.0; net7.0; net8.0; net9.0; net462; net472; netstandard2.0
$(TargetFrameworks);
true
../../build/MSAL.snk
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 7f51dc41d..c1d7cac6c 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -2,7 +2,7 @@
false
- net462; net472; net6.0; net7.0; net8.0; net9.0
+ net6.0; net7.0; net8.0; net9.0; net462; net472
$(TargetFrameworks);
True
false
@@ -11,17 +11,17 @@
- 7.0.0
+ 7.0.0
17.11.1
-
- 13.0.3
- 2.9.2
- 2.8.2
+
+ 13.0.3
+ 2.9.2
+ 2.8.2
2.9.2
2.9.2
5.3.0
1.0.17
- 6.0.2
+ 6.0.2
4.8.0
108.0.5359.7100
0.12.1
@@ -36,7 +36,7 @@
1.0.2
4.3.4
4.3.1
-
+
$(DefineConstants);AZURE_DEVOPS_BUILD
From bfe0ebe7c519c2c573e2577b18945414b7b51a5e Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Tue, 12 Nov 2024 23:35:00 -0800
Subject: [PATCH 05/15] Fix GitHub Actions.
---
.github/workflows/aot-check.yml | 5 +++++
.github/workflows/codeql-analysis.yml | 7 +++++--
.github/workflows/dotnetcore.yml | 3 ---
.../Microsoft.Identity.Web.GraphServiceClient.csproj | 4 ++--
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/aot-check.yml b/.github/workflows/aot-check.yml
index 07799d360..8c4e63b88 100644
--- a/.github/workflows/aot-check.yml
+++ b/.github/workflows/aot-check.yml
@@ -22,6 +22,11 @@ jobs:
with:
fetch-depth: 1
+ - name: Setup .NET 9.0.x
+ uses: actions/setup-dotnet@v4.0.1
+ with:
+ dotnet-version: 9.0.x
+
- name: Runs powershell script
id: aot-powershell
run: build\test-aot.ps1 'net8.0'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c6b0bb43d..2f500af98 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -44,10 +44,10 @@ jobs:
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
- - name: Setup .NET 8.0.x
+ - name: Setup .NET 9.0.x
uses: actions/setup-dotnet@v4
with:
- dotnet-version: 8.0.x
+ dotnet-version: 9.0.x
# Install workload
- name: Setup wasm-tools
@@ -56,5 +56,8 @@ jobs:
- name: Build with .NET 8
run: dotnet test Microsoft.Identity.Web.sln -f net8.0 -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName=IntegrationTests)"
+ - name: Build with .NET 9
+ run: dotnet test Microsoft.Identity.Web.sln -f net9.0 -p:FROM_GITHUB_ACTION=true --configuration Release --filter "(FullyQualifiedName!~Microsoft.Identity.Web.Test.Integration)&(FullyQualifiedName!~WebAppUiTests)&(FullyQualifiedName=IntegrationTests)"
+
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index d19238ec7..8805e533f 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -47,9 +47,6 @@ jobs:
- 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: 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)"
diff --git a/src/Microsoft.Identity.Web.GraphServiceClient/Microsoft.Identity.Web.GraphServiceClient.csproj b/src/Microsoft.Identity.Web.GraphServiceClient/Microsoft.Identity.Web.GraphServiceClient.csproj
index b28663787..596b233bd 100644
--- a/src/Microsoft.Identity.Web.GraphServiceClient/Microsoft.Identity.Web.GraphServiceClient.csproj
+++ b/src/Microsoft.Identity.Web.GraphServiceClient/Microsoft.Identity.Web.GraphServiceClient.csproj
@@ -1,4 +1,4 @@
-
+
Microsoft Identity Web, Microsoft Graph v5+ helper
@@ -20,7 +20,7 @@
-
+
From 08d803fbd952cc2b307dd7dd6a8bf3256b7c9f17 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Tue, 12 Nov 2024 23:59:55 -0800
Subject: [PATCH 06/15] Update aot-check.yml
---
.github/workflows/aot-check.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/aot-check.yml b/.github/workflows/aot-check.yml
index 8c4e63b88..161190e19 100644
--- a/.github/workflows/aot-check.yml
+++ b/.github/workflows/aot-check.yml
@@ -22,10 +22,10 @@ jobs:
with:
fetch-depth: 1
- - name: Setup .NET 9.0.x
+ - name: Setup .NET 8.0.x
uses: actions/setup-dotnet@v4.0.1
with:
- dotnet-version: 9.0.x
+ dotnet-version: 8.0.x
- name: Runs powershell script
id: aot-powershell
From 7f67603fd7c532131b48f6a4908d106bea3c6aa6 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Wed, 13 Nov 2024 00:09:42 -0800
Subject: [PATCH 07/15] Rever use SDK tasks.
---
.github/workflows/aot-check.yml | 5 -----
.github/workflows/dotnetcore.yml | 10 ++++++++++
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/aot-check.yml b/.github/workflows/aot-check.yml
index 161190e19..07799d360 100644
--- a/.github/workflows/aot-check.yml
+++ b/.github/workflows/aot-check.yml
@@ -22,11 +22,6 @@ jobs:
with:
fetch-depth: 1
- - name: Setup .NET 8.0.x
- uses: actions/setup-dotnet@v4.0.1
- with:
- dotnet-version: 8.0.x
-
- name: Runs powershell script
id: aot-powershell
run: build\test-aot.ps1 'net8.0'
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 8805e533f..1d07fc579 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -26,6 +26,16 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4.2.1
+ - name: Setup .NET 6.0.x
+ uses: actions/setup-dotnet@v4.0.1
+ with:
+ dotnet-version: 6.0.x
+
+ - name: Setup .NET 8.0.x
+ uses: actions/setup-dotnet@v4.0.1
+ with:
+ dotnet-version: 8.0.x
+
- name: Setup .NET 9.0.x
uses: actions/setup-dotnet@v4.0.1
with:
From 88be0e21cf5effb609d4afee6ab7bfadfbebe087 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Wed, 13 Nov 2024 00:26:41 -0800
Subject: [PATCH 08/15] Update aot-check.
---
.github/workflows/aot-check.yml | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.github/workflows/aot-check.yml b/.github/workflows/aot-check.yml
index 07799d360..d1b7ce549 100644
--- a/.github/workflows/aot-check.yml
+++ b/.github/workflows/aot-check.yml
@@ -22,6 +22,16 @@ jobs:
with:
fetch-depth: 1
+ - name: Setup .NET 8.0.x
+ uses: actions/setup-dotnet@v4.0.1
+ with:
+ dotnet-version: 8.0.x
+
+ - name: Setup .NET 9.0.x
+ uses: actions/setup-dotnet@v4.0.1
+ with:
+ dotnet-version: 9.0.x
+
- name: Runs powershell script
id: aot-powershell
run: build\test-aot.ps1 'net8.0'
From 49fb8bd570d38d9ac1aaa16b2eb2a19ee1798337 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Wed, 13 Nov 2024 00:40:51 -0800
Subject: [PATCH 09/15] Revert.
---
.github/workflows/aot-check.yml | 5 -----
.github/workflows/dotnetcore.yml | 10 ----------
2 files changed, 15 deletions(-)
diff --git a/.github/workflows/aot-check.yml b/.github/workflows/aot-check.yml
index d1b7ce549..8c4e63b88 100644
--- a/.github/workflows/aot-check.yml
+++ b/.github/workflows/aot-check.yml
@@ -22,11 +22,6 @@ jobs:
with:
fetch-depth: 1
- - name: Setup .NET 8.0.x
- uses: actions/setup-dotnet@v4.0.1
- with:
- dotnet-version: 8.0.x
-
- name: Setup .NET 9.0.x
uses: actions/setup-dotnet@v4.0.1
with:
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 1d07fc579..8805e533f 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -26,16 +26,6 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4.2.1
- - name: Setup .NET 6.0.x
- uses: actions/setup-dotnet@v4.0.1
- with:
- dotnet-version: 6.0.x
-
- - name: Setup .NET 8.0.x
- uses: actions/setup-dotnet@v4.0.1
- with:
- dotnet-version: 8.0.x
-
- name: Setup .NET 9.0.x
uses: actions/setup-dotnet@v4.0.1
with:
From d269e387ee5860598b4476176cb8d40a0038646d Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Thu, 14 Nov 2024 02:43:33 -0800
Subject: [PATCH 10/15] Nit updates.
---
.github/workflows/aot-check.yml | 2 +-
.github/workflows/dotnetcore.yml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/aot-check.yml b/.github/workflows/aot-check.yml
index 8c4e63b88..a9e2700f0 100644
--- a/.github/workflows/aot-check.yml
+++ b/.github/workflows/aot-check.yml
@@ -23,7 +23,7 @@ jobs:
fetch-depth: 1
- name: Setup .NET 9.0.x
- uses: actions/setup-dotnet@v4.0.1
+ uses: actions/setup-dotnet@v4.1.0
with:
dotnet-version: 9.0.x
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 8805e533f..9ea80255b 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -20,14 +20,14 @@ on:
jobs:
build:
runs-on: windows-latest
- continue-on-error: true
+ continue-on-error: false
name: "Build and run unit tests"
steps:
- name: Checkout repository
uses: actions/checkout@v4.2.1
- name: Setup .NET 9.0.x
- uses: actions/setup-dotnet@v4.0.1
+ uses: actions/setup-dotnet@v4.1.0
with:
dotnet-version: 9.0.x
@@ -53,10 +53,10 @@ jobs:
- name: Create code coverage report
run: |
- dotnet tool install -g dotnet-reportgenerator-globaltool
+ dotnet tool install -g dotnet-reportgenerator-globaltool --version 5.4.1
reportgenerator -reports:./**/coverage.cobertura.xml -targetdir:CodeCoverage -reporttypes:'MarkdownSummaryGithub;Cobertura'
- - name: Write Coverage to Job Summary
+ - name: Write coverage to job summary
shell: bash
run: |
cat CodeCoverage/SummaryGithub.md >> $GITHUB_STEP_SUMMARY
@@ -64,7 +64,7 @@ jobs:
echo $(cat CodeCoverage/SummaryGithub.md) >> $GITHUB_ENV
echo "EOF" >> $GITHUB_ENV
- - name: Comment Coverage in PR
+ - name: Comment coverage in PR
uses: actions/github-script@v7
id: comment
with:
From e0320c2f28edd915d759d5806e5a705d307d3b00 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Thu, 14 Nov 2024 03:00:52 -0800
Subject: [PATCH 11/15] Update AOT test.
---
build/test-aot.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build/test-aot.ps1 b/build/test-aot.ps1
index 13734d2d2..25fb24717 100644
--- a/build/test-aot.ps1
+++ b/build/test-aot.ps1
@@ -16,7 +16,7 @@ foreach ($line in $($publishOutput -split "`r`n"))
}
Write-Host "Actual warning count is: ", $actualWarningCount
-$expectedWarningCount = 63
+$expectedWarningCount = 61
if ($LastExitCode -ne 0)
{
From b8b96c6d0de442ff4ddafdef39ccc2c41470dec5 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Thu, 14 Nov 2024 13:46:50 -0800
Subject: [PATCH 12/15] Reorder tests.
---
.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 9ea80255b..69f53e84f 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -42,14 +42,14 @@ jobs:
- name: Build solution
run: msbuild Microsoft.Identity.Web.sln -r -t:build -verbosity:m -property:Configuration=Release
- - 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 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: 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: 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: Create code coverage report
run: |
From bb795622fa3a520620dd4b2cf5621b853efc45e0 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Thu, 14 Nov 2024 13:59:54 -0800
Subject: [PATCH 13/15] Revert reorder. Add VS version to MS build.
---
.github/workflows/dotnetcore.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 69f53e84f..0e4d5205b 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -34,6 +34,8 @@ jobs:
- name: 'Setup MSBuild'
uses: microsoft/setup-msbuild@v2
with:
+ vs-version: '17.12'
+ vs-prerelease: true
msbuild-architecture: x64
- name: Setup wasm-tools
@@ -42,14 +44,14 @@ jobs:
- name: Build solution
run: msbuild Microsoft.Identity.Web.sln -r -t:build -verbosity:m -property:Configuration=Release
- - 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: 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 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 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 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: |
From 5a99fb7c5ea5442c365651eb35c026ac0100d32a Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Thu, 14 Nov 2024 14:09:39 -0800
Subject: [PATCH 14/15] Remove vs version.
---
.github/workflows/dotnetcore.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index 0e4d5205b..ab6601604 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -34,7 +34,6 @@ jobs:
- name: 'Setup MSBuild'
uses: microsoft/setup-msbuild@v2
with:
- vs-version: '17.12'
vs-prerelease: true
msbuild-architecture: x64
From 7b8f12f29358eddac154329b30d4d8436bd74760 Mon Sep 17 00:00:00 2001
From: Peter <34331512+pmaytak@users.noreply.github.com>
Date: Thu, 14 Nov 2024 14:28:15 -0800
Subject: [PATCH 15/15] Update.
---
.github/workflows/dotnetcore.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
index ab6601604..4d2b788d7 100644
--- a/.github/workflows/dotnetcore.yml
+++ b/.github/workflows/dotnetcore.yml
@@ -34,7 +34,6 @@ jobs:
- name: 'Setup MSBuild'
uses: microsoft/setup-msbuild@v2
with:
- vs-prerelease: true
msbuild-architecture: x64
- name: Setup wasm-tools
@@ -50,7 +49,7 @@ jobs:
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)"
+ run: dotnet test 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: |