From 3e277c8dd97ffb38e92a12f3bd09d3b2e91b588c Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 14 Nov 2017 10:44:25 -0800 Subject: [PATCH] Update samples and tests to target netcoreapp2.1 --- Directory.Build.props | 4 ++++ korebuild-lock.txt | 4 ++-- samples/IISSample/IISSample.csproj | 2 +- samples/NativeIISSample/NativeIISSample.csproj | 2 +- test/Directory.Build.props | 7 +++++++ test/IISIntegration.FunctionalTests/HelloWorldTest.cs | 2 +- test/IISIntegration.FunctionalTests/HttpsTest.cs | 2 +- .../IISIntegration.FunctionalTests.csproj | 5 ++--- .../IISIntegration.FunctionalTests/NtlmAuthentationTest.cs | 2 +- .../AuthenticationTests.cs | 2 +- .../IISIntegration.IISServerFunctionalTests.csproj | 5 ++--- test/IISTestSite/IISTestSite.csproj | 5 ++--- ...Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj | 5 ++--- test/TestSites/TestSites.csproj | 5 ++--- 14 files changed, 29 insertions(+), 23 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 5a6091cbfe..d96e5dc0b4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,8 @@ + + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 39c6b28034..95f4613014 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-15552 -commithash:526c2d8d521343e5a29c2a1323925528cb94e873 +version:2.1.0-preview1-15567 +commithash:903e3104807b1bb8cddd28bdef205b1e2dc021d1 diff --git a/samples/IISSample/IISSample.csproj b/samples/IISSample/IISSample.csproj index 826a6eb9c4..f8dafd69ef 100644 --- a/samples/IISSample/IISSample.csproj +++ b/samples/IISSample/IISSample.csproj @@ -1,7 +1,7 @@ - netcoreapp2.0;net461 + netcoreapp2.1;net461 diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/samples/NativeIISSample/NativeIISSample.csproj index a5702825de..61cb0a42b5 100644 --- a/samples/NativeIISSample/NativeIISSample.csproj +++ b/samples/NativeIISSample/NativeIISSample.csproj @@ -1,6 +1,6 @@ - netcoreapp2.0 + netcoreapp2.1 diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 4b89a431e7..3a74fe4d2a 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,6 +1,13 @@ + + netcoreapp2.1 + $(DeveloperBuildTestTfms) + $(StandardTestTfms);netcoreapp2.0 + $(StandardTestTfms);net461 + + diff --git a/test/IISIntegration.FunctionalTests/HelloWorldTest.cs b/test/IISIntegration.FunctionalTests/HelloWorldTest.cs index 6a21b85b90..904a6a38d2 100644 --- a/test/IISIntegration.FunctionalTests/HelloWorldTest.cs +++ b/test/IISIntegration.FunctionalTests/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 +#if NETCOREAPP2_0 || NETCOREAPP2_1 using System; using System.IO; diff --git a/test/IISIntegration.FunctionalTests/HttpsTest.cs b/test/IISIntegration.FunctionalTests/HttpsTest.cs index 7ab2bccf99..a3d91b969d 100644 --- a/test/IISIntegration.FunctionalTests/HttpsTest.cs +++ b/test/IISIntegration.FunctionalTests/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 +#if NETCOREAPP2_0 || NETCOREAPP2_1 using System; using System.IO; diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj index b2a3c97f31..b0602adbfd 100644 --- a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj +++ b/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj @@ -1,8 +1,7 @@ - + - netcoreapp2.0;net461 - netcoreapp2.0 + $(StandardTestTfms) diff --git a/test/IISIntegration.FunctionalTests/NtlmAuthentationTest.cs b/test/IISIntegration.FunctionalTests/NtlmAuthentationTest.cs index 0319922184..d03e71f47e 100644 --- a/test/IISIntegration.FunctionalTests/NtlmAuthentationTest.cs +++ b/test/IISIntegration.FunctionalTests/NtlmAuthentationTest.cs @@ -127,7 +127,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests } } } -#elif NETCOREAPP2_0 +#elif NETCOREAPP2_0 || NETCOREAPP2_1 #else #error Target frameworks need to be updated #endif diff --git a/test/IISIntegration.IISServerFunctionalTests/AuthenticationTests.cs b/test/IISIntegration.IISServerFunctionalTests/AuthenticationTests.cs index d069b5211e..a8b74365ac 100644 --- a/test/IISIntegration.IISServerFunctionalTests/AuthenticationTests.cs +++ b/test/IISIntegration.IISServerFunctionalTests/AuthenticationTests.cs @@ -115,7 +115,7 @@ namespace IISIntegration.IISServerFunctionalTests } } } -#elif NETCOREAPP2_0 +#elif NETCOREAPP2_0 || NETCOREAPP2_1 #else #error Target frameworks need to be updated #endif diff --git a/test/IISIntegration.IISServerFunctionalTests/IISIntegration.IISServerFunctionalTests.csproj b/test/IISIntegration.IISServerFunctionalTests/IISIntegration.IISServerFunctionalTests.csproj index 0d567632e2..1e67925136 100644 --- a/test/IISIntegration.IISServerFunctionalTests/IISIntegration.IISServerFunctionalTests.csproj +++ b/test/IISIntegration.IISServerFunctionalTests/IISIntegration.IISServerFunctionalTests.csproj @@ -1,8 +1,7 @@ - + - netcoreapp2.0;net461 - netcoreapp2.0 + $(StandardTestTfms) diff --git a/test/IISTestSite/IISTestSite.csproj b/test/IISTestSite/IISTestSite.csproj index 449323c616..f30da5e59f 100644 --- a/test/IISTestSite/IISTestSite.csproj +++ b/test/IISTestSite/IISTestSite.csproj @@ -1,8 +1,7 @@ - + - netcoreapp2.0;net461 - netcoreapp2.0 + $(StandardTestTfms) diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj index 5649043f89..ea19c2a1fc 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj @@ -1,8 +1,7 @@ - + - netcoreapp2.0;net461 - netcoreapp2.0 + $(StandardTestTfms) diff --git a/test/TestSites/TestSites.csproj b/test/TestSites/TestSites.csproj index 5764654aff..a01193dc9b 100644 --- a/test/TestSites/TestSites.csproj +++ b/test/TestSites/TestSites.csproj @@ -1,8 +1,7 @@ - + - netcoreapp2.0;net461 - netcoreapp2.0 + $(StandardTestTfms)