diff --git a/build/dependencies.props b/build/dependencies.props
index fec2f8c282..93b34f5c4e 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -9,6 +9,7 @@
9.0.1
4.7.1
1.6.1
+ 2.0.0-*
15.0.0
2.2.0
diff --git a/samples/LargeResponseApp/LargeResponseApp.csproj b/samples/LargeResponseApp/LargeResponseApp.csproj
index 06e37972b7..6aad6e781e 100644
--- a/samples/LargeResponseApp/LargeResponseApp.csproj
+++ b/samples/LargeResponseApp/LargeResponseApp.csproj
@@ -3,7 +3,7 @@
- net46;netcoreapp1.1
+ net46;netcoreapp2.0
false
diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj
index b623456397..f8ee813b62 100644
--- a/samples/SampleApp/SampleApp.csproj
+++ b/samples/SampleApp/SampleApp.csproj
@@ -3,7 +3,7 @@
- netcoreapp1.1;net46
+ netcoreapp2.0;net46
false
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs
index b295ee52d7..386296d716 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/GeneratedCodeTests.cs
+++ b/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
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj
index 38068b0e25..cbef1e8054 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.csproj
@@ -3,8 +3,8 @@
- netcoreapp1.1;net46
- netcoreapp1.1
+ netcoreapp2.0;net46
+ netcoreapp2.0
x64
true
true
@@ -32,7 +32,7 @@
-
+
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile
index 464f6a4ec0..5b071165d4 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/Dockerfile
+++ b/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"]
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/activate-kestrel.service b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/activate-kestrel.service
index 392bf823cd..e21d5db863 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/activate-kestrel.service
+++ b/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"
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/docker.sh b/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/docker.sh
index 7075a37d8c..8bef6049d8 100755
--- a/test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/SystemdActivation/docker.sh
+++ b/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/
-cp -R ./samples/SampleApp/bin/Debug/netcoreapp1.1/publish/ $scriptDir
+~/.dotnet/dotnet publish -f netcoreapp2.0 ./samples/SampleApp/
+cp -R ./samples/SampleApp/bin/Debug/netcoreapp2.0/publish/ $scriptDir
cp -R ~/.dotnet/ $scriptDir
image=$(docker build -qf $scriptDir/Dockerfile $scriptDir)
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj
index 8718f3f9ae..ce7fa7c2b0 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj
+++ b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/Microsoft.AspNetCore.Server.Kestrel.Performance.csproj
@@ -3,7 +3,7 @@
- netcoreapp1.1
+ netcoreapp2.0
Exe
true
true
diff --git a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/ResponseHeadersWritingBenchmark.cs b/test/Microsoft.AspNetCore.Server.Kestrel.Performance/ResponseHeadersWritingBenchmark.cs
index 270f739286..ce2f941c41 100644
--- a/test/Microsoft.AspNetCore.Server.Kestrel.Performance/ResponseHeadersWritingBenchmark.cs
+++ b/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;
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs
index 47ce60b35a..28f1d800b7 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameRequestStreamTests.cs
@@ -90,9 +90,9 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
var stream = new FrameRequestStream();
Assert.Throws(() => 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]
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs
index 363eb26d30..d097ee6161 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/FrameResponseStreamTests.cs
@@ -61,9 +61,9 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
var stream = new FrameResponseStream(new MockFrameControl());
Assert.Throws(() => 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]
diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj b/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj
index 1ee3019579..7fb00ec5b2 100644
--- a/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj
+++ b/test/Microsoft.AspNetCore.Server.KestrelTests/Microsoft.AspNetCore.Server.KestrelTests.csproj
@@ -3,8 +3,8 @@
- netcoreapp1.1;net46
- netcoreapp1.1
+ netcoreapp2.0;net46
+ netcoreapp2.0
x64
true
diff --git a/test/shared/TestResources.cs b/test/shared/TestResources.cs
index 37b2443622..19341db11a 100644
--- a/test/shared/TestResources.cs
+++ b/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;