[release/7.0.2xx] Update dependencies from dotnet/templating

eng/Version.Details.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="7.0.200-alpha.1.23053.1">
+    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="7.0.200-alpha.1.23060.3">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>54adf82876d3a097006233aa12f8ac1364960673</Sha>
+      <Sha>f8bc164534a6967dd2ab3114a6fcf27df8b206f1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="7.0.200-alpha.1.23053.1">
+    <Dependency Name="Microsoft.TemplateEngine.Mocks" Version="7.0.200-alpha.1.23060.3">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>54adf82876d3a097006233aa12f8ac1364960673</Sha>
+      <Sha>f8bc164534a6967dd2ab3114a6fcf27df8b206f1</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0">

eng/Versions.props

@@ -126,13 +126,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/templating -->
-    <MicrosoftTemplateEngineAbstractionsPackageVersion>7.0.200-alpha.1.23053.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
+    <MicrosoftTemplateEngineAbstractionsPackageVersion>7.0.200-alpha.1.23060.3</MicrosoftTemplateEngineAbstractionsPackageVersion>
     <MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
     <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
     <MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
     <!-- test dependencies -->
-    <MicrosoftTemplateEngineMocksPackageVersion>7.0.200-alpha.1.23053.1</MicrosoftTemplateEngineMocksPackageVersion>
+    <MicrosoftTemplateEngineMocksPackageVersion>7.0.200-alpha.1.23060.3</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
     <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
   </PropertyGroup>

src/Assets/TestPackages/dotnet-new/test_templates/TemplateWithConditionalParameters/.template.config/template.json

@@ -12,14 +12,14 @@
       "type": "parameter",
       "datatype": "string",
       "description": "parameter A description",
-      "isEnabled": "A_enabled == true",
+      "isEnabled": "A_enabled",
       "isRequired": true,
       "replaces": "placeholderA"
     },
     "paramB": {
       "type": "parameter",
       "datatype": "string",
-      "isEnabled": "B_enabled == true",
+      "isEnabled": "B_enabled",
       "description": "parameter B description",
       "replaces": "placeholderB"
     },

src/Assets/TestPackages/dotnet-new/test_templates/TemplateWithConditionalParameters/Test.cs

@@ -2,10 +2,10 @@
 // value of paramA: placeholderA
 // value of paramB: placeholderB
 
-//#if( A_enabled )
+//#if( paramA )
 // A is enabled
 //#endif
 
-//#if( B_enabled )
+//#if( paramB )
 // B is enabled
 //#endif

src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj

@@ -16,8 +16,8 @@
 
   <ItemGroup>
     <PackageReference Include="FakeItEasy" Version="7.3.1" />
-    <PackageReference Include="Verify.XUnit" Version="19.5.0" />
-    <PackageReference Include="Verify.DiffPlex" Version="2.0.1" />
+    <PackageReference Include="Verify.XUnit" Version="19.6.0" />
+    <PackageReference Include="Verify.DiffPlex" Version="2.1.0" />
     <PackageReference Include="Microsoft.TemplateEngine.Mocks" Version="$(MicrosoftTemplateEngineMocksPackageVersion)" />
     <PackageReference Include="Microsoft.TemplateEngine.TestHelper" Version="$(MicrosoftTemplateEngineTestHelperPackageVersion)" />
     <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion)" />

src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplateWhenRequiredParamIsMissedAndConditionIntroduced.verified.txt

@@ -19,4 +19,5 @@ Template options:
                        Required if: a_enabled
                        Type: string
                        Default: def
-  -a_, --a_enabled     Type: bool
+  -a_, --a_enabled     Type: bool
+                       Default: False

src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_ConditionalParams.verified.txt

@@ -14,11 +14,13 @@ Options:
 
 Template options:
   -p, --paramA <paramA>   parameter A description
-                          Enabled if: A_enabled == true
+                          Enabled if: A_enabled
                           Type: string
   -pa, --paramB <paramB>  parameter B description
-                          Enabled if: B_enabled == true
+                          Enabled if: B_enabled
                           Type: string
                           Default: placeholderB
   -A, --A_enabled         Type: bool
+                          Default: False
   -B, --B_enabled         Type: bool
+                          Default: False

src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_RequiredParams.verified.txt

@@ -25,3 +25,4 @@ Template options:
                            Type: string
                            Default: def
   -e, --enableC            Type: bool
+                           Default: False

src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionalParameters_DisabledBehaveLikeNotSpecified.verified.txt

@@ -1,6 +1,6 @@
 
 // value of paramA: true
-// value of paramB: 
+// value of paramB: placeholderB
 
 // A is enabled
 

src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=A.verified.txt

@@ -0,0 +1,5 @@
+
+// value of paramA: placeholderA
+// value of paramB: placeholderB
+
+

src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB.verified.txt

@@ -1,7 +1,5 @@
 
-// value of paramA: valA
-// value of paramB: valB
+// value of paramA: placeholderA
+// value of paramB: placeholderB
 
-// A is enabled
 
-// B is enabled

src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB_ABenabled.verified.txt

@@ -0,0 +1,7 @@
+
+// value of paramA: true
+// value of paramB: true
+
+// A is enabled
+
+// B is enabled

src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB_Aenabled.verified.txt

@@ -0,0 +1,6 @@
+
+// value of paramA: true
+// value of paramB: placeholderB
+
+// A is enabled
+

src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=A_Aenabled.verified.txt

@@ -0,0 +1,6 @@
+
+// value of paramA: true
+// value of paramB: placeholderB
+
+// A is enabled
+

src/Tests/dotnet-new.Tests/DotnetNewInstantiateTests.Approval.cs

@@ -685,8 +685,11 @@ public Task CanInstantiateTemplate_WithRequiredParams(string parameters, string
         }
 
         [Theory]
-        //[InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--A_enabled", "A")]
-        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--paramB|valB|--A_enabled|--B_enabled", "AB")]
+        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|true|--A_enabled", "A_Aenabled")]
+        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|true", "A")]
+        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|true|--paramB|true", "AB")]
+        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|true|--paramB|true|--A_enabled", "AB_Aenabled")]
+        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|true|--paramB|true|--A_enabled|--B_enabled", "AB_ABenabled")]
         public Task CanInstantiateTemplate_WithConditionallyEnabledParams(string parameters, string setName)
         {
             string workingDirectory = CreateTemporaryFolder();
@@ -730,28 +733,5 @@ public Task CannotInstantiateTemplate_WithoutRequiredParams(string parameters, s
             return Verify(commandResult.FormatOutputStreams())
                 .UseParameters(setName);
         }
-
-        [Theory]
-        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA", "A")]
-        [InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--paramB|valB", "AB")]
-        //[InlineData("TestAssets.TemplateWithConditionalParameters|--paramA|valA|--paramB|valB|--A_enabled", "AB")]
-        public Task CannotInstantiateTemplate_WithDisabledParams(string parameters, string setName)
-        {
-            string workingDirectory = CreateTemporaryFolder();
-            string homeDirectory = CreateTemporaryFolder();
-            InstallTestTemplate("TemplateWithConditionalParameters", _log, homeDirectory, workingDirectory);
-
-            CommandResult commandResult = new DotnetNewCommand(_log, parameters.Split("|"))
-                .WithCustomHive(homeDirectory)
-                .WithWorkingDirectory(workingDirectory)
-                .Execute();
-
-            commandResult
-                 .Should()
-                 .Pass();
-
-            return Verify(File.ReadAllText(Path.Combine(workingDirectory, "Test.cs")))
-                .UseParameters(setName);
-        }
     }
 }

src/Tests/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj

@@ -15,8 +15,8 @@
     <ProjectReference Include="..\..\Cli\dotnet-new3\dotnet-new3.csproj" />
     <ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
     <PackageReference Include="Moq" Version="$(MoqPackageVersion)" />
-    <PackageReference Include="Verify.Xunit" Version="19.5.0" />
-    <PackageReference Include="Verify.DiffPlex" Version="2.0.1" />
+    <PackageReference Include="Verify.Xunit" Version="19.6.0" />
+    <PackageReference Include="Verify.DiffPlex" Version="2.1.0" />
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.TemplateEngine.TestHelper" Version="$(MicrosoftTemplateEngineTestHelperPackageVersion)" />
     <PackageReference Include="Microsoft.TemplateEngine.Authoring.TemplateVerifier" Version="$(MicrosoftTemplateEngineAuthoringTemplateVerifierVersion)" />