From 68b878f0e135f28260950fa485dcd53eae1da3a9 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 16 Nov 2018 16:27:58 -0800 Subject: [PATCH] Upgrade packages and projects to target netcoreapp3.0 (aspnet/Identity#2072) * Upgrade dependencies * Change TFM on Microsoft.AspNetCore.Identity to netcoreapp3.0 * Remove .NET Framework tests --- Directory.Build.targets | 6 +- NuGetPackageVerifier.json | 4 +- build/dependencies.props | 108 +++++++++--------- build/repo.props | 4 +- korebuild-lock.txt | 4 +- samples/ApiAuthSample/ApiAuthSample.csproj | 2 +- .../IdentitySample.DefaultUI.csproj | 2 +- .../IdentitySample.Mvc.csproj | 2 +- ...ore.ApiAuthorization.IdentityServer.csproj | 2 +- ...etCore.Identity.EntityFrameworkCore.csproj | 2 +- .../Microsoft.AspNetCore.Identity.csproj | 2 +- ...etCore.Identity.Specification.Tests.csproj | 2 +- .../Microsoft.AspNetCore.Identity.UI.csproj | 2 +- ...AspNetCore.Identity.FunctionalTests.csproj | 5 +- .../Microsoft.AspNetCore.Identity.Test.csproj | 2 +- test/WebSites/Directory.Build.props | 6 - .../Identity.DefaultUI.WebSite.csproj | 2 +- 17 files changed, 71 insertions(+), 86 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 659aae3970..7e3f8df92e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,10 +1,6 @@ - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(MicrosoftNETCoreApp30PackageVersion) + $(MicrosoftNETCoreAppPackageVersion) $(NETStandardLibrary20PackageVersion) - - 99.9 diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index 63a774a555..eff389943d 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -7,8 +7,8 @@ "Microsoft.AspNetCore.Identity.UI": { "Exclusions": { "DOC_MISSING": { - "lib/netstandard2.0/Microsoft.AspNetCore.Identity.UI.Views.V3.dll": "This assembly is generated and contains precompiled razor pages", - "lib/netstandard2.0/Microsoft.AspNetCore.Identity.UI.Views.V4.dll": "This assembly is generated and contains precompiled razor pages" + "lib/netcoreapp3.0/Microsoft.AspNetCore.Identity.UI.Views.V3.dll": "This assembly is generated and contains precompiled razor pages", + "lib/netcoreapp3.0/Microsoft.AspNetCore.Identity.UI.Views.V4.dll": "This assembly is generated and contains precompiled razor pages" } } } diff --git a/build/dependencies.props b/build/dependencies.props index 84d37ea37a..5b75c34c51 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,66 +4,64 @@ 0.9.9 - 3.0.0-alpha1-20181031.3 - 2.3.0-preview1-update2 2.3.0-preview1-update2 2.3.0-preview1-update1 - 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 - 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 - 3.0.0-alpha1-10670 - 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-10657 + 2.3.0-preview1-update2 + 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-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 2.2.1 - 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 - 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-10657 - 2.0.9 - 2.1.3 - 3.0.0-preview1-26907-05 - 3.0.0-a-alpha1-sdk-31869 + 3.0.0-preview-181109-02 + 3.0.0-preview-181109-02 + 3.0.0-preview-181109-02 + 3.0.0-preview-181109-02 + 3.0.0-preview-181109-02 + 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-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-preview-181113-11 + 3.0.0-preview1-26907-05 + 3.0.0-alpha1-10742 15.6.1 3.0.1 - 3.0.0-alpha1-10670 + 3.0.0-alpha1-10742 4.10.0 2.0.3 4.6.0-preview1-26907-04 diff --git a/build/repo.props b/build/repo.props index 17a98ac7e7..4402da1d0d 100644 --- a/build/repo.props +++ b/build/repo.props @@ -8,8 +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/ApiAuthSample/ApiAuthSample.csproj b/samples/ApiAuthSample/ApiAuthSample.csproj index 310eb11497..d6f43b9d64 100644 --- a/samples/ApiAuthSample/ApiAuthSample.csproj +++ b/samples/ApiAuthSample/ApiAuthSample.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net461 + netcoreapp3.0 aspnet-ApiAuthSample-12ED8ECC-9EF1-4D31-87B4-1405B3198E5E diff --git a/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj b/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj index 168eda9496..39f6bb9d43 100644 --- a/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj +++ b/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj @@ -2,7 +2,7 @@ Identity sample MVC application on ASP.NET Core using the default UI - netcoreapp3.0;net461 + netcoreapp3.0 aspnetcore-2ff9bc27-5e8c-4484-90ca-e3aace89b72a diff --git a/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj b/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj index c45ff1af2c..8b3e7f604a 100644 --- a/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj +++ b/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj @@ -2,7 +2,7 @@ Identity sample MVC application on ASP.NET Core - netcoreapp3.0;net461 + netcoreapp3.0 aspnetcore-b3d20cbe-418e-4bf2-a0f4-57f91d067e07 diff --git a/src/ApiAuth.IS/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj b/src/ApiAuth.IS/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj index 43405cd018..1e0af1cd26 100644 --- a/src/ApiAuth.IS/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj +++ b/src/ApiAuth.IS/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netcoreapp3.0 ASP.NET Core API Authorization package powered by Identity Server. true aspnetcore;apiauth;identity diff --git a/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj b/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj index 79339b9c1e..69565262fb 100644 --- a/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj +++ b/src/EF/Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj @@ -2,7 +2,7 @@ ASP.NET Core Identity provider that uses Entity Framework Core. - netstandard2.0 + netcoreapp3.0 true aspnetcore;entityframeworkcore;identity;membership diff --git a/src/Identity/Microsoft.AspNetCore.Identity.csproj b/src/Identity/Microsoft.AspNetCore.Identity.csproj index fc0fae70c8..9ef7ddb110 100644 --- a/src/Identity/Microsoft.AspNetCore.Identity.csproj +++ b/src/Identity/Microsoft.AspNetCore.Identity.csproj @@ -2,7 +2,7 @@ ASP.NET Core Identity is the membership system for building ASP.NET Core web applications, including membership, login, and user data. ASP.NET Core Identity allows you to add login features to your application and makes it easy to customize data about the logged in user. - netstandard2.0 + netcoreapp3.0 true aspnetcore;identity;membership diff --git a/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj b/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj index 668159786b..22a7b552f9 100644 --- a/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj +++ b/src/Specification.Tests/Microsoft.AspNetCore.Identity.Specification.Tests.csproj @@ -2,7 +2,7 @@ Shared test suite for Asp.Net Identity Core store implementations. - netstandard2.0 + netcoreapp3.0 true aspnetcore;identity;membership diff --git a/src/UI/Microsoft.AspNetCore.Identity.UI.csproj b/src/UI/Microsoft.AspNetCore.Identity.UI.csproj index 7d4043f2ac..6f79a1e4bb 100644 --- a/src/UI/Microsoft.AspNetCore.Identity.UI.csproj +++ b/src/UI/Microsoft.AspNetCore.Identity.UI.csproj @@ -3,7 +3,7 @@ ASP.NET Core Identity UI is the default Razor Pages built-in UI for the ASP.NET Core Identity framework. Compiled Razor views assembly for the ASP.NET Core Identity UI package. - netstandard2.0 + netcoreapp3.0 true aspnetcore;identity;membership;razorpages true diff --git a/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj index baf9ad55b0..3c201f9c7b 100644 --- a/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj +++ b/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj @@ -1,8 +1,7 @@ - $(StandardTestTfms) - + netcoreapp3.0 @@ -27,7 +26,7 @@ - <_IdentityUIViewsAssemblies Include="$(MSBuildThisFileDirectory)..\..\src\UI\bin\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" /> + <_IdentityUIViewsAssemblies Include="$(MSBuildThisFileDirectory)..\..\src\UI\bin\$(Configuration)\netcoreapp3.0\Microsoft.AspNetCore.Identity.UI.Views.*.dll" /> - $(StandardTestTfms) + netcoreapp3.0 diff --git a/test/WebSites/Directory.Build.props b/test/WebSites/Directory.Build.props index 571723247e..c8a4ec4440 100644 --- a/test/WebSites/Directory.Build.props +++ b/test/WebSites/Directory.Build.props @@ -1,10 +1,4 @@ - - - netcoreapp3.0 - $(DeveloperBuildTestWebsiteTfms) - $(StandardTestWebsiteTfms) - diff --git a/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj b/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj index f70236936e..17fa5548f4 100644 --- a/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj +++ b/test/WebSites/Identity.DefaultUI.WebSite/Identity.DefaultUI.WebSite.csproj @@ -1,7 +1,7 @@  - $(StandardTestWebsiteTfms) + netcoreapp3.0 aspnet-Identity.DefaultUI.WebSite-80C658D8-CED7-467F-9B47-75DA3BC1A16D