diff --git a/NuGet.Config b/NuGet.Config
index 559db7b79..556ee5919 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -9,5 +9,6 @@
     <add key="roslyn" value="https://dotnet.myget.org/f/roslyn/api/v3/index.json" />
     <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" /> 
   </packageSources>
 </configuration>
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/Program.cs
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/Program.cs
rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/Program.cs
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.sln b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.sln
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.sln
rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.sln
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.xproj
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/TestApp.xproj
rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/TestApp.xproj
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/project.json
rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/project.json
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/Helper.cs
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/Helper.cs
rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/Helper.cs
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj
rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestApp/src/subdir/subdir.csproj
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/Helper.cs
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/Helper.cs
rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/Helper.cs
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/TestLibrary.xproj b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/TestLibrary.xproj
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/TestLibrary.xproj
rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/TestLibrary.xproj
diff --git a/TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/project.json b/TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/project.json
similarity index 100%
rename from TestAssets/NonRestoredTestProjects/PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj/TestLibrary/project.json
rename to TestAssets/NonRestoredTestProjects/PJAppWithSlnThatDoesNotRefCsproj/TestLibrary/project.json
diff --git a/build/Microsoft.DotNet.Cli.BundledTemplates.props b/build/Microsoft.DotNet.Cli.BundledTemplates.props
index 6f9987424..ba625fc9d 100644
--- a/build/Microsoft.DotNet.Cli.BundledTemplates.props
+++ b/build/Microsoft.DotNet.Cli.BundledTemplates.props
@@ -3,8 +3,8 @@
   
   <ItemGroup>
     <BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates" Version="$(TemplateEngineTemplateVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates" Version="$(TemplateEngineTemplateVersion)" />
-    <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates" Version="$(TemplateEngineTemplateVersion)" />
+    <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.1.x" Version="$(TemplateEngineTemplateVersion)" />
+    <BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.1.x" Version="$(TemplateEngineTemplateVersion)" />
+    <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.1.x" Version="$(TemplateEngineTemplateVersion)" />
   </ItemGroup>
 </Project>
diff --git a/build/Microsoft.DotNet.Cli.DependencyVersions.props b/build/Microsoft.DotNet.Cli.DependencyVersions.props
index a10406482..b0fb69426 100644
--- a/build/Microsoft.DotNet.Cli.DependencyVersions.props
+++ b/build/Microsoft.DotNet.Cli.DependencyVersions.props
@@ -9,7 +9,7 @@
     <CLI_WEBSDK_Version>1.0.0-alpha-20170130-3-281</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.0.0-preview-20170222-09</CLI_TestPlatform_Version>
     <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta1-20170206-112</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta1-20170222-125</TemplateEngineTemplateVersion>
     <PlatformAbstractionsVersion>1.1.1</PlatformAbstractionsVersion>
     <DependencyModelVersion>1.0.2</DependencyModelVersion>
   </PropertyGroup>
diff --git a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
index f27fa510d..7dc602f21 100644
--- a/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
+++ b/build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
@@ -88,7 +88,7 @@
 
       <DotNetNew ToolPath="$(Stage2Directory)"
                  TemplateType="Mvc"
-                 TemplateArgs="-au Individual --debug:ephemeral-hive"
+                 TemplateArgs="-au Individual -f netcoreapp1.0 --debug:ephemeral-hive --no-tools"
                  WorkingDirectory="$(NuGetPackagesArchiveProject)/Web" />
 
       <DotNetRestore ToolPath="$(Stage2Directory)"
@@ -98,7 +98,7 @@
 
       <DotNetNew ToolPath="$(Stage2Directory)"
                  TemplateType="Mvc"
-                 TemplateArgs="-au Individual -f netcoreapp1.1 --debug:ephemeral-hive"
+                 TemplateArgs="-au Individual -f netcoreapp1.1 --debug:ephemeral-hive --no-tools"
                  WorkingDirectory="$(NuGetPackagesArchiveProject)/Web1.1" />
 
       <DotNetRestore ToolPath="$(Stage2Directory)"
diff --git a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs
index e33bc7a82..64e789214 100644
--- a/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs
+++ b/build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs
@@ -26,8 +26,8 @@ namespace Microsoft.DotNet.Cli.Build
 
         private static string[][] _templatesAndArgs = new string[][]
         {
-            new string[] { "mvc", "-au Individual -f netcoreapp1.0" },
-            new string[] { "mvc", "-au Individual -f netcoreapp1.1" }
+            new string[] { "mvc", "-au Individual -f netcoreapp1.0 --no-tools" },
+            new string[] { "mvc", "-au Individual -f netcoreapp1.1 --no-tools" }
         };
 
         public override bool Execute()
diff --git a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
index 9ffb204b9..297909c77 100644
--- a/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
+++ b/src/Microsoft.DotNet.Configurer/NuGetCachePrimer.cs
@@ -12,8 +12,8 @@ namespace Microsoft.DotNet.Configurer
     {
         private static IReadOnlyList<IReadOnlyList<string>> _templatesUsedToPrimeCache = new List<IReadOnlyList<string>>()
         {
-            new List<string>() { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive" },
-            new List<string>() { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive" }
+            new List<string>() { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" },
+            new List<string>() { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" }
         };
 
         private readonly ICommandFactory _commandFactory;
diff --git a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
index 0defc02ba..3268bfed2 100644
--- a/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
+++ b/test/Microsoft.DotNet.Configurer.UnitTests/GivenANuGetCachePrimer.cs
@@ -63,10 +63,10 @@ namespace Microsoft.DotNet.Configurer.UnitTests
             SetupCommandMock(_dotnetNewCommandMock);
 
             commandFactoryMock
-                .Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive" }, null, Constants.DefaultConfiguration))
+                .Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.0", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" }, null, Constants.DefaultConfiguration))
                 .Returns(_dotnetNewCommandMock.Object);
             commandFactoryMock
-                .Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive" }, null, Constants.DefaultConfiguration))
+                .Setup(c => c.Create("new", new[] { "mvc", "-f", "netcoreapp1.1", "-au", "Individual", "--debug:ephemeral-hive", "--no-tools" }, null, Constants.DefaultConfiguration))
                 .Returns(_dotnetNewCommandMock.Object);
 
             _dotnetRestoreCommandMock = new Mock<ICommand>();
diff --git a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
index 781f7c985..f6ae3c052 100644
--- a/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
+++ b/test/dotnet-build.Tests/GivenDotnetBuildBuildsCsproj.cs
@@ -65,7 +65,7 @@ namespace Microsoft.DotNet.Cli.Build.Tests
                 .Execute()
                 .Should().Pass();
 
-            var outputDll = Directory.EnumerateFiles(Path.Combine(rootPath, "bin"), "*.dll", SearchOption.AllDirectories).Single();
+            var outputDll = Directory.EnumerateFiles(Path.Combine(rootPath, "bin"), "*.dll", SearchOption.AllDirectories).Single(x => !x.Contains("DiaSymReader"));
 
             var outputRunCommand = new TestCommand("dotnet");
 
diff --git a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs
index 330baa6e0..30387fecc 100644
--- a/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs
+++ b/test/dotnet-migrate.Tests/GivenThatIWantToMigrateSolutions.cs
@@ -95,7 +95,7 @@ namespace Microsoft.DotNet.Migration.Tests
         {
             MigrateAndBuild(
                 "NonRestoredTestProjects",
-                "PJAppWithSlnAndXprojRefThatRefsCsprojWhereSlnDoesNotRefCsproj");
+                "PJAppWithSlnThatDoesNotRefCsproj");
         }
 
         [Fact]
@@ -229,11 +229,10 @@ namespace Microsoft.DotNet.Migration.Tests
                 .Execute($"restore \"{solutionRelPath}\"")
                 .Should().Pass();
 
-            //ISSUE: https://github.com/dotnet/cli/issues/5205
-            //new DotnetCommand()
-            //    .WithWorkingDirectory(projectDirectory)
-            //    .Execute($"build \"{solutionRelPath}\"")
-            //    .Should().Pass();
+            new DotnetCommand()
+                .WithWorkingDirectory(projectDirectory)
+                .Execute($"build \"{solutionRelPath}\"")
+                .Should().Pass();
         }
 
         private void MigrateAndBuild(string groupName, string projectName, [CallerMemberName] string callingMethod = "", string identifier = "")
@@ -257,11 +256,10 @@ namespace Microsoft.DotNet.Migration.Tests
                 .Execute($"restore \"{solutionRelPath}\"")
                 .Should().Pass();
 
-            //ISSUE: https://github.com/dotnet/cli/issues/5205
-            //new DotnetCommand()
-            //    .WithWorkingDirectory(projectDirectory)
-            //    .Execute($"build \"{solutionRelPath}\"")
-            //    .Should().Pass();
+            new DotnetCommand()
+                .WithWorkingDirectory(projectDirectory)
+                .Execute($"build \"{solutionRelPath}\"")
+                .Should().Pass();
 
             SlnFile slnFile = SlnFile.Read(Path.Combine(projectDirectory.FullName, solutionRelPath));
             
diff --git a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
index 8bfa9c1ed..eaf5b585e 100644
--- a/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
+++ b/test/dotnet-migrate.Tests/NuGet.tempaspnetpatch.config
@@ -8,5 +8,6 @@
     <add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" />
     <add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" /> 
   </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
index 41ba66505..80a6898ca 100644
--- a/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
+++ b/test/dotnet-new.Tests/NuGet.tempaspnetpatch.config
@@ -7,5 +7,6 @@
     <add key="aspnet101" value="https://www.myget.org/F/aspnet101/api/v3/index.json" />
     <add key="dotnet-web" value="https://dotnet.myget.org/F/dotnet-web/api/v3/index.json" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="AspNetCurrent" value="https://dotnet.myget.org/F/aspnet-feb2017-patch/api/v3/index.json" /> 
   </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs
index 13d5374d2..65ede2408 100644
--- a/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs
+++ b/test/dotnet-publish.Tests/GivenDotnetPublishPublishesProjects.cs
@@ -107,7 +107,7 @@ namespace Microsoft.DotNet.Cli.Publish.Tests
             var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
 
             var outputProgram = rootDir
-                .GetDirectory("bin", configuration, "netcoreapp1.0", "publish", $"{rootDir.Name}.dll")
+                .GetDirectory("bin", configuration, "netcoreapp1.1", "publish", $"{rootDir.Name}.dll")
                 .FullName;
 
             new TestCommand(outputProgram)
diff --git a/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs
index 740fd6d76..ecf64be5b 100644
--- a/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs
+++ b/test/dotnet-sln-add.Tests/GivenDotnetSlnAdd.cs
@@ -452,11 +452,10 @@ EndGlobal
             cmd.StdErr.Should().BeEmpty();
         }
 
-        //ISSUE: https://github.com/dotnet/cli/issues/5205
-        //[Theory]
-        //[InlineData("TestAppWithSlnAndCsprojFiles")]
-        //[InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")]
-        //[InlineData("TestAppWithEmptySln")]
+        [Theory]
+        [InlineData("TestAppWithSlnAndCsprojFiles")]
+        [InlineData("TestAppWithSlnAndCsprojProjectGuidFiles")]
+        [InlineData("TestAppWithEmptySln")]
         public void WhenValidProjectIsPassedTheSlnBuilds(string testAsset)
         {
             var projectDirectory = TestAssets
diff --git a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
index 6cdad4b02..b6981d924 100644
--- a/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
+++ b/test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs
@@ -118,7 +118,7 @@ A command is running to initially populate your local package cache, to improve
 
             _nugetCacheFolder
                 .GetDirectory("microsoft.aspnetcore.mvc")
-                .Should().HaveDirectories(new string[] { "1.0.2", "1.1.1" });
+                .Should().HaveDirectories(new string[] { "1.0.3", "1.1.2" });
         }
 
         private string GetDotnetVersion()