diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 116dc69d84f4..7c9e347cf40d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 54adf82876d3a097006233aa12f8ac1364960673 + f8bc164534a6967dd2ab3114a6fcf27df8b206f1 - + https://github.com/dotnet/templating - 54adf82876d3a097006233aa12f8ac1364960673 + f8bc164534a6967dd2ab3114a6fcf27df8b206f1 diff --git a/eng/Versions.props b/eng/Versions.props index ee30ac20618a..cf4ebb7a1f4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,13 +126,13 @@ - 7.0.200-alpha.1.23053.1 + 7.0.200-alpha.1.23060.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.200-alpha.1.23053.1 + 7.0.200-alpha.1.23060.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/TemplateWithConditionalParameters/.template.config/template.json b/src/Assets/TestPackages/dotnet-new/test_templates/TemplateWithConditionalParameters/.template.config/template.json index 6fcebc0f7c50..853460af7f6e 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/TemplateWithConditionalParameters/.template.config/template.json +++ b/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" }, diff --git a/src/Assets/TestPackages/dotnet-new/test_templates/TemplateWithConditionalParameters/Test.cs b/src/Assets/TestPackages/dotnet-new/test_templates/TemplateWithConditionalParameters/Test.cs index 6c08925190da..b3f4e3af1445 100644 --- a/src/Assets/TestPackages/dotnet-new/test_templates/TemplateWithConditionalParameters/Test.cs +++ b/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 diff --git a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj index afcafbd264ae..75decd58a895 100644 --- a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj +++ b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplateWhenRequiredParamIsMissedAndConditionIntroduced.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplateWhenRequiredParamIsMissedAndConditionIntroduced.verified.txt index 2dd283527dcc..933017ac9ce2 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplateWhenRequiredParamIsMissedAndConditionIntroduced.verified.txt +++ b/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 \ No newline at end of file + -a_, --a_enabled Type: bool + Default: False \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_ConditionalParams.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_ConditionalParams.verified.txt index 55ef3841dee7..8dd2ec27b186 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_ConditionalParams.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_ConditionalParams.verified.txt @@ -14,11 +14,13 @@ Options: Template options: -p, --paramA parameter A description - Enabled if: A_enabled == true + Enabled if: A_enabled Type: string -pa, --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 \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_RequiredParams.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_RequiredParams.verified.txt index 765193822981..702659c846ea 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewHelpTests.CanShowHelpForTemplate_RequiredParams.verified.txt +++ b/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 \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionalParameters_DisabledBehaveLikeNotSpecified.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionalParameters_DisabledBehaveLikeNotSpecified.verified.txt index c6fe63535781..91b52a4e9eee 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionalParameters_DisabledBehaveLikeNotSpecified.verified.txt +++ b/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 diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=A.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=A.verified.txt new file mode 100644 index 000000000000..34107e1580f3 --- /dev/null +++ b/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 + + diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB.verified.txt index f7da1b34746a..34107e1580f3 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB.verified.txt +++ b/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 diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB_ABenabled.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB_ABenabled.verified.txt new file mode 100644 index 000000000000..c9a70116ca91 --- /dev/null +++ b/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 diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB_Aenabled.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=AB_Aenabled.verified.txt new file mode 100644 index 000000000000..91b52a4e9eee --- /dev/null +++ b/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 + diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=A_Aenabled.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CanInstantiateTemplate_WithConditionallyEnabledParams_parameters=A_Aenabled.verified.txt new file mode 100644 index 000000000000..91b52a4e9eee --- /dev/null +++ b/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 + diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplate_WithDisabledParams_parameters=A.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplate_WithDisabledParams_parameters=A.verified.txt deleted file mode 100644 index d761eb38d59a..000000000000 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplate_WithDisabledParams_parameters=A.verified.txt +++ /dev/null @@ -1,5 +0,0 @@ - -// value of paramA: -// value of paramB: - - diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplate_WithDisabledParams_parameters=AB.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplate_WithDisabledParams_parameters=AB.verified.txt deleted file mode 100644 index d761eb38d59a..000000000000 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewInstantiateTests.CannotInstantiateTemplate_WithDisabledParams_parameters=AB.verified.txt +++ /dev/null @@ -1,5 +0,0 @@ - -// value of paramA: -// value of paramB: - - diff --git a/src/Tests/dotnet-new.Tests/DotnetNewInstantiateTests.Approval.cs b/src/Tests/dotnet-new.Tests/DotnetNewInstantiateTests.Approval.cs index 9f6df96ef8db..9498231b1466 100644 --- a/src/Tests/dotnet-new.Tests/DotnetNewInstantiateTests.Approval.cs +++ b/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); - } } } diff --git a/src/Tests/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj b/src/Tests/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj index d7a00e85f587..2deba44e9b62 100644 --- a/src/Tests/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj +++ b/src/Tests/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj @@ -15,8 +15,8 @@ - - + +