From 38f691c09e3aae4f34be139c39ae1fb264803fd0 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 8 May 2018 11:02:12 -0700 Subject: [PATCH] Upgrade to netcoreapp22 (#1410) --- Directory.Build.targets | 5 +- build/dependencies.props | 61 ++++++++++--------- build/repo.props | 3 +- korebuild-lock.txt | 4 +- .../GenericHostSample.csproj | 2 +- samples/GenericWebHost/GenericWebHost.csproj | 2 +- samples/SampleStartups/SampleStartups.csproj | 4 +- .../Deployers/SelfHostDeployer.cs | 2 +- test/Directory.Build.props | 4 +- ....AspNetCore.Hosting.FunctionalTests.csproj | 2 +- .../ShutdownTests.cs | 2 +- .../WebHostBuilderTests.cs | 2 +- .../ClientHandlerTests.cs | 4 +- test/TestAssets/Directory.Build.props | 6 +- .../TestStartupAssembly1.csproj | 4 +- 15 files changed, 56 insertions(+), 51 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 53b3f6e1da..78626b773e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,7 +1,10 @@ - + $(MicrosoftNETCoreApp20PackageVersion) $(MicrosoftNETCoreApp21PackageVersion) + $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) + + 99.9 diff --git a/build/dependencies.props b/build/dependencies.props index 51207ba0d1..e79ed8b193 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,39 +1,40 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17047 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 + 2.2.0-preview1-17048 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 2.0.0 2.2.0-preview1-26424-04 + 2.2.0-preview1-26502-01 1.0.1 15.6.1 4.7.49 diff --git a/build/repo.props b/build/repo.props index 97e8f78223..d115087735 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,4 +1,4 @@ - + @@ -14,5 +14,6 @@ + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 18df6940ae..da5dcd1202 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17047 -commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c +version:2.2.0-preview1-17048 +commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8 diff --git a/samples/GenericHostSample/GenericHostSample.csproj b/samples/GenericHostSample/GenericHostSample.csproj index 83a4ea2fc7..122533cc8d 100644 --- a/samples/GenericHostSample/GenericHostSample.csproj +++ b/samples/GenericHostSample/GenericHostSample.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1;net461 + netcoreapp2.2;net461 GenericHostSample.ProgramHelloWorld Exe latest diff --git a/samples/GenericWebHost/GenericWebHost.csproj b/samples/GenericWebHost/GenericWebHost.csproj index 34abb4e990..3f301ed6e3 100644 --- a/samples/GenericWebHost/GenericWebHost.csproj +++ b/samples/GenericWebHost/GenericWebHost.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1;net461 + netcoreapp2.2;net461 latest true diff --git a/samples/SampleStartups/SampleStartups.csproj b/samples/SampleStartups/SampleStartups.csproj index 52a90cdc3c..2a606543c5 100644 --- a/samples/SampleStartups/SampleStartups.csproj +++ b/samples/SampleStartups/SampleStartups.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.1;net461 + netcoreapp2.2;net461 SampleStartups.StartupInjection exe diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs index f68fb7fbd6..dcb34788f6 100644 --- a/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs +++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting/Deployers/SelfHostDeployer.cs @@ -94,7 +94,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting else { workingDirectory = DeploymentParameters.ApplicationPath; - var targetFramework = DeploymentParameters.TargetFramework ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0"); + var targetFramework = DeploymentParameters.TargetFramework ?? (DeploymentParameters.RuntimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.2"); executableName = DotnetCommandName; executableArgs = $"run --no-build -c {DeploymentParameters.Configuration} --framework {targetFramework} {DotnetArgumentSeparator}"; diff --git a/test/Directory.Build.props b/test/Directory.Build.props index ffda45d379..558c29ae38 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,9 +2,9 @@ - netcoreapp2.1 + netcoreapp2.2 $(DeveloperBuildTestTfms) - $(StandardTestTfms);netcoreapp2.0 + $(StandardTestTfms) $(StandardTestTfms);net461 diff --git a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj index 8abf2de680..da0734c750 100644 --- a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp2.2 diff --git a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/ShutdownTests.cs b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/ShutdownTests.cs index 1c229e96b8..b54b923a89 100644 --- a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/ShutdownTests.cs +++ b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/ShutdownTests.cs @@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests RuntimeArchitecture.x64) { EnvironmentName = "Shutdown", - TargetFramework = "netcoreapp2.0", + TargetFramework = "netcoreapp2.2", ApplicationType = ApplicationType.Portable, PublishApplicationBeforeDeployment = true, StatusMessagesEnabled = false diff --git a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/WebHostBuilderTests.cs b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/WebHostBuilderTests.cs index 4a56c432be..ec5dd12651 100644 --- a/test/Microsoft.AspNetCore.Hosting.FunctionalTests/WebHostBuilderTests.cs +++ b/test/Microsoft.AspNetCore.Hosting.FunctionalTests/WebHostBuilderTests.cs @@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Hosting.FunctionalTests runtimeFlavor, RuntimeArchitecture.x64) { - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", + TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.2", ApplicationType = ApplicationType.Portable, StatusMessagesEnabled = false }; diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs index aeed94a6a8..e90a79e97b 100644 --- a/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs +++ b/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNetCore.TestHost var handler = new ClientHandler(new PathString("/A/Path/"), new DummyApplication(context => { // TODO: Assert.True(context.RequestAborted.CanBeCanceled); -#if NETCOREAPP2_1 +#if NETCOREAPP2_2 Assert.Equal("HTTP/2.0", context.Request.Protocol); #elif NET461 || NETCOREAPP2_0 Assert.Equal("HTTP/1.1", context.Request.Protocol); @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.TestHost var handler = new ClientHandler(new PathString("/A/Path/"), new InspectingApplication(features => { // TODO: Assert.True(context.RequestAborted.CanBeCanceled); -#if NETCOREAPP2_1 +#if NETCOREAPP2_2 Assert.Equal("HTTP/2.0", features.Get().Protocol); #elif NET461 || NETCOREAPP2_0 Assert.Equal("HTTP/1.1", features.Get().Protocol); diff --git a/test/TestAssets/Directory.Build.props b/test/TestAssets/Directory.Build.props index 754b616d8b..6b3e58155c 100644 --- a/test/TestAssets/Directory.Build.props +++ b/test/TestAssets/Directory.Build.props @@ -1,11 +1,11 @@ - + - netcoreapp2.1 + netcoreapp2.2 $(DeveloperBuildTestAssetTfms) - $(StandardTestAssetTfms);netcoreapp2.0 + $(StandardTestAssetTfms) $(StandardTestAssetTfms);net461 diff --git a/test/TestAssets/TestStartupAssembly1/TestStartupAssembly1.csproj b/test/TestAssets/TestStartupAssembly1/TestStartupAssembly1.csproj index 5cf442c4ac..fffa97ef87 100644 --- a/test/TestAssets/TestStartupAssembly1/TestStartupAssembly1.csproj +++ b/test/TestAssets/TestStartupAssembly1/TestStartupAssembly1.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.0;net461 + netcoreapp2.2;net461