From fbf727e073088b7196f9391ca7539e45f4713dac Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 7 May 2018 15:11:56 -0700 Subject: [PATCH] Upgrade to netcoreapp22 --- Directory.Build.targets | 5 +- build/dependencies.props | 61 ++++++++++--------- build/repo.props | 1 + korebuild-lock.txt | 4 +- .../NativeIISSample/NativeIISSample.csproj | 2 +- test/Directory.Build.props | 4 +- .../Inprocess/AuthenticationTests.cs | 2 +- .../Inprocess/StartupTests.cs | 2 +- .../OutOfProcess/HelloWorldTest.cs | 4 +- .../OutOfProcess/HttpsTest.cs | 8 +-- .../OutOfProcess/NtlmAuthentationTest.cs | 4 +- 11 files changed, 52 insertions(+), 45 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 ff93798e8c..b0618b5a9b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,41 +1,42 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 0.10.13 - 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 - 0.6.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-17049 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 0.6.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 15.6.82 15.6.82 - 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-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 + 2.2.0-preview1-34144 2.0.0 - 2.2.0-preview1-26424-04 - 2.2.0-preview1-34135 + 2.1.0-rc1 + 2.2.0-preview1-26424-04 + 2.2.0-preview1-34144 15.6.1 2.0.3 4.5.0-preview3-26423-04 diff --git a/build/repo.props b/build/repo.props index 4913e566c1..143448ce88 100644 --- a/build/repo.props +++ b/build/repo.props @@ -25,6 +25,7 @@ + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 18df6940ae..eb63d54c23 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-17049 +commithash:9c4fefdcd2b950f8b6da5aa3784fe200eb0664c2 diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/samples/NativeIISSample/NativeIISSample.csproj index d9bf22ba16..9c88fbe560 100644 --- a/samples/NativeIISSample/NativeIISSample.csproj +++ b/samples/NativeIISSample/NativeIISSample.csproj @@ -5,7 +5,7 @@ netcoreapp2.1 - + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 3a74fe4d2a..179511a68d 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,9 +2,11 @@ + netcoreapp2.1 $(DeveloperBuildTestTfms) - $(StandardTestTfms);netcoreapp2.0 + $(StandardTestTfms) $(StandardTestTfms);net461 diff --git a/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs index 4370014007..511021b72d 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/AuthenticationTests.cs @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } } -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target frameworks need to be updated #endif diff --git a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs index eaddefb45e..6777c35188 100644 --- a/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs +++ b/test/IISIntegration.FunctionalTests/Inprocess/StartupTests.cs @@ -96,7 +96,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_1 [Fact] // Consistently fails on CI for net461 public async Task StandaloneApplication_ExpectCorrectPublish() diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs index 1ef7f93143..7cee6a6777 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs @@ -1,6 +1,6 @@ // 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. -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_1 using System.IO; using System.Threading.Tasks; @@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld', ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Http.config") : null, SiteName = "HttpTestSite", // This is configured in the Http.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", + TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", ApplicationType = applicationType, ANCMVersion = ancmVersion }; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs index a5bdd30bbf..9066c60c72 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs @@ -1,6 +1,6 @@ // 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. -#if NETCOREAPP2_0 || NETCOREAPP2_1 +#if NETCOREAPP2_1 using System; using System.IO; @@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Https.config") : null, SiteName = "HttpsTestSite", // This is configured in the Https.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", + TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", ApplicationType = applicationType, ANCMVersion = ancmVersion }; @@ -98,7 +98,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [InlineData(ANCMVersion.AspNetCoreModuleV2)] public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable(ANCMVersion ancmVersion) { - return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false, ancmVersion); + return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44397, sendClientCert: false, ancmVersion); } [Theory(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")] @@ -145,7 +145,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld', ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Https.config") : null, SiteName = "HttpsTestSite", // This is configured in the Https.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", + TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", ApplicationType = applicationType, ANCMVersion = ancmVersion }; diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs index 04f1d4e77a..a5ed40c7c6 100644 --- a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs +++ b/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs @@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication' ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/NtlmAuthentation.config") : null, SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config - TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0", + TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.1", ApplicationType = applicationType, ANCMVersion = ancmVersion, @@ -126,7 +126,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } } -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_1 #else #error Target frameworks need to be updated #endif