diff --git a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
index c8b5d990f..ba40187cd 100644
--- a/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
+++ b/TestAssets/DesktopTestProjects/AppWithProjTool2Fx/App.csproj
@@ -7,7 +7,7 @@
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
     <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
     <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
-    <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
+    <DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj
index 160921bae..9ab6d1e5a 100644
--- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj
+++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsAndConfig/AppWithRedirectsAndConfig.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>AppWithRedirectsAndConfig</AssemblyName>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
-    <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
+    <DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj
index dd339afa3..aa1b27d15 100644
--- a/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj
+++ b/TestAssets/DesktopTestProjects/BindingRedirectSample/AppWithRedirectsNoConfig/AppWithRedirectsNoConfig.csproj
@@ -4,7 +4,7 @@
     <AssemblyName>AppWithRedirectsNoConfig</AssemblyName>
     <OutputType>Exe</OutputType>
     <RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
-    <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
+    <DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
index b8d373889..aa1f26066 100644
--- a/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
+++ b/TestAssets/DesktopTestProjects/LibWithProjTool2Fx/Lib.csproj
@@ -3,7 +3,7 @@
     <TargetFrameworks>netstandard1.6;net451</TargetFrameworks>
     <OutputType>Library</OutputType>
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8;dnxcore50;netcoreapp1.1</PackageTargetFallback>
-    <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
+    <DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TestAssets/DesktopTestProjects/TestAppWithFrameworkAssemblies/ProjectA/project.json b/TestAssets/DesktopTestProjects/TestAppWithFrameworkAssemblies/ProjectA/project.json
index 1486a9d85..1fb29b170 100644
--- a/TestAssets/DesktopTestProjects/TestAppWithFrameworkAssemblies/ProjectA/project.json
+++ b/TestAssets/DesktopTestProjects/TestAppWithFrameworkAssemblies/ProjectA/project.json
@@ -11,9 +11,9 @@
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
-        "Microsoft.NETCore.App": "1.0.1"
+        "Microsoft.NETCore.App": "1.1.0"
       }
     },
     "net451": {}
diff --git a/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj b/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
index 94b94db79..d705ebd65 100644
--- a/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
+++ b/TestAssets/NonRestoredTestProjects/AppThrowingException/App/AppThrowingException.csproj
@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp1.0</TargetFramework>
     <AssemblyName>dotnet-throwingtool</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
index 4029e9cbe..11553b268 100644
--- a/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
+++ b/TestAssets/NonRestoredTestProjects/AppWithNonExistingToolDependency/AppWithNonExistingToolDependency.csproj
@@ -4,12 +4,9 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
-  </ItemGroup>
-
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-nonexistingtool" Version="1.0.0" />
   </ItemGroup>
diff --git a/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/project.json b/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/project.json
index b748d3b9f..98e6c1f8f 100644
--- a/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/project.json
+++ b/TestAssets/NonRestoredTestProjects/AppWithProjectDependencyAsTarget/TestApp/project.json
@@ -4,14 +4,14 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.1",
+    "Microsoft.NETCore.App": "1.1.1",
     "TestLibraryAsAPackage": {
       "version": "1.0.0",
       "target": "package"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json
index 666d644b9..060460e39 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndOneAlreadyMigratedCsproj/TestApp/project.json
@@ -9,10 +9,10 @@
       "target": "project",
       "version": "1.0.0-*"
     },
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.1"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json
index 166d41c2b..a42ae0bb0 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndSolutionItemsToMoveToBackup/TestApp/project.json
@@ -5,10 +5,10 @@
     "preserveCompilationContext": true
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.1"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/project.json
index 91b0a9ae6..be38f2878 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/TestAssets/TestAsset/project.json
@@ -1,12 +1,12 @@
 {
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "imports": [
         "portable-net451+win8"
       ],
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.0",
+          "version": "1.1.0",
           "type": "platform"
         }
       }
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/project.json
index b5feb4db5..788896dab 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefs/TestApp/project.json
@@ -13,10 +13,10 @@
       "target": "project",
       "version": "1.0.0-*"
     },
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.1"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json
index b5feb4db5..788896dab 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefsAndUnrelatedCsproj/TestApp/project.json
@@ -13,10 +13,10 @@
       "target": "project",
       "version": "1.0.0-*"
     },
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.1"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json
index ed61d9d34..ade45a814 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.1"
+      "version": "1.1.1"
     },
     "TestLibrary": {
       "target": "project",
@@ -20,7 +20,7 @@
   },
 
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "imports": "dnxcore50"
     }
   }
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json
index 166d41c2b..a42ae0bb0 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion14/project.json
@@ -5,10 +5,10 @@
     "preserveCompilationContext": true
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.1"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json
index 166d41c2b..a42ae0bb0 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersion15/project.json
@@ -5,10 +5,10 @@
     "preserveCompilationContext": true
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.1"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json
index 166d41c2b..a42ae0bb0 100644
--- a/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJAppWithSlnVersionUnknown/project.json
@@ -5,10 +5,10 @@
     "preserveCompilationContext": true
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.1"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json
index 9f677856d..48cc4461c 100644
--- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompilation/project.json
@@ -7,11 +7,11 @@
     },
     "dependencies": {},
     "frameworks": {
-        "netcoreapp1.0": {
+        "netcoreapp1.1": {
             "dependencies": {
                 "Microsoft.NETCore.App": {
                     "type": "platform",
-                    "version": "1.0.1"
+                    "version": "1.1.1"
                 }
             },
             "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json
index 87eeadaa3..abe2d6127 100644
--- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompile/project/project.json
@@ -8,11 +8,11 @@
     },
     "dependencies": {},
     "frameworks": {
-        "netcoreapp1.0": {
+        "netcoreapp1.1": {
             "dependencies": {
                 "Microsoft.NETCore.App": {
                     "type": "platform",
-                    "version": "1.0.1"
+                    "version": "1.1.1"
                 }
             },
             "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json
index 7418df38c..ce76b170c 100644
--- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileBuiltIn/project/project.json
@@ -7,11 +7,11 @@
     },
     "dependencies": {},
     "frameworks": {
-        "netcoreapp1.0": {
+        "netcoreapp1.1": {
             "dependencies": {
                 "Microsoft.NETCore.App": {
                     "type": "platform",
-                    "version": "1.0.1"
+                    "version": "1.1.1"
                 }
             },
             "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json
index 3b457a6dc..caa91e887 100644
--- a/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedCompileExclude/project.json
@@ -8,11 +8,11 @@
     },
     "dependencies": {},
     "frameworks": {
-        "netcoreapp1.0": {
+        "netcoreapp1.1": {
             "dependencies": {
                 "Microsoft.NETCore.App": {
                     "type": "platform",
-                    "version": "1.0.1"
+                    "version": "1.1.1"
                 }
             },
             "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json
index 5b1681989..721775e7f 100644
--- a/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedContent/project/project.json
@@ -11,11 +11,11 @@
     },
     "dependencies": {},
     "frameworks": {
-        "netcoreapp1.0": {
+        "netcoreapp1.1": {
             "dependencies": {
                 "Microsoft.NETCore.App": {
                     "type": "platform",
-                    "version": "1.0.1"
+                    "version": "1.1.1"
                 }
             },
             "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/project.json
index e0c6115f7..fce9b2e1a 100644
--- a/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedNamedResource/project.json
@@ -7,11 +7,11 @@
     },
     "dependencies": {},
     "frameworks": {
-        "netcoreapp1.0": {
+        "netcoreapp1.1": {
             "dependencies": {
                 "Microsoft.NETCore.App": {
                     "type": "platform",
-                    "version": "1.0.0"
+                    "version": "1.1.0"
                 }
             },
             "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json
index 5daf77a20..9590efb93 100644
--- a/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedPack/project.json
@@ -19,11 +19,11 @@
     },
     "dependencies": {},
     "frameworks": {
-        "netcoreapp1.0": {
+        "netcoreapp1.1": {
             "dependencies": {
                 "Microsoft.NETCore.App": {
                     "type": "platform",
-                    "version": "1.0.1"
+                    "version": "1.1.1"
                 }
             },
             "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json
index 369f7325d..4851a858d 100644
--- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedResource/project/project.json
@@ -8,11 +8,11 @@
   },
   "dependencies": {},
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0"
+          "version": "1.1.0"
         }
       },
       "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json
index d4f8ee07f..5bf7fe5f7 100644
--- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceBuiltIn/project/project.json
@@ -7,11 +7,11 @@
   },
   "dependencies": {},
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0"
+          "version": "1.1.0"
         }
       },
       "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json
index 01c3c9e23..87e1d0675 100644
--- a/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJDeprecatedResourceExclude/project.json
@@ -8,11 +8,11 @@
   },
   "dependencies": {},
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0"
+          "version": "1.1.0"
         }
       },
       "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/project.json b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/project.json
index a93ee629a..7de792cd3 100755
--- a/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/project.json
+++ b/TestAssets/NonRestoredTestProjects/PJHalfMigrated/ProjectB/project.json
@@ -10,11 +10,11 @@
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0"
+          "version": "1.1.0"
         }
       },
       "imports": "dnxcore50"
diff --git a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json
index 666d644b9..8edb9fd32 100644
--- a/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json
+++ b/TestAssets/NonRestoredTestProjects/TestAppWithLibraryAndMissingP2P/TestApp/project.json
@@ -9,10 +9,10 @@
       "target": "project",
       "version": "1.0.0-*"
     },
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.0"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json
index cd24d0e88..92c28da27 100644
--- a/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json
+++ b/TestAssets/NonRestoredTestProjects/TestProjectWithSelfReferencingDependency/project.json
@@ -9,7 +9,7 @@
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "imports": "dnxcore50"
     }
   }
diff --git a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json
index 793e4d3b3..eafa839b9 100644
--- a/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json
+++ b/TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json
@@ -6,14 +6,14 @@
   "dependencies": {
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.1"
+      "version": "1.1.0"
     },
     "ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": {
       "target": "project"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "imports": "dnxcore50"
     }
   }
diff --git a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
index d3946a98f..1717cd460 100644
--- a/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
+++ b/TestAssets/TestPackages/dotnet-dependency-context-test/dotnet-dependency-context-test.csproj
@@ -3,10 +3,12 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0-rc</VersionPrefix>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
     <AssemblyName>dotnet-dependency-context-test</AssemblyName>
     <OutputType>Exe</OutputType>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
+    <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,7 +18,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.4" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(DependencyModelVersion)" />
   </ItemGroup>
 
diff --git a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
index 4e590ef5d..23df5a2ee 100644
--- a/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
+++ b/TestAssets/TestPackages/dotnet-dependency-tool-invoker/dotnet-dependency-tool-invoker.csproj
@@ -3,12 +3,13 @@
 
   <PropertyGroup>
     <VersionPrefix>1.0.0-rc</VersionPrefix>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
     <AssemblyName>dotnet-dependency-tool-invoker</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8;dnxcore50</PackageTargetFallback>
     <VersionSuffix></VersionSuffix>
-    <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
+    <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -28,6 +29,7 @@
   <ItemGroup>
     <PackageReference Include="NuGet.Frameworks" Version="$(CLI_NuGet_Version)" />
     <PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(SdkNugetVersion)" />
+    <PackageReference Include="System.Linq" Version="4.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
index 908965e3b..8a5096465 100644
--- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
+++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/dotnet-hello.csproj
@@ -1,19 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
   
   <PropertyGroup>
     <Version>1.0.0</Version>
     <!--Workaround for https://github.com/NuGet/Home/issues/4583-->
     <VersionSuffix></VersionSuffix>
-    <TargetFramework>$(CliTargetFramework)</TargetFramework>
-    <FrameworkRuntimeVersion>$(CLI_SharedFrameworkVersion)</FrameworkRuntimeVersion>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
     <AssemblyName>dotnet-hello</AssemblyName>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
-  </ItemGroup>
-
 </Project>
diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
index 065c24d50..8f8164cef 100644
--- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
+++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/dotnet-hello.csproj
@@ -1,19 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
   
   <PropertyGroup>
     <Version>2.0.0</Version>
     <!--Workaround for https://github.com/NuGet/Home/issues/4583-->
     <VersionSuffix></VersionSuffix>
-    <TargetFramework>$(CliTargetFramework)</TargetFramework>
-    <FrameworkRuntimeVersion>$(CLI_SharedFrameworkVersion)</FrameworkRuntimeVersion>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
     <AssemblyName>dotnet-hello</AssemblyName>
     <OutputType>Exe</OutputType>
-    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64</RuntimeIdentifiers>
   </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
-  </ItemGroup>
-
 </Project>
diff --git a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
index 683f6c155..9b9f2fec9 100644
--- a/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
+++ b/TestAssets/TestPackages/dotnet-prefercliruntime/dotnet-prefercliruntime.csproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <VersionSuffix></VersionSuffix>
+    <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,9 +18,4 @@
       <PackagePath>\prefercliruntime</PackagePath>
     </Content>
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json b/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json
index 4779b862d..068194430 100644
--- a/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json
+++ b/TestAssets/TestProjects/AppWith2Tfm0Rid/project.json
@@ -10,10 +10,10 @@
         "System.Xml": {}
       }
     },
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NetCore.App": {
-          "version": "1.0.3",
+          "version": "1.1.0",
           "type": "platform"
         }
       }
diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json
index fe9ce6357..f863c3161 100644
--- a/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json
+++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json
@@ -8,11 +8,11 @@
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.1"
+          "version": "1.1.0"
         }
       }
     }
diff --git a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json
index 9541e743a..2cfedcea8 100644
--- a/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json
+++ b/TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json
@@ -4,11 +4,11 @@
   },
   "dependencies": {},
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.1"
+          "version": "1.1.0"
         }
       }
     }
diff --git a/TestAssets/TestProjects/AppWithAssemblyInfo/project.json b/TestAssets/TestProjects/AppWithAssemblyInfo/project.json
index 9016d1324..dff934e8b 100644
--- a/TestAssets/TestProjects/AppWithAssemblyInfo/project.json
+++ b/TestAssets/TestProjects/AppWithAssemblyInfo/project.json
@@ -7,12 +7,12 @@
   "dependencies": {
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.1"
+      "version": "1.1.0"
     }
   },
 
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "imports": "dnxcore50"
     }
   }
diff --git a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
index 9b8907373..4f189d465 100755
--- a/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
+++ b/TestAssets/TestProjects/AppWithDirectDepWithOutputName/AppWithDirectDepWithOutputName.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
-    <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
+    <DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
index 80d0ffd4b..db7004ecd 100644
--- a/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
+++ b/TestAssets/TestProjects/AppWithMultipleFxAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net451;netcoreapp2.0</TargetFrameworks>
-    <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
+    <DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
index 2a4e3cc75..33eacba13 100644
--- a/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
+++ b/TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
@@ -4,10 +4,10 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.0"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json
index 91b0a9ae6..be38f2878 100644
--- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json
+++ b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/TestAssets/TestAsset/project.json
@@ -1,12 +1,12 @@
 {
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "imports": [
         "portable-net451+win8"
       ],
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.0",
+          "version": "1.1.0",
           "type": "platform"
         }
       }
diff --git a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json
index c9e71e7a1..510857461 100644
--- a/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json
+++ b/TestAssets/TestProjects/AppWithPackageNamedAfterFolder/test/App.Tests/project.json
@@ -1,6 +1,6 @@
 {
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "imports": [
         "portable-net451+win8",
         "dnxcore50"
@@ -10,7 +10,7 @@
       },
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.0",
+          "version": "1.1.0",
           "type": "platform"
         }
       }
diff --git a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
index 225f497ad..909f6aa9f 100755
--- a/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
+++ b/TestAssets/TestProjects/DependencyContextFromTool/DependencyContextFromTool.csproj
@@ -7,13 +7,11 @@
     <AssemblyName>DependencyContextFromTool</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
+    <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
+    <DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="Microsoft.NETCore.App" Version="$(CLI_SharedFrameworkVersion)" />
-  </ItemGroup>
-
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-dependency-context-test" Version="1.0.0-*" />
   </ItemGroup>
diff --git a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
index 95347fe60..46c065472 100644
--- a/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
+++ b/TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
@@ -14,7 +14,7 @@
       "version": "1.0.0-*",
       "target": "project"
     },
-    "Microsoft.NETCore.App": "1.0.1",
+    "Microsoft.NETCore.App": "1.1.0",
     "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509"
   },
   "tools": {
@@ -28,7 +28,7 @@
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "imports": "dnxcore50"
     }
   },
diff --git a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
index 67092b919..5c26acade 100644
--- a/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
+++ b/TestAssets/TestProjects/MSBuildAppWithMultipleFrameworksAndTools/MSBuildAppWithMultipleFrameworksAndTools.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net451;netcoreapp2.0</TargetFrameworks>
-    <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
+    <DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TestAssets/TestProjects/PJAppWithMultipleFrameworks/project.json b/TestAssets/TestProjects/PJAppWithMultipleFrameworks/project.json
index 2e09a4fd6..ebe6ac518 100644
--- a/TestAssets/TestProjects/PJAppWithMultipleFrameworks/project.json
+++ b/TestAssets/TestProjects/PJAppWithMultipleFrameworks/project.json
@@ -4,10 +4,10 @@
     "emitEntryPoint": true
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
         "dependencies": {
             "Microsoft.NetCore.App": {
-                "version": "1.0.3",
+                "version": "1.1.0",
                 "type": "platform"
             }
         }
diff --git a/TestAssets/TestProjects/PJTestAppSimple/project.json b/TestAssets/TestProjects/PJTestAppSimple/project.json
index 5f8329deb..f94096150 100755
--- a/TestAssets/TestProjects/PJTestAppSimple/project.json
+++ b/TestAssets/TestProjects/PJTestAppSimple/project.json
@@ -4,10 +4,10 @@
     "emitEntryPoint": true
   },
   "dependencies": {
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.0"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json b/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json
index 10e7042d6..71dcdd6ed 100644
--- a/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json
+++ b/TestAssets/TestProjects/ProjectJsonConsoleTemplate/project.json
@@ -6,11 +6,11 @@
   }, 
   "dependencies": {}, 
   "frameworks": { 
-    "netcoreapp1.0": { 
+    "netcoreapp1.1": {
       "dependencies": { 
         "Microsoft.NETCore.App": { 
           "type": "platform", 
-          "version": "1.0.1" 
+          "version": "1.1.0"
         } 
       }, 
       "imports": "dnxcore50" 
diff --git a/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json b/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json
index 35b616f8a..e82212642 100644
--- a/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json
+++ b/TestAssets/TestProjects/ProjectJsonWebTemplate/project.json
@@ -3,7 +3,7 @@
 
   "dependencies": {
     "Microsoft.NETCore.App": {
-      "version": "1.0.1",
+      "version": "1.1.0",
       "type": "platform"
     },
     "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
@@ -71,7 +71,7 @@
   },
 
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "imports": [
         "dotnet5.6",
         "dnxcore50",
diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json b/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json
index 7952dd345..89299337a 100644
--- a/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json	
+++ b/TestAssets/TestProjects/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json	
@@ -11,10 +11,10 @@
     },
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.1"
+      "version": "1.1.1"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   }
 }
diff --git a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json b/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json
index 7952dd345..003e499f1 100644
--- a/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json
+++ b/TestAssets/TestProjects/ProjectsWithGlobalJson/src/ProjectH/project.json
@@ -11,10 +11,10 @@
     },
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.1"
+      "version": "1.1.0"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   }
 }
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json
index de7f186e5..ab0e331eb 100644
--- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json
+++ b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectA/project.json
@@ -13,10 +13,10 @@
       "target": "project",
       "version": "1.0.0-*"
     },
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.0"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json
index 9608ee1d3..585da58f6 100644
--- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json
+++ b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectF/project.json
@@ -11,10 +11,10 @@
     },
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.1"
+      "version": "1.1.0"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   }
 }
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json
index 7952dd345..003e499f1 100644
--- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json	
+++ b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src with spaces/ProjectJ/project.json	
@@ -11,10 +11,10 @@
     },
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.1"
+      "version": "1.1.0"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   }
 }
diff --git a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json
index 7952dd345..003e499f1 100644
--- a/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json
+++ b/TestAssets/TestProjects/TestAppDependencyGraph/ProjectsWithGlobalJson/src/ProjectH/project.json
@@ -11,10 +11,10 @@
     },
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.1"
+      "version": "1.1.0"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   }
 }
diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json
index 5620a3bc3..b23cbdc8b 100644
--- a/TestAssets/TestProjects/TestAppWithContents/project.json
+++ b/TestAssets/TestProjects/TestAppWithContents/project.json
@@ -19,12 +19,12 @@
   },
   "dependencies": {
     "Microsoft.NETCore.App": {
-      "version": "1.0.1",
+      "version": "1.1.0",
       "type": "platform"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "publishOptions": {
     "include": "testcontentfile.txt"
diff --git a/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json b/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json
index 3c89bd6fb..4f97537d9 100755
--- a/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json
+++ b/TestAssets/TestProjects/TestAppWithEmbeddedResources/project.json
@@ -7,11 +7,11 @@
   },
   "dependencies": {},
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "Microsoft.NETCore.App": {
           "type": "platform",
-          "version": "1.0.0"
+          "version": "1.1.0"
         }
       },
       "imports": "dnxcore50"
diff --git a/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json b/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json
index c29a3797c..bd75d882b 100644
--- a/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json
+++ b/TestAssets/TestProjects/TestAppWithExplicitInclude/project.json
@@ -11,11 +11,11 @@
   },
   "dependencies": {}, 
   "frameworks": { 
-    "netcoreapp1.0": { 
+    "netcoreapp1.1": {
       "dependencies": { 
         "Microsoft.NETCore.App": { 
           "type": "platform", 
-          "version": "1.0.1" 
+          "version": "1.1.0"
         } 
       }, 
       "imports": "dnxcore50" 
diff --git a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json b/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json
index 67a885251..56f3433fc 100644
--- a/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json
+++ b/TestAssets/TestProjects/TestAppWithExplicitIncludeGlob/project.json
@@ -11,11 +11,11 @@
   },
   "dependencies": {}, 
   "frameworks": { 
-    "netcoreapp1.0": { 
+    "netcoreapp1.1": {
       "dependencies": { 
         "Microsoft.NETCore.App": { 
           "type": "platform", 
-          "version": "1.0.1" 
+          "version": "1.1.0"
         } 
       }, 
       "imports": "dnxcore50" 
diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
index 666d644b9..8edb9fd32 100644
--- a/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
+++ b/TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
@@ -9,10 +9,10 @@
       "target": "project",
       "version": "1.0.0-*"
     },
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.0"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/TestProjects/TestAppWithLibraryUnderTFM/TestApp/project.json b/TestAssets/TestProjects/TestAppWithLibraryUnderTFM/TestApp/project.json
index 419f935a3..a77fe2343 100644
--- a/TestAssets/TestProjects/TestAppWithLibraryUnderTFM/TestApp/project.json
+++ b/TestAssets/TestProjects/TestAppWithLibraryUnderTFM/TestApp/project.json
@@ -5,10 +5,10 @@
     "preserveCompilationContext": true
   },
   "dependencies": {    
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.0"
   },
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "dependencies": {
         "TestLibrary": {
           "target": "project",
diff --git a/TestAssets/TestProjects/TestAppWithMigrateableScripts/project.json b/TestAssets/TestProjects/TestAppWithMigrateableScripts/project.json
index cc196a087..a453cbddb 100644
--- a/TestAssets/TestProjects/TestAppWithMigrateableScripts/project.json
+++ b/TestAssets/TestProjects/TestAppWithMigrateableScripts/project.json
@@ -6,11 +6,11 @@
   "dependencies": {
     "Microsoft.NETCore.App": {
       "type": "platform",
-      "version": "1.0.1"
+      "version": "1.1.0"
     }
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "scripts": {
     "prepublish": [
diff --git a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
index 66c65a7ff..bedcf3da2 100644
--- a/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
+++ b/TestAssets/TestProjects/TestAppWithProjDepTool/TestAppWithProjDepTool.csproj
@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <RuntimeFrameworkVersion>$(CLI_SharedFrameworkVersion)</RuntimeFrameworkVersion>
-    <DotnetCliToolTargetFramework>netcoreapp2.0</DotnetCliToolTargetFramework>
+    <DotnetCliToolTargetFramework>netcoreapp1.1</DotnetCliToolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json b/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json
index e7a052937..3727b2ece 100644
--- a/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json
+++ b/TestAssets/TestProjects/TestAppWithRuntimeOptions/project.json
@@ -5,12 +5,12 @@
   },
   "dependencies": {
     "Microsoft.NETCore.App": {
-		"version": "1.0.1",
+		"version": "1.1.0",
 		"type": "platform"
 	}
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimeOptions": {
     "somethingString": "anything",
diff --git a/TestAssets/TestProjects/TestAppWithSigning/project.json b/TestAssets/TestProjects/TestAppWithSigning/project.json
index 93a9e4425..fa84e6e50 100644
--- a/TestAssets/TestProjects/TestAppWithSigning/project.json
+++ b/TestAssets/TestProjects/TestAppWithSigning/project.json
@@ -6,11 +6,11 @@
   },
   "dependencies": {
     "Microsoft.NETCore.App": {
-      "version": "1.0.1",
+      "version": "1.1.0",
       "type": "platform"
       },
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   }
 }
diff --git a/TestAssets/TestProjects/TestAppWithUnqualifiedDependencies/ProjectA/project.json b/TestAssets/TestProjects/TestAppWithUnqualifiedDependencies/ProjectA/project.json
index 5287abb9b..1ff04d86a 100644
--- a/TestAssets/TestProjects/TestAppWithUnqualifiedDependencies/ProjectA/project.json
+++ b/TestAssets/TestProjects/TestAppWithUnqualifiedDependencies/ProjectA/project.json
@@ -6,10 +6,10 @@
   },
   "dependencies": {
     "ProjectB": "1.0.0-*",
-    "Microsoft.NETCore.App": "1.0.1"
+    "Microsoft.NETCore.App": "1.1.0"
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.1": {}
   },
   "runtimes": {
     "win7-x64": {},
diff --git a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json
index ea81ae848..f8e6d7db9 100755
--- a/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json
+++ b/TestAssets/TestProjects/WebAppWithMissingFileInPublishOptions/project.json
@@ -3,7 +3,7 @@
 
   "dependencies": {
     "Microsoft.NETCore.App": {
-      "version": "1.0.0",
+      "version": "1.1.0",
       "type": "platform"
     },
     "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
@@ -70,7 +70,7 @@
   },
 
   "frameworks": {
-    "netcoreapp1.0": {
+    "netcoreapp1.1": {
       "imports": [
         "dotnet5.6",
         "dnxcore50",
diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index a1758c4f1..a7d91de3d 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -16,10 +16,10 @@
 
     <!-- Additional Shared Framework to be installed -->
     <PropertyGroup Condition=" '$(IncludeAdditionalSharedFrameworks)' == 'true' ">
-      <AdditionalCoreSetupChannel>preview</AdditionalCoreSetupChannel>
-      <AdditionalSharedFrameworkVersion>1.0.4</AdditionalSharedFrameworkVersion>
-      <AdditionalSharedHostVersion>1.0.1</AdditionalSharedHostVersion>
-      <AdditionalHostFxrVersion>1.0.1</AdditionalHostFxrVersion>
+      <AdditionalCoreSetupChannel>release/1.1.0</AdditionalCoreSetupChannel>
+      <AdditionalSharedFrameworkVersion>1.1.1</AdditionalSharedFrameworkVersion>
+      <AdditionalSharedHostVersion>1.1.0</AdditionalSharedHostVersion>
+      <AdditionalHostFxrVersion>1.1.0</AdditionalHostFxrVersion>
 
       <!-- Additional Downloaded Installers + Archives -->
       <AdditionalDownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension)</AdditionalDownloadedSharedHostInstallerFileName>
diff --git a/run-build.ps1 b/run-build.ps1
index b939b605f..c02a924cf 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -101,8 +101,8 @@ if ($LastExitCode -ne 0)
 # install the post-PJnistic stage0
 $dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1"
 
-Write-Host "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-alpha-005390"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
-Invoke-Expression "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-alpha-005390"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Write-Host "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-preview1-005390"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
+Invoke-Expression "$dotnetInstallPath -Channel ""master"" -Version ""2.0.0-preview1-005390"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
 if ($LastExitCode -ne 0)
 {
     Write-Output "The .NET CLI installation failed with exit code $LastExitCode"
diff --git a/run-build.sh b/run-build.sh
index 9c78a3827..5b65eeba4 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -168,8 +168,8 @@ if [ $? != 0 ]; then
 fi
 
 # now execute the script
-echo "installing CLI: $dotnetInstallPath --channel \"master\" --version \"2.0.0-alpha-005165\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\" $LINUX_PORTABLE_INSTALL_ARGS"
-$dotnetInstallPath --channel "master" --version "2.0.0-alpha-005390" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS
+echo "installing CLI: $dotnetInstallPath --channel \"master\" --version \"2.0.0-preview1-005165\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\" $LINUX_PORTABLE_INSTALL_ARGS"
+$dotnetInstallPath --channel "master" --version "2.0.0-preview1-005390" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS
 if [ $? != 0 ]; then
     echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
     exit $?
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index dde8ca364..602128a93 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -159,7 +159,7 @@
       InputFile="$(VSTestRuntimeConfigPath)"
       DestinationFile="$(VSTestRuntimeConfigPath)"
       ReplacementPatterns="1.0.0"
-      ReplacementStrings="$(CLI_SharedFrameworkVersion)" />
+      ReplacementStrings="1.1.1" />
   </Target>
 
   <Target Name="CrossgenPublishDir"
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs
index eb4b1cf1a..109a449fc 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectDependenciesCommandFactory.cs
@@ -198,7 +198,7 @@ namespace Microsoft.DotNet.Cli.Utils.Tests
             var command = factory.Create("dotnet-tool-with-output-name", null);
 
             command.CommandArgs.Should().Contain(
-                Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp1.0", "dotnet-tool-with-output-name.dll"));
+                Path.Combine("toolwithoutputname", "1.0.0", "lib", "netcoreapp2.0", "dotnet-tool-with-output-name.dll"));
         }
     }
 }
diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
index 3591d5a0f..5876cb5dd 100644
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
@@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tests
     public class GivenAProjectToolsCommandResolver : TestBase
     {
         private static readonly NuGetFramework s_toolPackageFramework =
-            FrameworkConstants.CommonFrameworks.NetCoreApp10;
+            FrameworkConstants.CommonFrameworks.NetCoreApp20;
 
         private const string TestProjectName = "AppWithToolDependency";
 
diff --git a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs
index 0c1df382a..30f0f1792 100644
--- a/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs
+++ b/test/Microsoft.DotNet.ProjectJsonMigration.Tests/Rules/GivenThatIWantToMigrateProjectDependencies.cs
@@ -30,7 +30,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 
             var appDirectory = Path.Combine(solutionDirectory, "TestApp");
 
-            var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp10);
+            var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp11);
             var mockProj = ProjectRootElement.Create();
             var testSettings = MigrationSettings.CreateMigrationSettingsTestHook(appDirectory, appDirectory, mockProj, null);
             var testInputs = new MigrationRuleInputs(new[] {projectContext}, mockProj, mockProj.AddItemGroup(),
@@ -55,7 +55,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 
             var appDirectory = Path.Combine(solutionDirectory, "TestApp");
 
-            var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp10);
+            var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp11);
             var mockProj = ProjectRootElement.Create();
             var testSettings = MigrationSettings.CreateMigrationSettingsTestHook(appDirectory, appDirectory, mockProj, null);
             var testInputs = new MigrationRuleInputs(new[] {projectContext}, mockProj, mockProj.AddItemGroup(),
@@ -77,7 +77,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 
             var appDirectory = Path.Combine(solutionDirectory, "TestApp");
 
-            var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp10);
+            var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp11);
             var mockProj = ProjectRootElement.Create();
             var testSettings = MigrationSettings.CreateMigrationSettingsTestHook(appDirectory, appDirectory, mockProj, null);
             var testInputs = new MigrationRuleInputs(new[] {projectContext}, mockProj, mockProj.AddItemGroup(),
@@ -89,7 +89,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 
             var projectReference = projectReferences.First();
             projectReference.Include.Should().Be(Path.Combine("..", "TestLibrary", "TestLibrary.csproj"));
-            projectReference.Parent.Condition.Should().Be(" '$(TargetFramework)' == 'netcoreapp1.0' ");
+            projectReference.Parent.Condition.Should().Be(" '$(TargetFramework)' == 'netcoreapp1.1' ");
         }
 
         [Fact]
@@ -105,7 +105,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
             var libraryDirectory = Path.Combine(solutionDirectory, "TestLibrary");
             Directory.Delete(libraryDirectory, true);
 
-            var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp10);
+            var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp11);
             var mockProj = ProjectRootElement.Create();
             var testSettings = MigrationSettings.CreateMigrationSettingsTestHook(appDirectory, appDirectory, mockProj);
             var testInputs = new MigrationRuleInputs(new[] {projectContext}, mockProj, mockProj.AddItemGroup(), mockProj.AddPropertyGroup());
@@ -322,7 +322,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 
             var appDirectory = Path.Combine(solutionDirectory, "ProjectB");
 
-            var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp10);
+            var projectContext = ProjectContext.Create(appDirectory, FrameworkConstants.CommonFrameworks.NetCoreApp11);
             var mockProj = ProjectRootElement.Create();
             var testSettings = MigrationSettings.CreateMigrationSettingsTestHook(appDirectory, appDirectory, mockProj, null);
             var testInputs = new MigrationRuleInputs(new[] {projectContext}, mockProj, mockProj.AddItemGroup(),
@@ -337,7 +337,7 @@ namespace Microsoft.DotNet.ProjectJsonMigration.Tests
 
         private ProjectRootElement MigrateProject(string solution, string project)
         {
-            return MigrateProject(solution, project, FrameworkConstants.CommonFrameworks.NetCoreApp10);
+            return MigrateProject(solution, project, FrameworkConstants.CommonFrameworks.NetCoreApp11);
         }
 
         private ProjectRootElement MigrateProject(
diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs
index 41bead4a3..3a96e45ca 100644
--- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs
+++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateDeprecatedProjects.cs
@@ -220,7 +220,7 @@ namespace Microsoft.DotNet.Migration.Tests
                  .Execute("publish -c Debug")
                  .Should().Pass();
 
-            var outputDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.0");
+            var outputDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.1");
             outputDir.Should().Exist()
                 .And.HaveFiles(new[]
                     {
@@ -233,7 +233,7 @@ namespace Microsoft.DotNet.Migration.Tests
             Directory.Exists(Path.Combine(outputDir.FullName, "ExcludeThis1.txt")).Should().BeFalse();
             Directory.Exists(Path.Combine(outputDir.FullName, "ExcludeThis2.txt")).Should().BeFalse();
 
-            var publishDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.0", "publish");
+            var publishDir = projectDirectory.GetDirectory("bin", "Debug", "netcoreapp1.1", "publish");
             publishDir.Should().Exist()
                 .And.HaveFiles(new[]
                     {
@@ -431,9 +431,9 @@ namespace Microsoft.DotNet.Migration.Tests
                  .Execute("build -c Debug")
                  .Should().Pass();
 
-            if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
+            if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1"))
             {
-                // running the app requires netcoreapp1.0
+                // running the app requires netcoreapp1.1
                 return;
             }
 
@@ -489,9 +489,9 @@ namespace Microsoft.DotNet.Migration.Tests
                  .Execute("build -c Debug")
                  .Should().Pass();
 
-            if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
+            if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1"))
             {
-                // running the app requires netcoreapp1.0
+                // running the app requires netcoreapp1.1
                 return;
             }
 
@@ -546,9 +546,9 @@ namespace Microsoft.DotNet.Migration.Tests
                  .Execute("build -c Debug")
                  .Should().Pass();
 
-            if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.0"))
+            if (!EnvironmentInfo.HasSharedFramework("netcoreapp1.1"))
             {
-                // running the app requires netcoreapp1.0
+                // running the app requires netcoreapp1.1
                 return;
             }
 
diff --git a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs
index 25add3e18..4abf4782f 100644
--- a/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs
+++ b/test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs
@@ -23,11 +23,11 @@ namespace Microsoft.DotNet.New.Tests
         [InlineData("C#", "web", true)]
         [InlineData("C#", "mvc", true)]
         [InlineData("C#", "webapi", true)]
-        [InlineData("F#", "console", false)]
-        [InlineData("F#", "classlib", false)]
-        [InlineData("F#", "mstest", false)]
-        [InlineData("F#", "xunit", false)]
-        [InlineData("F#", "mvc", true)]
+        //[InlineData("F#", "console", false)]
+        //[InlineData("F#", "classlib", false)]
+        //[InlineData("F#", "mstest", false)]
+        //[InlineData("F#", "xunit", false)]
+        //[InlineData("F#", "mvc", true)]
         public void TemplateRestoresAndBuildsWithoutWarnings(
             string language,
             string projectType,
diff --git a/test/dotnet.Tests/PackagedCommandTests.cs b/test/dotnet.Tests/PackagedCommandTests.cs
index fc40b4063..5e36bcbd8 100644
--- a/test/dotnet.Tests/PackagedCommandTests.cs
+++ b/test/dotnet.Tests/PackagedCommandTests.cs
@@ -296,7 +296,7 @@ namespace Microsoft.DotNet.Tests
                 .WithRestoreFiles();
 
             var assetsFile = new DirectoryInfo(new RepoDirectoriesProvider().NugetPackages)
-                .GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp1.0")
+                .GetDirectory(".tools", "dotnet-portable", "1.0.0", "netcoreapp2.0")
                 .GetFile("project.assets.json");
 
             var stopWatch = Stopwatch.StartNew();