Merge branch 'master' into master-UpdateDependencies

build/BundledTemplates.props

@@ -1,6 +1,7 @@
 <Project ToolsVersion="15.0">
   <ItemGroup>
     <BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
+    <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
     <BundledTemplate Include="Microsoft.DotNet.Common.ProjectTemplates.2.0" Version="$(TemplateEngineTemplate2_0Version)" />
     <BundledTemplate Include="Microsoft.DotNet.Test.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" />
     <BundledTemplate Include="Microsoft.DotNet.Web.ProjectTemplates.2.0" Version="$(TemplateEngineTemplateVersion)" />

build/DependencyVersions.props

@@ -11,9 +11,9 @@
     <SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
     <SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
     <HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
-    <TemplateEngineVersion>1.0.0-beta2-20170410-189</TemplateEngineVersion>
+    <TemplateEngineVersion>1.0.0-beta2-20170421-198</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta2-20170410-189</TemplateEngineTemplateVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta2-20170421-198</TemplateEngineTemplateVersion>
-    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170410-189</TemplateEngineTemplate2_0Version>
+    <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170421-198</TemplateEngineTemplate2_0Version>
     <PlatformAbstractionsVersion>2.0.0-preview2-002066</PlatformAbstractionsVersion>
     <DependencyModelVersion>2.0.0-preview2-002066</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>

build/compile/LzmaArchive.targets

@@ -78,7 +78,7 @@
         <FilesToClean Include="$(NuGetPackagesArchiveProject)/**/*" />
         <FilesToClean Include="$(NuGetPackagesArchiveFolder)/**/*" />
 
-        <NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveProject)/Console" />
+        <NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveProject)/MvcIndividual" />
         <NuGetPackagesArchiveDirectory Include="$(NuGetPackagesArchiveFolder)" />
       </ItemGroup>
 
@@ -91,15 +91,16 @@
                         Lines="$(NuGetConfigContent)" />
 
       <DotNetNew ToolPath="$(OutputDirectory)"
-                 TemplateType="console"
+                 TemplateType="mvc"
-                 TemplateArgs="--debug:ephemeral-hive --no-restore"
+                 TemplateArgs="-au Individual --debug:ephemeral-hive --no-restore"
-                 WorkingDirectory="$(NuGetPackagesArchiveProject)/Console" />
+                 WorkingDirectory="$(NuGetPackagesArchiveProject)/MvcIndividual" />
 
       <DotNetRestore ToolPath="$(OutputDirectory)"
                      Packages="$(NuGetPackagesArchiveFolder)"
                      ConfigFile="$(LZMANuGetConfigFilePath)"
                      SkipInvalidConfigurations="True"
-                     WorkingDirectory="$(NuGetPackagesArchiveProject)/Console" />
+                     WorkingDirectory="$(NuGetPackagesArchiveProject)/MvcIndividual" />
+
 
       <Delete Files="$(IntermediateArchive);$(IntermediateArchive).zip;$(NuGetPackagesArchiveFolder)/**/*.nupkg" />
 

build_projects/dotnet-cli-build/GenerateNuGetPackagesArchiveVersion.cs

@@ -29,7 +29,7 @@ namespace Microsoft.DotNet.Cli.Build
 
         private static string[][] _templatesAndArgs = new string[][]
         {
-            new string[] { "console", "" },
+            new string[] { "mvc", "-au individual" },
         };
 
         public override bool Execute()

test/dotnet-new.Tests/GivenThatIWantANewAppWithSpecifiedType.cs

@@ -21,9 +21,8 @@ namespace Microsoft.DotNet.New.Tests
         [InlineData("C#", "mstest", false)]
         [InlineData("C#", "xunit", false)]
         [InlineData("C#", "web", false)]
-        // Uncomment the tests below in PR#6362
+        [InlineData("C#", "mvc", false)]
-        //[InlineData("C#", "mvc", false)]
+        [InlineData("C#", "webapi", false)]
-        //[InlineData("C#", "webapi", false)]
         // Uncomment the test below once https://github.com/dotnet/netcorecli-fsc/issues/92 is fixed.
         //[InlineData("F#", "console", false)]
         //[InlineData("F#", "classlib", false)]

test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs

@@ -97,11 +97,6 @@ A command is running to initially populate your local package cache, to improve
                 "microsoft.netcore.app",
                 "microsoft.netcore.platforms",
                 "netstandard.library",
-            };
-
-            // https://github.com/dotnet/cli/issues/5505 - add the "2.0" asp.net packages into the offline cache
-            List<string> unexpectedDirectories = new List<string>()
-            {
                 "microsoft.aspnetcore.diagnostics",
                 "microsoft.aspnetcore.mvc",
                 "microsoft.aspnetcore.routing",
@@ -114,16 +109,13 @@ A command is running to initially populate your local package cache, to improve
                 "microsoft.extensions.logging.console",
                 "microsoft.extensions.logging.debug",
                 "microsoft.extensions.options.configurationextensions",
-                "microsoft.visualstudio.web.browserlink",
+                //BrowserLink has been temporarily disabled until https://github.com/dotnet/templating/issues/644 is resolved
+                //"microsoft.visualstudio.web.browserlink",
             };
 
             _nugetFallbackFolder
                 .Should()
                 .HaveDirectories(expectedDirectories);
-
-            _nugetFallbackFolder
-                .Should()
-                .NotHaveDirectories(unexpectedDirectories);
         }
 
         private string GetDotnetVersion()