Converted test projects to run on netcoreapp2.0

* Converted test projects to run on netcoreapp2.0
* Set DOTNET_RUNTME_ID because of an issue in corehost and RID calculation.

build/dependencies.props

@@ -9,6 +9,7 @@
     <JsonNetVersion>9.0.1</JsonNetVersion>
     <MoqVersion>4.7.1</MoqVersion>
     <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
+    <RuntimeFrameworkVersion>2.0.0-*</RuntimeFrameworkVersion>
     <TestSdkVersion>15.0.0</TestSdkVersion>
     <XunitVersion>2.2.0</XunitVersion>
   </PropertyGroup>

samples/LargeResponseApp/LargeResponseApp.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

samples/SampleApp/SampleApp.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs

@@ -1,7 +1,7 @@
 // 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 NETCOREAPP1_1
+#if NETCOREAPP2_0
 
 using System.IO;
 using Xunit;
@@ -41,4 +41,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
     }
 }
 
+#elif NET46
+#else
+#error Target framework needs to be updated
 #endif

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

@@ -3,8 +3,8 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net46</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
     <PlatformTarget Condition="'$(TargetFramework)' == 'net46'">x64</PlatformTarget>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -32,7 +32,7 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
     <ProjectReference Include="..\..\tools\CodeGenerator\CodeGenerator.csproj" />
     <PackageReference Include="System.Net.NetworkInformation" Version="$(CoreFxVersion)" />
   </ItemGroup>

test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile

@@ -1,8 +1,12 @@
-FROM microsoft/dotnet:1.1-runtime-deps
+FROM microsoft/dotnet-nightly:2.0-runtime-deps
 
 # The "container" environment variable is read by systemd.
 ENV container=docker
 
+# We're copying assets from an ubuntu machine over the container make the RID
+# match
+ENV DOTNET_RUNTIME_ID=ubuntu.14.04-x64
+
 # This is required by systemd and won't work without "dotnet run --privileged".
 VOLUME ["/sys/fs/cgroup"]
 

test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/activate-kestrel.service

@@ -5,4 +5,4 @@ Requires=activate-kestrel.socket
 ExecStart=/usr/bin/dotnet SampleApp.dll
 WorkingDirectory=/publish
 NonBlocking=true
-
+Environment="DOTNET_RUNTIME_ID=ubuntu.14.04-x64"

test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/docker.sh

@@ -3,8 +3,8 @@
 set -e
 
 scriptDir=$(dirname "${BASH_SOURCE[0]}")
-~/.dotnet/dotnet publish -f netcoreapp1.1 ./samples/SampleApp/
+~/.dotnet/dotnet publish -f netcoreapp2.0 ./samples/SampleApp/
-cp -R ./samples/SampleApp/bin/Debug/netcoreapp1.1/publish/ $scriptDir
+cp -R ./samples/SampleApp/bin/Debug/netcoreapp2.0/publish/ $scriptDir
 cp -R ~/.dotnet/ $scriptDir
 
 image=$(docker build -qf $scriptDir/Dockerfile $scriptDir)

test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

test/Microsoft.AspNetCore.Server.Kestrel.Performance/ResponseHeadersWritingBenchmark.cs

@@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance
         {
             _frame.Reset();
             _frame.StatusCode = 200;
-            _frame.HttpVersionEnum = HttpVersion.Http11;
+            _frame.HttpVersionEnum = Internal.Http.HttpVersion.Http11;
             _frame.KeepAlive = true;
 
             Task writeTask = Task.CompletedTask;

test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs

@@ -90,9 +90,9 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
             var stream = new FrameRequestStream();
             Assert.Throws<NotSupportedException>(() => stream.BeginWrite(new byte[1], 0, 1, null, null));
         }
-#elif NETCOREAPP1_1
+#elif NETCOREAPP2_0
 #else
-#error target frameworks need to be updated
+#error Target framework needs to be updated
 #endif
 
         [Fact]

test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs

@@ -61,9 +61,9 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
             var stream = new FrameResponseStream(new MockFrameControl());
             Assert.Throws<NotSupportedException>(() => stream.BeginRead(new byte[1], 0, 1, null, null));
         }
-#elif NETCOREAPP1_1
+#elif NETCOREAPP2_0
 #else
-#error target frameworks need to be updated
+#error Target framework needs to be updated
 #endif
 
         [Fact]

test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj

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

test/shared/TestResources.cs

@@ -11,10 +11,10 @@ namespace Microsoft.AspNetCore.Testing
         private static readonly string _testCertificatePath =
 #if NET46
             Path.Combine(Directory.GetCurrentDirectory(), "testCert.pfx");
-#elif NETCOREAPP1_1
+#elif NETCOREAPP2_0
             Path.Combine(AppContext.BaseDirectory, "testCert.pfx");
 #else
-#error Target frameworks need to be updated.
+#error Target framework needs to be updated
 #endif
 
         public static string TestCertificatePath => _testCertificatePath;