diff --git a/src/AADIntegration/Directory.Build.targets b/src/AADIntegration/Directory.Build.targets index 78626b773e..7e3f8df92e 100644 --- a/src/AADIntegration/Directory.Build.targets +++ b/src/AADIntegration/Directory.Build.targets @@ -1,10 +1,6 @@ - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp22PackageVersion) + $(MicrosoftNETCoreAppPackageVersion) $(NETStandardLibrary20PackageVersion) - - 99.9 diff --git a/src/AADIntegration/NuGetPackageVerifier.json b/src/AADIntegration/NuGetPackageVerifier.json index adc8b62fce..66afb69831 100644 --- a/src/AADIntegration/NuGetPackageVerifier.json +++ b/src/AADIntegration/NuGetPackageVerifier.json @@ -7,14 +7,14 @@ "Microsoft.AspNetCore.Authentication.AzureADB2C.UI": { "Exclusions": { "DOC_MISSING": { - "lib/netstandard2.0/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Views.dll": "This library contains precompiled views." + "lib/netcoreapp3.0/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Views.dll": "This library contains precompiled views." } } }, "Microsoft.AspNetCore.Authentication.AzureAD.UI": { "Exclusions": { "DOC_MISSING": { - "lib/netstandard2.0/Microsoft.AspNetCore.Authentication.AzureAD.UI.Views.dll": "This library contains precompiled views." + "lib/netcoreapp3.0/Microsoft.AspNetCore.Authentication.AzureAD.UI.Views.dll": "This library contains precompiled views." } } } diff --git a/src/AADIntegration/build/dependencies.props b/src/AADIntegration/build/dependencies.props index c1628a677c..95e6001a48 100644 --- a/src/AADIntegration/build/dependencies.props +++ b/src/AADIntegration/build/dependencies.props @@ -3,34 +3,32 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180928.5 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.0.9 - 2.1.3 - 2.2.0-preview3-26927-02 - 2.2.0-preview3-35359 + 3.0.0-build-20181114.5 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-alpha1-10742 + 3.0.0-preview-181113-11 + 3.0.0-preview-181113-11 + 3.0.0-preview-181113-11 + 3.0.0-preview-181113-11 + 3.0.0-preview-181113-11 + 3.0.0-preview-181113-11 + 3.0.0-preview-181113-11 + 3.0.0-preview-181113-11 + 3.0.0-preview1-26907-05 + 3.0.0-alpha1-10742 15.6.1 - 4.7.49 + 4.10.0 2.0.3 0.10.0 2.3.1 diff --git a/src/AADIntegration/build/repo.props b/src/AADIntegration/build/repo.props index f1fe24dd27..4402da1d0d 100644 --- a/src/AADIntegration/build/repo.props +++ b/src/AADIntegration/build/repo.props @@ -4,13 +4,10 @@ Internal.AspNetCore.Universe.Lineup - 2.2.0-* https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - - + diff --git a/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj b/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj index 14b499103d..1e4e228ccf 100644 --- a/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj +++ b/src/AADIntegration/samples/AzureADB2CSample/AzureADB2CSample.csproj @@ -1,9 +1,7 @@ - netcoreapp2.2 - $(TargetFrameworks) - $(TargetFrameworks);net461 + netcoreapp3.0 diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj index 710d066434..00a3d36749 100644 --- a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj +++ b/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj @@ -3,10 +3,14 @@ ASP.NET Core Azure Active Directory Integration provides components for easily integrating Azure Active Directory authentication within your ASP.NET Core application. Precompiled views assembly for the ASP.NET Core Azure Active Directory Integration package. - netstandard2.0 + netcoreapp3.0 aspnetcore;authentication;AzureAD true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core + + <_EnableAllInclusiveRazorSdk>true + 3.0 + MVC-3.0 diff --git a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj index e63e02980f..c1f77ce905 100644 --- a/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj +++ b/src/AADIntegration/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj @@ -3,10 +3,14 @@ ASP.NET Core Azure Active Directory B2C Integration provides components for easily integrating Azure Active Directory B2C authentication within your ASP.NET Core application. Precompiled views assembly for the ASP.NET Core Azure Active Directory B2C Integration package. - netstandard2.0 + netcoreapp3.0 aspnetcore;authentication;AzureADB2C true Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core + + <_EnableAllInclusiveRazorSdk>true + 3.0 + MVC-3.0 diff --git a/src/AADIntegration/test/Directory.Build.props b/src/AADIntegration/test/Directory.Build.props index 7cf5dcd771..35b63d60ae 100644 --- a/src/AADIntegration/test/Directory.Build.props +++ b/src/AADIntegration/test/Directory.Build.props @@ -1,13 +1,6 @@ - - netcoreapp2.2 - $(DeveloperBuildTestTfms) - - $(StandardTestTfms);net461 - - false xUnit1026:$(WarningsNotAsErrors) diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj index fa61c208d3..be07303a4c 100644 --- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj +++ b/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj @@ -1,8 +1,7 @@ - $(StandardTestTfms) - + netcoreapp3.0 @@ -18,4 +17,4 @@ - \ No newline at end of file + diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj b/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj index 4daafb39ac..554232c8a4 100644 --- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj +++ b/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp3.0 Microsoft.AspNetCore.Authentication.AzureAD.UI diff --git a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj b/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj index a838fc2703..7becca1b5e 100644 --- a/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj +++ b/src/AADIntegration/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj @@ -1,7 +1,7 @@ - $(StandardTestTfms) + netcoreapp3.0 Microsoft.AspNetCore.Authentication.AzureADB2C.UI diff --git a/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj b/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj index 4dac556941..b23f727ae3 100644 --- a/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj +++ b/src/AADIntegration/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj @@ -1,7 +1,7 @@ - $(StandardTestWebsiteTfms) + netcoreapp3.0 diff --git a/src/AADIntegration/test/WebSites/Directory.Build.props b/src/AADIntegration/test/WebSites/Directory.Build.props index ed2a214a03..c8a4ec4440 100644 --- a/src/AADIntegration/test/WebSites/Directory.Build.props +++ b/src/AADIntegration/test/WebSites/Directory.Build.props @@ -1,11 +1,4 @@ - - - netcoreapp2.2 - $(DeveloperBuildTestWebsiteTfms) - $(StandardTestWebsiteTfms) - $(StandardTestWebsiteTfms);net461 - - \ No newline at end of file + diff --git a/src/AADIntegration/version.props b/src/AADIntegration/version.props index a51450c625..e796179bb9 100644 --- a/src/AADIntegration/version.props +++ b/src/AADIntegration/version.props @@ -1,8 +1,8 @@ - 2.2.0 - 0.4.0 - rtm + 3.0.0 + 0.5.0 + alpha1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000