Merge pull request #7046 from KevinRansom/mlorbetske-dev/mlorbe/UpdateTemplateEngineFor1x

Mlorbetske dev/mlorbe/update template engine for1x

Author: Livar

build/Microsoft.DotNet.Cli.Compile.targets

@@ -226,6 +226,15 @@
           <!-- Executables need x -->
           <Mode>u=rwx,g=rx,o=rx</Mode>
         </SdkOutputChmodTargets>
+        <SdkOutputChmodTargets Include="$(SdkOutputDirectory)/Roslyn/RunCsc.sh">
+          <Mode>755</Mode>
+        </SdkOutputChmodTargets>
+        <SdkOutputChmodTargets Include="$(SdkOutputDirectory)/Roslyn/RunVbc.sh">
+          <Mode>755</Mode>
+        </SdkOutputChmodTargets>
+        <SdkOutputChmodTargets Include="$(SdkOutputDirectory)/FSharp/RunFsc.sh">
+          <Mode>755</Mode>
+        </SdkOutputChmodTargets>
       </ItemGroup>
 
       <Chmod Condition=" '$(OSName)' != 'win' "

build/Microsoft.DotNet.Cli.DependencyVersions.props

@@ -5,12 +5,12 @@
     <CLI_MSBuild_Version>15.3.0-preview-000402-01</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.3.0-beta3-61816-04</CLI_Roslyn_Version>
     <CLI_FSharp_Version>4.2.0-rc-170621-0</CLI_FSharp_Version>
-    <CLI_NETSDK_Version>1.1.0-alpha-20170615-3</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>1.1.0-alpha-20170630-2</CLI_NETSDK_Version>
     <CLI_NuGet_Version>4.3.0-preview3-4168</CLI_NuGet_Version>
     <CLI_WEBSDK_Version>1.0.0-alpha-20170516-2-509</CLI_WEBSDK_Version>
     <CLI_TestPlatform_Version>15.0.0</CLI_TestPlatform_Version>
-    <TemplateEngineVersion>1.0.0-beta1-20170202-111</TemplateEngineVersion>
-    <TemplateEngineTemplateVersion>1.0.0-beta1-20170427-174</TemplateEngineTemplateVersion>
+    <TemplateEngineVersion>1.0.0-beta2-20170629-269</TemplateEngineVersion>
+    <TemplateEngineTemplateVersion>1.0.0-beta2-20170629-269</TemplateEngineTemplateVersion>
     <PlatformAbstractionsVersion>1.0.3</PlatformAbstractionsVersion>
     <DependencyModelVersion>1.0.3</DependencyModelVersion>
   </PropertyGroup>

src/dotnet/Program.cs

@@ -28,6 +28,7 @@
 using Microsoft.DotNet.Tools.Test;
 using Microsoft.DotNet.Tools.VSTest;
 using NuGet.Frameworks;
+using Command = Microsoft.DotNet.Cli.Utils.Command;
 
 namespace Microsoft.DotNet.Cli
 {

src/dotnet/commands/dotnet-new/NewCommandShim.cs

@@ -6,8 +6,11 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Runtime.CompilerServices;
+using System.Reflection;
+using Microsoft.DotNet.Cli;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Configurer;
+using Microsoft.DotNet.Tools.MSBuild;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Cli;
 using Microsoft.TemplateEngine.Edge;
@@ -25,29 +28,17 @@ internal class NewCommandShim
 
         public static int Run(string[] args)
         {
-            return New3Command.Run(CommandName, CreateHost(), FirstRun, args);
+            var logger = new TelemetryLogger(null);
+            return New3Command.Run(CommandName, CreateHost(), logger, FirstRun, args);
         }
 
         private static ITemplateEngineHost CreateHost()
         {
-            var builtIns = new Dictionary<Guid, Func<Type>>
+            var builtIns = new AssemblyComponentCatalog(new[]
             {
-                { new Guid("0C434DF7-E2CB-4DEE-B216-D7C58C8EB4B3"), () => typeof(RunnableProjectGenerator) },
-                { new Guid("3147965A-08E5-4523-B869-02C8E9A8AAA1"), () => typeof(BalancedNestingConfig) },
-                { new Guid("3E8BCBF0-D631-45BA-A12D-FBF1DE03AA38"), () => typeof(ConditionalConfig) },
-                { new Guid("A1E27A4B-9608-47F1-B3B8-F70DF62DC521"), () => typeof(FlagsConfig) },
-                { new Guid("3FAE1942-7257-4247-B44D-2DDE07CB4A4A"), () => typeof(IncludeConfig) },
-                { new Guid("3D33B3BF-F40E-43EB-A14D-F40516F880CD"), () => typeof(RegionConfig) },
-                { new Guid("62DB7F1F-A10E-46F0-953F-A28A03A81CD1"), () => typeof(ReplacementConfig) },
-                { new Guid("370996FE-2943-4AED-B2F6-EC03F0B75B4A"), () => typeof(ConstantMacro) },
-                { new Guid("BB625F71-6404-4550-98AF-B2E546F46C5F"), () => typeof(EvaluateMacro) },
-                { new Guid("10919008-4E13-4FA8-825C-3B4DA855578E"), () => typeof(GuidMacro) },
-                { new Guid("F2B423D7-3C23-4489-816A-41D8D2A98596"), () => typeof(NowMacro) },
-                { new Guid("011E8DC1-8544-4360-9B40-65FD916049B7"), () => typeof(RandomMacro) },
-                { new Guid("8A4D4937-E23F-426D-8398-3BDBD1873ADB"), () => typeof(RegexMacro) },
-                { new Guid("B57D64E0-9B4F-4ABE-9366-711170FD5294"), () => typeof(SwitchMacro) },
-                { new Guid("10919118-4E13-4FA9-825C-3B4DA855578E"), () => typeof(CaseChangeMacro) }
-            }.ToList();
+                typeof(RunnableProjectGenerator).GetTypeInfo().Assembly,
+                typeof(ConditionalConfig).GetTypeInfo().Assembly,
+            });
 
             var preferences = new Dictionary<string, string>
             {

test/dotnet-new.Tests/NewCommandTests.cs

@@ -16,7 +16,7 @@ public void WhenSwitchIsSkippedThenItPrintsError()
 
             cmd.ExitCode.Should().NotBe(0);
 
-            cmd.StdErr.Should().StartWith("No templates matched the input template name: [Web1.1]");
+            cmd.StdErr.Should().StartWith("No templates matched the input template name: Web1.1.");
         }
 
         [Fact]
@@ -26,7 +26,7 @@ public void WhenTemplateNameIsNotUniquelyMatchedThenItIndicatesProblemToUser()
 
             cmd.ExitCode.Should().NotBe(0);
 
-            cmd.StdErr.Should().StartWith("Unable to determine the desired template from the input template name: [c]");
+            cmd.StdErr.Should().StartWith("Unable to determine the desired template from the input template name: c.");
         }
     }
 }

test/dotnet.Tests/GivenThatTheUserIsRunningDotNetForTheFirstTime.cs

@@ -105,7 +105,6 @@ public void ItRestoresTheNuGetPackagesToTheNuGetCacheFolder()
                 "microsoft.extensions.logging.console",
                 "microsoft.extensions.logging.debug",
                 "microsoft.extensions.options.configurationextensions",
-                "microsoft.visualstudio.web.browserlink",
             };
 
             _nugetCacheFolder