From e3dcd413049e472b7737ad25ddff0df21bbec829 Mon Sep 17 00:00:00 2001 From: Javier Calvarro Nelson Date: Thu, 28 Nov 2019 23:12:44 +0100 Subject: [PATCH] [Blazor] Pins the SDK version to 3.1 and forces Blazor projects to compile against it (#17479) --- NuGet.config | 1 + eng/ProjectReferences.props | 2 +- eng/Version.Details.xml | 40 +++++++++---------- eng/Versions.props | 20 +++++----- global.json | 4 +- .../blazorhosted/blazorhosted.csproj | 1 + ...crosoft.AspNetCore.Blazor.DevServer.csproj | 7 ++-- src/Components/Blazor/Directory.Build.props | 5 ++- src/Components/Blazor/Directory.Build.targets | 1 + .../Microsoft.AspNetCore.Blazor.Server.csproj | 16 -------- ...oft.AspNetCore.Blazor.Server.netcoreapp.cs | 22 ---------- .../Microsoft.AspNetCore.Blazor.Server.csproj | 8 ++-- .../HostedInAspNet.Server.csproj | 5 ++- .../testassets/MonoSanity/MonoSanity.csproj | 4 +- src/Components/Directory.Build.props | 4 ++ src/Components/Directory.Build.targets | 20 ++++++++++ ...soft.AspNetCore.Components.E2ETests.csproj | 3 ++ .../TestServer/Components.TestServer.csproj | 8 +--- .../Infrastructure/GenerateTestProps.targets | 5 ++- 19 files changed, 84 insertions(+), 92 deletions(-) delete mode 100644 src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.csproj delete mode 100644 src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.netcoreapp.cs diff --git a/NuGet.config b/NuGet.config index 7003d991f5..b6e782858b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,7 @@ + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 2d76a76785..350c026a7d 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -17,6 +17,7 @@ + @@ -138,7 +139,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e00291e51..4d4af8a44a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,33 +29,33 @@ https://github.com/aspnet/AspNetCore-Tooling abd3c17b317dbe455b18a4f5937c43e0fc7a2944 - + https://github.com/aspnet/EntityFrameworkCore - a2f33c7d5125c6f3b671e55eb1bc58489041ad01 + 82c6ea483d3a17393dad5986df9a8eef89ddcd07 - + https://github.com/aspnet/EntityFrameworkCore - a2f33c7d5125c6f3b671e55eb1bc58489041ad01 + 82c6ea483d3a17393dad5986df9a8eef89ddcd07 - + https://github.com/aspnet/EntityFrameworkCore - a2f33c7d5125c6f3b671e55eb1bc58489041ad01 + 82c6ea483d3a17393dad5986df9a8eef89ddcd07 - + https://github.com/aspnet/EntityFrameworkCore - a2f33c7d5125c6f3b671e55eb1bc58489041ad01 + 82c6ea483d3a17393dad5986df9a8eef89ddcd07 - + https://github.com/aspnet/EntityFrameworkCore - a2f33c7d5125c6f3b671e55eb1bc58489041ad01 + 82c6ea483d3a17393dad5986df9a8eef89ddcd07 - + https://github.com/aspnet/EntityFrameworkCore - a2f33c7d5125c6f3b671e55eb1bc58489041ad01 + 82c6ea483d3a17393dad5986df9a8eef89ddcd07 - + https://github.com/aspnet/EntityFrameworkCore - a2f33c7d5125c6f3b671e55eb1bc58489041ad01 + 82c6ea483d3a17393dad5986df9a8eef89ddcd07 https://github.com/aspnet/Extensions @@ -381,21 +381,21 @@ https://github.com/dotnet/corefx 0f7f38c4fd323b26da10cce95f857f77f0f09b48 - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 - + https://github.com/dotnet/core-setup - 9541fa09c354ea9288db00b8c1b95a34a3abdcdc + 65f04fb6db7a5e198d05dbebd5c4ad21eb018f89 https://github.com/dotnet/core-setup diff --git a/eng/Versions.props b/eng/Versions.props index 60c7906874..57ce7893d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,9 +66,9 @@ 3.4.0-beta4-19569-03 - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 - 3.1.1-servicing.19572.8 + 3.1.0 + 3.1.0 + 3.1.0 2.1.0 1.1.0 @@ -160,13 +160,13 @@ 3.1.0 3.1.0-preview4.19572.8 - 3.1.0-rtm.19573.1 - 3.1.0-rtm.19573.1 - 3.1.0-rtm.19573.1 - 3.1.0-rtm.19573.1 - 3.1.0-rtm.19573.1 - 3.1.0-rtm.19573.1 - 3.1.0-rtm.19573.1 + 3.1.0 + 3.1.0 + 3.1.0 + 3.1.0 + 3.1.0 + 3.1.0 + 3.1.0 3.1.0-rtm.19573.1 3.1.0-rtm.19573.1 diff --git a/global.json b/global.json index 1333ea9ce6..f8f800baef 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "3.1.100-preview1-014400" + "version": "3.1.100" }, "tools": { - "dotnet": "3.1.100-preview1-014400", + "dotnet": "3.1.100", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCoreAppRuntimeVersion)" diff --git a/src/Components/Blazor/Build/testassets/blazorhosted/blazorhosted.csproj b/src/Components/Blazor/Build/testassets/blazorhosted/blazorhosted.csproj index 3b08400ff7..5a89588d8c 100644 --- a/src/Components/Blazor/Build/testassets/blazorhosted/blazorhosted.csproj +++ b/src/Components/Blazor/Build/testassets/blazorhosted/blazorhosted.csproj @@ -2,6 +2,7 @@ netcoreapp3.1 + true diff --git a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj index d18ab7c9e4..be0bd7f87b 100644 --- a/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj +++ b/src/Components/Blazor/DevServer/src/Microsoft.AspNetCore.Blazor.DevServer.csproj @@ -11,15 +11,14 @@ Development server for use when building Blazor applications. false + + + true - - - - diff --git a/src/Components/Blazor/Directory.Build.props b/src/Components/Blazor/Directory.Build.props index f04afda6db..9e35475c86 100644 --- a/src/Components/Blazor/Directory.Build.props +++ b/src/Components/Blazor/Directory.Build.props @@ -6,5 +6,8 @@ 3.1.0 preview4 + + 3.1.0 - \ No newline at end of file + diff --git a/src/Components/Blazor/Directory.Build.targets b/src/Components/Blazor/Directory.Build.targets index 178608d3e5..e1a17eb9ca 100644 --- a/src/Components/Blazor/Directory.Build.targets +++ b/src/Components/Blazor/Directory.Build.targets @@ -4,4 +4,5 @@ $(PackageVersion) + diff --git a/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.csproj b/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.csproj deleted file mode 100644 index 9222fac02f..0000000000 --- a/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - $(DefaultNetCoreTargetFramework) - - - - - - - - - - - - diff --git a/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.netcoreapp.cs b/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.netcoreapp.cs deleted file mode 100644 index 74cf8a6a8b..0000000000 --- a/src/Components/Blazor/Server/ref/Microsoft.AspNetCore.Blazor.Server.netcoreapp.cs +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.AspNetCore.Builder -{ - public static partial class BlazorHostingApplicationBuilderExtensions - { - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseClientSideBlazorFiles(this Microsoft.AspNetCore.Builder.IApplicationBuilder app, string clientAssemblyFilePath) { throw null; } - public static Microsoft.AspNetCore.Builder.IApplicationBuilder UseClientSideBlazorFiles(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) { throw null; } - } - public static partial class BlazorHostingEndpointRouteBuilderExtensions - { - public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapFallbackToClientSideBlazor(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string clientAssemblyFilePath, string filePath) { throw null; } - public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapFallbackToClientSideBlazor(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string clientAssemblyFilePath, string pattern, string filePath) { throw null; } - public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapFallbackToClientSideBlazor(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string filePath) { throw null; } - public static Microsoft.AspNetCore.Builder.IEndpointConventionBuilder MapFallbackToClientSideBlazor(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string pattern, string filePath) { throw null; } - } - public static partial class BlazorMonoDebugProxyAppBuilderExtensions - { - public static void UseBlazorDebugging(this Microsoft.AspNetCore.Builder.IApplicationBuilder app) { } - } -} diff --git a/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj b/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj index 2d7b2d8fb4..0ad19d5362 100644 --- a/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj +++ b/src/Components/Blazor/Server/src/Microsoft.AspNetCore.Blazor.Server.csproj @@ -4,6 +4,9 @@ $(DefaultNetCoreTargetFramework) Runtime server features for ASP.NET Core Blazor applications. true + false + + true @@ -11,11 +14,6 @@ - - - - - diff --git a/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj b/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj index 224ada3963..389b41c63f 100644 --- a/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj +++ b/src/Components/Blazor/testassets/HostedInAspNet.Server/HostedInAspNet.Server.csproj @@ -2,6 +2,9 @@ $(DefaultNetCoreTargetFramework) + + true + @@ -10,8 +13,6 @@ - - diff --git a/src/Components/Blazor/testassets/MonoSanity/MonoSanity.csproj b/src/Components/Blazor/testassets/MonoSanity/MonoSanity.csproj index 5297f5bca6..464f63b57c 100644 --- a/src/Components/Blazor/testassets/MonoSanity/MonoSanity.csproj +++ b/src/Components/Blazor/testassets/MonoSanity/MonoSanity.csproj @@ -2,6 +2,8 @@ $(DefaultNetCoreTargetFramework) + + true @@ -9,9 +11,7 @@ - - diff --git a/src/Components/Directory.Build.props b/src/Components/Directory.Build.props index 02d423b43e..ef310ac60d 100644 --- a/src/Components/Directory.Build.props +++ b/src/Components/Directory.Build.props @@ -12,6 +12,10 @@ aspnetcore;components + + 3.1.0 + $(MSBuildThisFileDirectory)Shared\ diff --git a/src/Components/Directory.Build.targets b/src/Components/Directory.Build.targets index b992960cc3..b6b1f773d9 100644 --- a/src/Components/Directory.Build.targets +++ b/src/Components/Directory.Build.targets @@ -3,6 +3,26 @@ true + + + + + + netcoreapp3.1 + Microsoft.AspNetCore.App + $(LatestAspNetCoreReferenceVersion) + $(LatestAspNetCoreReferenceVersion) + Microsoft.AspNetCore.App.Ref + $(LatestAspNetCoreReferenceVersion) + Microsoft.AspNetCore.App.Runtime.**RID** + linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86 + true + + + + diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj index 78fc48dc82..ac69ac235a 100644 --- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj +++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj @@ -7,6 +7,9 @@ $(DefaultNetCoreTargetFramework) Components.E2ETests + + true + false diff --git a/src/Components/test/testassets/TestServer/Components.TestServer.csproj b/src/Components/test/testassets/TestServer/Components.TestServer.csproj index 6c29275b2c..a627c1160f 100644 --- a/src/Components/test/testassets/TestServer/Components.TestServer.csproj +++ b/src/Components/test/testassets/TestServer/Components.TestServer.csproj @@ -2,18 +2,14 @@ $(DefaultNetCoreTargetFramework) + + true - - - - - - diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 4fa7130601..ea67b88cfa 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -16,6 +16,9 @@ %(_TargetingPackVersionInfo.PackageVersion) $(AspNetCoreBaselineVersion) + + + $(AspNetCoreBaselineVersion) @@ -34,7 +37,7 @@ MicrosoftNETCorePlatformsPackageVersion=$(MicrosoftNETCorePlatformsPackageVersion); MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion); MicrosoftAspNetCoreAppRefPackageVersion=$(MicrosoftAspNetCoreAppRefPackageVersion); - MicrosoftAspNetCoreAppRuntimePackageVersion=@(_RuntimePackageVersionInfo->'%(PackageVersion)'); + MicrosoftAspNetCoreAppRuntimePackageVersion=$(MicrosoftAspNetCoreAppRuntimePackageVersion); SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers); DefaultNetCoreTargetFramework=$(DefaultNetCoreTargetFramework);