diff --git a/Directory.Build.props b/Directory.Build.props index 2aa0e3a19..f1f0a1283 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,7 +2,7 @@ - 2.7.0-localbuild + 2.15.4-localbuild $(ClientSemVer) @@ -86,9 +86,7 @@ 4.34.0 4.50.0-preview 3.1.3 - 5.0.0 - - 4.7.2 + 5.0.0 @@ -176,5 +174,7 @@ 3.1.30 3.1.30 3.1.30 + + 4.7.2 diff --git a/src/Microsoft.Identity.Web.Certificateless/CompatibilitySuppressions.xml b/src/Microsoft.Identity.Web.Certificateless/CompatibilitySuppressions.xml new file mode 100644 index 000000000..2f935ddd0 --- /dev/null +++ b/src/Microsoft.Identity.Web.Certificateless/CompatibilitySuppressions.xml @@ -0,0 +1,18 @@ + + + + + CP0002 + M:Microsoft.Identity.Web.AzureIdentityForKubernetesClientAssertion.#ctor + lib/netstandard2.0/Microsoft.Identity.Web.Certificateless.dll + lib/netstandard2.0/Microsoft.Identity.Web.Certificateless.dll + true + + + CP0002 + M:Microsoft.Identity.Web.AzureIdentityForKubernetesClientAssertion.#ctor(System.String) + lib/netstandard2.0/Microsoft.Identity.Web.Certificateless.dll + lib/netstandard2.0/Microsoft.Identity.Web.Certificateless.dll + true + + \ No newline at end of file diff --git a/src/Microsoft.Identity.Web.TokenAcquisition/CompatibilitySuppressions.xml b/src/Microsoft.Identity.Web.TokenAcquisition/CompatibilitySuppressions.xml new file mode 100644 index 000000000..8c2332a7e --- /dev/null +++ b/src/Microsoft.Identity.Web.TokenAcquisition/CompatibilitySuppressions.xml @@ -0,0 +1,40 @@ + + + + + CP0001 + T:Microsoft.Identity.Web.OpenIdConnectOptions + lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll + lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll + + + CP0002 + M:Microsoft.Identity.Web.MicrosoftIdentityOptions.get_ErrorPath + lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll + lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll + + + CP0002 + M:Microsoft.Identity.Web.MicrosoftIdentityOptions.get_ResetPasswordPath + lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll + lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll + + + CP0006 + M:Microsoft.Identity.Web.ITokenAcquisition.ReplyForbiddenWithWwwAuthenticateHeader(System.Collections.Generic.IEnumerable{System.String},Microsoft.Identity.Client.MsalUiRequiredException,System.String,Microsoft.AspNetCore.Http.HttpResponse) + lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll + lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll + + + CP0006 + M:Microsoft.Identity.Web.ITokenAcquisition.ReplyForbiddenWithWwwAuthenticateHeaderAsync(System.Collections.Generic.IEnumerable{System.String},Microsoft.Identity.Client.MsalUiRequiredException,Microsoft.AspNetCore.Http.HttpResponse) + lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll + lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll + + + CP0007 + T:Microsoft.Identity.Web.MicrosoftIdentityOptions + lib/netstandard2.0/Microsoft.Identity.Web.TokenAcquisition.dll + lib/netcoreapp3.1/Microsoft.Identity.Web.TokenAcquisition.dll + + \ No newline at end of file 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 c1d692959..a359f9b1c 100644 --- a/src/Microsoft.Identity.Web.TokenCache/Microsoft.Identity.Web.TokenCache.csproj +++ b/src/Microsoft.Identity.Web.TokenCache/Microsoft.Identity.Web.TokenCache.csproj @@ -9,7 +9,6 @@ - @@ -34,6 +33,7 @@ + diff --git a/src/Microsoft.Identity.Web/CompatibilitySuppressions.xml b/src/Microsoft.Identity.Web/CompatibilitySuppressions.xml index d8ae19643..29568532c 100644 --- a/src/Microsoft.Identity.Web/CompatibilitySuppressions.xml +++ b/src/Microsoft.Identity.Web/CompatibilitySuppressions.xml @@ -3,7 +3,6 @@ CP0002 - M:Microsoft.Identity.Web.AppServicesAuthenticationHandler.#ctor(Microsoft.Extensions.Options.IOptionsMonitor{Microsoft.Identity.Web.AppServicesAuthenticationOptions},Microsoft.Extensions.Logging.ILoggerFactory,System.Text.Encodings.Web.UrlEncoder,Microsoft.AspNetCore.Authentication.ISystemClock) lib/net7.0/Microsoft.Identity.Web.dll lib/net8.0/Microsoft.Identity.Web.dll diff --git a/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj b/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj index 396aa932f..113316611 100644 --- a/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj +++ b/src/Microsoft.Identity.Web/Microsoft.Identity.Web.csproj @@ -22,7 +22,6 @@ - diff --git a/tests/DevApps/B2CWebAppCallsWebApi/Client/TodoListClient.csproj b/tests/DevApps/B2CWebAppCallsWebApi/Client/TodoListClient.csproj index 8e244c918..dad5417ad 100644 --- a/tests/DevApps/B2CWebAppCallsWebApi/Client/TodoListClient.csproj +++ b/tests/DevApps/B2CWebAppCallsWebApi/Client/TodoListClient.csproj @@ -22,8 +22,7 @@ - - + diff --git a/tests/DevApps/Directory.Build.props b/tests/DevApps/Directory.Build.props index 6baadbd9a..dfac73a4f 100644 --- a/tests/DevApps/Directory.Build.props +++ b/tests/DevApps/Directory.Build.props @@ -1,11 +1,26 @@ - net6.0; net7.0; net8.0 - net6.0; net7.0 - true - false - 11 + net6.0; net7.0; net8.0 + net6.0; net7.0 + true + false + 11 + + + + + 6.0.0 + + + + + 7.0.0 + + + + + 8.0.0-rc.2.23479.14 diff --git a/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/TodoListClient.csproj b/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/TodoListClient.csproj index 40275dd37..d35d892ae 100644 --- a/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/TodoListClient.csproj +++ b/tests/DevApps/WebAppCallsWebApiCallsGraph/Client/TodoListClient.csproj @@ -1,4 +1,4 @@ - + aspnet-WebApp_OpenIDConnect_DotNet-81EA87AD-E64D-4755-A1CC-5EA47F49B5D0 @@ -28,10 +28,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + diff --git a/tests/DevApps/WebAppCallsWebApiCallsGraph/TodoListService/TodoListService.csproj b/tests/DevApps/WebAppCallsWebApiCallsGraph/TodoListService/TodoListService.csproj index be7c19596..47e2090cd 100644 --- a/tests/DevApps/WebAppCallsWebApiCallsGraph/TodoListService/TodoListService.csproj +++ b/tests/DevApps/WebAppCallsWebApiCallsGraph/TodoListService/TodoListService.csproj @@ -8,10 +8,8 @@ - - - - + + diff --git a/tests/DevApps/aspnet-mvc/OwinWebApi/Web.config b/tests/DevApps/aspnet-mvc/OwinWebApi/Web.config index 2ecd7c190..4cfee7a19 100644 --- a/tests/DevApps/aspnet-mvc/OwinWebApi/Web.config +++ b/tests/DevApps/aspnet-mvc/OwinWebApi/Web.config @@ -58,11 +58,11 @@ - + - + @@ -74,7 +74,7 @@ - + @@ -82,23 +82,23 @@ - + - + - + - + - + @@ -170,7 +170,7 @@ - + diff --git a/tests/DevApps/aspnet-mvc/OwinWebApp/Web.config b/tests/DevApps/aspnet-mvc/OwinWebApp/Web.config index 3ce2f54d1..80d872ad9 100644 --- a/tests/DevApps/aspnet-mvc/OwinWebApp/Web.config +++ b/tests/DevApps/aspnet-mvc/OwinWebApp/Web.config @@ -59,11 +59,11 @@ - + - + @@ -75,7 +75,7 @@ - + @@ -83,23 +83,23 @@ - + - + - + - + - + @@ -163,7 +163,7 @@ - + diff --git a/tests/PerformanceTests/PerformanceTestService/PerformanceTestService.csproj b/tests/PerformanceTests/PerformanceTestService/PerformanceTestService.csproj index 5f4ee9dbe..e5bb4a1dd 100644 --- a/tests/PerformanceTests/PerformanceTestService/PerformanceTestService.csproj +++ b/tests/PerformanceTests/PerformanceTestService/PerformanceTestService.csproj @@ -8,14 +8,27 @@ ../../../build/MSAL.snk + + + 6.0.0 + + + + + 7.0.0 + + + + + 8.0.0-rc.2.23479.14 + + - - - +