Converted samples and test projects to run on netcoreapp2.0

build/dependencies.props

@@ -3,6 +3,7 @@
     <AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
     <CoreFxVersion>4.3.0</CoreFxVersion>
     <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
+    <RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
     <TestSdkVersion>15.0.0</TestSdkVersion>
     <XunitVersion>2.2.0</XunitVersion>
   </PropertyGroup>

samples/HotAddSample/HotAddSample.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net451;netcoreapp2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>

samples/SelfHostServer/SelfHostServer.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net451;netcoreapp2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
   </PropertyGroup>

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/HttpsTests.cs

@@ -104,8 +104,10 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         {
 #if NET452
             var handler = new WebRequestHandler();
-#else
+#elif NETCOREAPP2_0
             var handler = new WinHttpHandler();
+#else
+#error Target framework needs to be updated
 #endif
             handler.ServerCertificateValidationCallback = (a, b, c, d) => true;
             if (cert != null)
@@ -122,8 +124,10 @@ namespace Microsoft.AspNetCore.Server.HttpSys
         {
 #if NET452
             var handler = new WebRequestHandler();
-#else
+#elif NETCOREAPP2_0
             var handler = new WinHttpHandler();
+#else
+#error Target framework needs to be updated
 #endif
             handler.ServerCertificateValidationCallback = (a, b, c, d) => true;
             using (HttpClient client = new HttpClient(handler))

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/HttpsTests.cs

@@ -111,8 +111,10 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
         {
 #if NET452
             WebRequestHandler handler = new WebRequestHandler();
-#else
+#elif NETCOREAPP2_0
             WinHttpHandler handler = new WinHttpHandler();
+#else
+#error Target framework needs to be updated
 #endif
             handler.ServerCertificateValidationCallback = (a, b, c, d) => true;
             if (cert != null)
@@ -129,8 +131,10 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
         {
 #if NET452
             WebRequestHandler handler = new WebRequestHandler();
-#else
+#elif NETCOREAPP2_0
             WinHttpHandler handler = new WinHttpHandler();
+#else
+#error Target framework needs to be updated
 #endif
             handler.ServerCertificateValidationCallback = (a, b, c, d) => true;
             using (HttpClient client = new HttpClient(handler))

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/RequestBodyTests.cs

@@ -72,6 +72,9 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 Assert.Equal("Hello World", response);
             }
         }
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
 
         [ConditionalFact]

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseBodyTests.cs

@@ -100,8 +100,10 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 var stream = context.Response.Body;
 #if NET452
                 stream.EndWrite(stream.BeginWrite(new byte[10], 0, 10, null, null));
-#else
+#elif NETCOREAPP2_0
                 await stream.WriteAsync(new byte[10], 0, 10);
+#else
+#error Target framework needs to be updated
 #endif
                 stream.Write(new byte[10], 0, 10);
                 await stream.WriteAsync(new byte[10], 0, 10);
@@ -129,11 +131,14 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 var context = await server.AcceptAsync(Utilities.DefaultTimeout);
                 context.Response.Headers["Content-lenGth"] = " 20 ";
                 context.Dispose();
-#if !NETCOREAPP1_1
+#if NET452
                 // HttpClient retries the request because it didn't get a response.
                 context = await server.AcceptAsync(Utilities.DefaultTimeout);
                 context.Response.Headers["Content-lenGth"] = " 20 ";
                 context.Dispose();
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
                 await Assert.ThrowsAsync<HttpRequestException>(() => responseTask);
             }
@@ -291,6 +296,9 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token);
                 Assert.True(writeTask.IsCanceled);
                 context.Dispose();
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
                 await Assert.ThrowsAsync<HttpRequestException>(() => responseTask);
             }
@@ -320,6 +328,9 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 writeTask = context.Response.Body.WriteAsync(new byte[10], 0, 10, cts.Token);
                 Assert.True(writeTask.IsCanceled);
                 context.Dispose();
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
                 await Assert.ThrowsAsync<HttpRequestException>(() => responseTask);
             }

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseHeaderTests.cs

@@ -221,10 +221,12 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 Assert.Equal(0, response.ContentLength);
                 Assert.NotNull(response.Headers["Date"]);
                 Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
-#if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
+#if NETCOREAPP2_0 // WebHeaderCollection.GetValues() not available in CoreCLR.
                 Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]);
-#else
+#elif NET452
                 Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate"));
+#else
+#error Target framework needs to be updated
 #endif
             }
         }
@@ -250,10 +252,12 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 Assert.Equal(0, response.ContentLength);
                 Assert.NotNull(response.Headers["Date"]);
                 Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
-#if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
+#if NETCOREAPP2_0 // WebHeaderCollection.GetValues() not available in CoreCLR.
                 Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]);
-#else
+#elif NET452
                 Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1"));
+#else
+#error Target framework needs to be updated
 #endif
             }
         }

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ResponseSendFileTests.cs

@@ -371,6 +371,9 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 writeTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, cts.Token);
                 Assert.True(writeTask.IsCanceled);
                 context.Dispose();
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
                 await Assert.ThrowsAsync<HttpRequestException>(() => responseTask);
             }
@@ -400,6 +403,9 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 writeTask = context.Response.SendFileAsync(AbsoluteFilePath, 0, null, cts.Token);
                 Assert.True(writeTask.IsCanceled);
                 context.Dispose();
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
                 await Assert.ThrowsAsync<HttpRequestException>(() => responseTask);
             }

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/ServerTests.cs

@@ -186,10 +186,13 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 context.Abort();
                 Assert.True(canceled.WaitOne(interval), "Aborted");
                 Assert.True(ct.IsCancellationRequested, "IsCancellationRequested");
-#if !NETCOREAPP1_1
+#if NET452
                 // HttpClient re-tries the request because it doesn't know if the request was received.
                 context = await server.AcceptAsync(Utilities.DefaultTimeout);
                 context.Abort();
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
                 await Assert.ThrowsAsync<HttpRequestException>(() => responseTask);
             }

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/SkipOffDomainAttribute.cs

@@ -20,6 +20,9 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
                 {
 #if NET452
                     return !string.IsNullOrEmpty(System.DirectoryServices.ActiveDirectory.Domain.GetComputerDomain().Name);
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
                 }
                 catch

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Listener/Utilities.cs

@@ -28,8 +28,10 @@ namespace Microsoft.AspNetCore.Server.HttpSys.Listener
 
 #if NET452
             IsWin8orLater = (Environment.OSVersion.Version >= win8Version);
-#else
+#elif NETCOREAPP2_0
             IsWin8orLater = (new Version(RuntimeEnvironment.OperatingSystemVersion) >= win8Version);
+#else
+#error Target framework needs to be updated
 #endif
         }
 

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj

@@ -3,8 +3,8 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,7 +24,7 @@
     <Reference Include="System.Net.Http.WebRequest" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
     <PackageReference Include="System.Net.Http.WinHttpHandler" Version="$(CoreFxVersion)" />
     <PackageReference Include="System.Net.WebSockets.Client" Version="$(CoreFxVersion)" />
   </ItemGroup>

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/RequestBodyTests.cs

@@ -50,7 +50,7 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 Assert.Equal("Hello World", response);
             }
         }
-#if !NETCOREAPP1_1
+#if NET452
         [ConditionalFact]
         public async Task RequestBody_ReadBeginEnd_Success()
         {
@@ -68,6 +68,9 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 Assert.Equal("Hello World", response);
             }
         }
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
 
         [ConditionalFact]

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseBodyTests.cs

@@ -89,8 +89,10 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 Stream stream = httpContext.Response.Body;
 #if NET452
                 stream.EndWrite(stream.BeginWrite(new byte[10], 0, 10, null, null));
-#else
+#elif NETCOREAPP2_0
                 await stream.WriteAsync(new byte[10], 0, 10);
+#else
+#error Target framework needs to be updated
 #endif
                 stream.Write(new byte[10], 0, 10);
                 await stream.WriteAsync(new byte[10], 0, 10);
@@ -249,6 +251,9 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 Assert.Equal(new byte[10], await response.Content.ReadAsByteArrayAsync());
             }
         }
+#elif NETCOREAPP2_0
+#else
+#error Target framework needs to be updated
 #endif
         [ConditionalFact]
         public async Task ResponseBody_WriteAsync_TriggersOnStarting()

test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/ResponseHeaderTests.cs

@@ -81,10 +81,12 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 Assert.Equal(0, response.ContentLength);
                 Assert.NotNull(response.Headers["Date"]);
                 Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
-#if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
+#if NETCOREAPP2_0 // WebHeaderCollection.GetValues() not available in CoreCLR.
                 Assert.Equal("custom1, and custom2, custom3", response.Headers["WWW-Authenticate"]);
-#else
+#elif NET452
                 Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("WWW-Authenticate"));
+#else
+#error Target framework needs to be updated
 #endif
             }
         }
@@ -109,10 +111,12 @@ namespace Microsoft.AspNetCore.Server.HttpSys
                 Assert.Equal(0, response.ContentLength);
                 Assert.NotNull(response.Headers["Date"]);
                 Assert.Equal("Microsoft-HTTPAPI/2.0", response.Headers["Server"]);
-#if NETCOREAPP1_1 // WebHeaderCollection.GetValues() not available in CoreCLR.
+#if NETCOREAPP2_0 // WebHeaderCollection.GetValues() not available in CoreCLR.
                 Assert.Equal("custom1, and custom2, custom3", response.Headers["Custom-Header1"]);
-#else
+#elif NET452
                 Assert.Equal(new string[] { "custom1, and custom2", "custom3" }, response.Headers.GetValues("Custom-Header1"));
+#else
+#error Target framework needs to be updated
 #endif
             }
         }

test/Microsoft.AspNetCore.Server.HttpSys.Tests/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj

@@ -3,8 +3,8 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>