diff --git a/Directory.Build.targets b/Directory.Build.targets index 4bcc9df925..7e3f8df92e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,8 +1,6 @@ - $(MicrosoftNETCoreApp30PackageVersion) + $(MicrosoftNETCoreAppPackageVersion) $(NETStandardLibrary20PackageVersion) - - 99.9 diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index adc8b62fce..66afb69831 100644 --- a/NuGetPackageVerifier.json +++ b/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/build/dependencies.props b/build/dependencies.props index 6d9528cea4..95e6001a48 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,31 +3,30 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 3.0.0-alpha1-20181031.3 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-a-alpha1-react-razor-design-19157 - 3.0.0-a-alpha1-react-razor-design-19157 - 2.2.0-rtm-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 3.0.0-alpha1-10670 - 2.0.9 - 3.0.0-preview1-26907-05 - 3.0.0-a-alpha1-sdk-31869 + 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.10.0 2.0.3 diff --git a/build/repo.props b/build/repo.props index e88aa908e5..4402da1d0d 100644 --- a/build/repo.props +++ b/build/repo.props @@ -8,7 +8,6 @@ - - + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 8494b2123e..73613543d0 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-alpha1-20181031.3 -commithash:93e5628f435045e3f2a766933dc5062048ac0426 +version:3.0.0-build-20181114.5 +commithash:880e9a204d4ee4a18dfd83c9fb05a192a28bca60 diff --git a/samples/AzureADB2CSample/AzureADB2CSample.csproj b/samples/AzureADB2CSample/AzureADB2CSample.csproj index 1969732fa4..1e4e228ccf 100644 --- a/samples/AzureADB2CSample/AzureADB2CSample.csproj +++ b/samples/AzureADB2CSample/AzureADB2CSample.csproj @@ -1,9 +1,7 @@ - netcoreapp3.0 - $(TargetFrameworks) - $(TargetFrameworks);net461 + netcoreapp3.0 diff --git a/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj b/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj index facb8db0ea..00a3d36749 100644 --- a/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj +++ b/src/Microsoft.AspNetCore.Authentication.AzureAD.UI/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj @@ -3,7 +3,7 @@ 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 diff --git a/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj b/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj index dd530e5e87..c1f77ce905 100644 --- a/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj +++ b/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj @@ -3,7 +3,7 @@ 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 diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 8d36c0bf28..35b63d60ae 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,13 +1,6 @@ - - netcoreapp3.0 - $(DeveloperBuildTestTfms) - - $(StandardTestTfms);net461 - - false xUnit1026:$(WarningsNotAsErrors) diff --git a/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj index e0d1023e9e..be07303a4c 100644 --- a/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj @@ -1,8 +1,7 @@ - $(StandardTestTfms) - + netcoreapp3.0 diff --git a/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj b/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj index 4daafb39ac..554232c8a4 100644 --- a/test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test/Microsoft.AspNetCore.Authentication.AzureAD.UI.Test.csproj +++ b/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/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj b/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj index a838fc2703..7becca1b5e 100644 --- a/test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Test.csproj +++ b/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/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj b/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj index 4dac556941..b23f727ae3 100644 --- a/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj +++ b/test/WebSites/AzureAD.WebSite/AzureAD.WebSite.csproj @@ -1,7 +1,7 @@ - $(StandardTestWebsiteTfms) + netcoreapp3.0 diff --git a/test/WebSites/Directory.Build.props b/test/WebSites/Directory.Build.props index 29cbcb7544..c8a4ec4440 100644 --- a/test/WebSites/Directory.Build.props +++ b/test/WebSites/Directory.Build.props @@ -1,11 +1,4 @@ - - - netcoreapp3.0 - $(DeveloperBuildTestWebsiteTfms) - $(StandardTestWebsiteTfms) - $(StandardTestWebsiteTfms);net461 -