diff --git a/.gitignore b/.gitignore
index 0f91ad1208..bcc811de9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ project.lock.json
 .build/
 .testPublish/
 /.vs/
+global.json
diff --git a/build/dependencies.props b/build/dependencies.props
index 713bfbd055..d60b45e16b 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -4,6 +4,7 @@
     <AspNetCoreLabsVersion>0.3.0-*</AspNetCoreLabsVersion>
     <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>
diff --git a/samples/StaticFileSample/StaticFileSample.csproj b/samples/StaticFileSample/StaticFileSample.csproj
index c7a5b5c99c..211249b4bb 100644
--- a/samples/StaticFileSample/StaticFileSample.csproj
+++ b/samples/StaticFileSample/StaticFileSample.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\build\dependencies.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj b/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj
index 610b5ac210..6e14838295 100644
--- a/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj
+++ b/src/Microsoft.AspNetCore.StaticFiles/Microsoft.AspNetCore.StaticFiles.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>ASP.NET Core static files middleware. Includes middleware for serving static files, directory browsing, and default files.</Description>
-    <TargetFrameworks>net451;netstandard1.3</TargetFrameworks>
+    <TargetFramework>netstandard1.3</TargetFramework>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;staticfiles</PackageTags>
diff --git a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj
index adb65e99d6..a7ddfc54f9 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj
+++ b/test/Microsoft.AspNetCore.StaticFiles.FunctionalTests/Microsoft.AspNetCore.StaticFiles.FunctionalTests.csproj
@@ -3,9 +3,11 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
-    <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp1.1'">win7-x64</RuntimeIdentifier>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
+    <RuntimeIdentifier Condition="'$(TargetFramework)'!='netcoreapp2.0'">win7-x64</RuntimeIdentifier>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj b/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
index d04b601ad6..e15ef238f3 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/Microsoft.AspNetCore.StaticFiles.Tests.csproj
@@ -3,8 +3,10 @@
   <Import Project="..\..\build\common.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp1.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs
index d5243e3a24..af4a90373f 100644
--- a/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs
+++ b/test/Microsoft.AspNetCore.StaticFiles.Tests/StaticFilesTestServer.cs
@@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.StaticFiles
     {
         public static TestServer Create(Action<IApplicationBuilder> configureApp, Action<IServiceCollection> configureServices = null)
         {
-            var contentRootNet452 = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
+            var contentRootNet46 = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
                 "." : "../../../../test/Microsoft.AspNetCore.StaticFiles.Tests";
             Action<IServiceCollection> defaultConfigureServices = services => { };
             var configuration = new ConfigurationBuilder()
@@ -26,8 +26,11 @@ namespace Microsoft.AspNetCore.StaticFiles
                 })
                 .Build();
             var builder = new WebHostBuilder()
-#if NET452
-                .UseContentRoot(contentRootNet452)
+#if NET46
+                .UseContentRoot(contentRootNet46)
+#elif NETCOREAPP2_0
+#else
+#error the target framework needs to be updated.
 #endif
                 .UseConfiguration(configuration)
                 .Configure(configureApp)
diff --git a/test/shared/TestBaseDir.cs b/test/shared/TestBaseDir.cs
index b5fd6a0352..1864d23658 100644
--- a/test/shared/TestBaseDir.cs
+++ b/test/shared/TestBaseDir.cs
@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.StaticFiles
     public static class TestDirectory
     {
         public static readonly string BaseDirectory
-#if NET452
+#if NET46
         = AppDomain.CurrentDomain.BaseDirectory;
 #else
         = AppContext.BaseDirectory;