From 6192a56d84d3bb2633f222015c725c257fd30463 Mon Sep 17 00:00:00 2001 From: Vitaly Kukushkin Date: Mon, 31 Mar 2025 11:54:54 -0700 Subject: [PATCH 1/3] cleanup dependencies --- .../Microsoft.Identity.Web.Azure.csproj | 3 ++- .../Microsoft.Identity.Web.DownstreamApi.csproj | 3 +-- .../Microsoft.Identity.Web.OidcFIC.csproj | 10 ++++++++-- ...Microsoft.Identity.Web.TokenAcquisition.csproj | 6 +----- .../Microsoft.Identity.Web.TokenCache.csproj | 15 ++------------- .../Microsoft.Identity.Web.csproj | 13 ++----------- .../CustomSignedAssertionProviderTests.csproj | 1 - .../IntegrationTests/IntegrationTests.csproj | 2 -- .../OidcIdpSignedAssertionProviderTests.csproj | 1 - .../TokenAcquirerTests/TokenAcquirerTests.csproj | 1 + .../Microsoft.Identity.Web.Test.Common.csproj | 11 +++++++---- ...Microsoft.Identity.Web.Test.Integration.csproj | 3 --- .../Microsoft.Identity.Web.Test.csproj | 10 +++++++--- 13 files changed, 31 insertions(+), 48 deletions(-) diff --git a/src/Microsoft.Identity.Web.Azure/Microsoft.Identity.Web.Azure.csproj b/src/Microsoft.Identity.Web.Azure/Microsoft.Identity.Web.Azure.csproj index c4ba6498f..ac2026544 100644 --- a/src/Microsoft.Identity.Web.Azure/Microsoft.Identity.Web.Azure.csproj +++ b/src/Microsoft.Identity.Web.Azure/Microsoft.Identity.Web.Azure.csproj @@ -14,6 +14,7 @@ - + + diff --git a/src/Microsoft.Identity.Web.DownstreamApi/Microsoft.Identity.Web.DownstreamApi.csproj b/src/Microsoft.Identity.Web.DownstreamApi/Microsoft.Identity.Web.DownstreamApi.csproj index ce13a395f..d2c6a8858 100644 --- a/src/Microsoft.Identity.Web.DownstreamApi/Microsoft.Identity.Web.DownstreamApi.csproj +++ b/src/Microsoft.Identity.Web.DownstreamApi/Microsoft.Identity.Web.DownstreamApi.csproj @@ -4,7 +4,6 @@ Microsoft Identity Web downstream API Interface for higher level API for confidential client applications. {A123BD94-812D-40EC-9576-1A7AB5C59913} - true README.md @@ -13,7 +12,7 @@ \ - + diff --git a/src/Microsoft.Identity.Web.OidcFIC/Microsoft.Identity.Web.OidcFIC.csproj b/src/Microsoft.Identity.Web.OidcFIC/Microsoft.Identity.Web.OidcFIC.csproj index 4e8d687be..9d94deaae 100644 --- a/src/Microsoft.Identity.Web.OidcFIC/Microsoft.Identity.Web.OidcFIC.csproj +++ b/src/Microsoft.Identity.Web.OidcFIC/Microsoft.Identity.Web.OidcFIC.csproj @@ -17,9 +17,15 @@ \ - + + + + + + + - + diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj b/src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj index 51b1aa9e7..18eae2246 100644 --- a/src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj +++ b/src/Microsoft.Identity.Web.TokenAcquisition/Microsoft.Identity.Web.TokenAcquisition.csproj @@ -15,12 +15,9 @@ - - - - + @@ -31,7 +28,6 @@ - diff --git a/src/Microsoft.Identity.Web.TokenCache/Microsoft.Identity.Web.TokenCache.csproj b/src/Microsoft.Identity.Web.TokenCache/Microsoft.Identity.Web.TokenCache.csproj index 832b77178..753a868cf 100644 --- a/src/Microsoft.Identity.Web.TokenCache/Microsoft.Identity.Web.TokenCache.csproj +++ b/src/Microsoft.Identity.Web.TokenCache/Microsoft.Identity.Web.TokenCache.csproj @@ -16,24 +16,13 @@ - - - - - - - - + + - - - - - diff --git a/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj b/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj index 7408da953..01da0bda8 100644 --- a/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj +++ b/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj @@ -26,13 +26,8 @@ - - - - - - + @@ -43,13 +38,9 @@ - - - - - + diff --git a/tests/E2E Tests/CustomSignedAssertionProviderTests/CustomSignedAssertionProviderTests.csproj b/tests/E2E Tests/CustomSignedAssertionProviderTests/CustomSignedAssertionProviderTests.csproj index 2ec2077a7..727399946 100644 --- a/tests/E2E Tests/CustomSignedAssertionProviderTests/CustomSignedAssertionProviderTests.csproj +++ b/tests/E2E Tests/CustomSignedAssertionProviderTests/CustomSignedAssertionProviderTests.csproj @@ -18,7 +18,6 @@ - diff --git a/tests/E2E Tests/NET 7 tests/IntegrationTests/IntegrationTests.csproj b/tests/E2E Tests/NET 7 tests/IntegrationTests/IntegrationTests.csproj index d4be3bbc2..63fd25af1 100644 --- a/tests/E2E Tests/NET 7 tests/IntegrationTests/IntegrationTests.csproj +++ b/tests/E2E Tests/NET 7 tests/IntegrationTests/IntegrationTests.csproj @@ -14,8 +14,6 @@ - - diff --git a/tests/E2E Tests/OidcIdPSignedAssertionProviderTests/OidcIdpSignedAssertionProviderTests.csproj b/tests/E2E Tests/OidcIdPSignedAssertionProviderTests/OidcIdpSignedAssertionProviderTests.csproj index f00838baa..1416e3c2c 100644 --- a/tests/E2E Tests/OidcIdPSignedAssertionProviderTests/OidcIdpSignedAssertionProviderTests.csproj +++ b/tests/E2E Tests/OidcIdPSignedAssertionProviderTests/OidcIdpSignedAssertionProviderTests.csproj @@ -18,7 +18,6 @@ - diff --git a/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj b/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj index 110091f06..8d3145a7b 100644 --- a/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj +++ b/tests/E2E Tests/TokenAcquirerTests/TokenAcquirerTests.csproj @@ -21,6 +21,7 @@ + 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 17c859b05..3fbe062e0 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 @@ -18,18 +18,21 @@ - - + + + + - + - + + 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 f8e5f7cbc..bbc611161 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 @@ -29,14 +29,11 @@ - - - diff --git a/tests/Microsoft.Identity.Web.Test/Microsoft.Identity.Web.Test.csproj b/tests/Microsoft.Identity.Web.Test/Microsoft.Identity.Web.Test.csproj index 4b349e814..0ed2e958b 100644 --- a/tests/Microsoft.Identity.Web.Test/Microsoft.Identity.Web.Test.csproj +++ b/tests/Microsoft.Identity.Web.Test/Microsoft.Identity.Web.Test.csproj @@ -8,11 +8,14 @@ - - - + + + + + + @@ -42,6 +45,7 @@ + From 02d3175575beefce83e48bca7c0fbad94e8748a5 Mon Sep 17 00:00:00 2001 From: Vitaly Kukushkin Date: Mon, 31 Mar 2025 19:54:49 -0700 Subject: [PATCH 2/3] EnableConfigurationBindingGenerator>true --- Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Build.props b/Directory.Build.props index 109f3e40e..3d11b37cf 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -50,6 +50,7 @@ true + true From b3a8a639436c33b3ee1d28b1b53dd94dc7350bfa Mon Sep 17 00:00:00 2001 From: Vitaly Kukushkin Date: Mon, 31 Mar 2025 20:06:10 -0700 Subject: [PATCH 3/3] four new warnings --- 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 25fb24717..99e02bb5f 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 = 61 +$expectedWarningCount = 65 if ($LastExitCode -ne 0) {