Fix version mismatches

dotnet · Oct 21, 2022 · d360677 · d360677
1 parent 939ee0a
commit d360677
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 98 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -133,7 +133,7 @@
     <!-- test dependencies -->
     <MicrosoftTemplateEngineMocksPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineMocksPackageVersion>
     <MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
-	<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
+    <MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/visualfsharp -->

diff --git a/...mSupport.Nullable-False#TopLevel-False#ImplicitUsings-False.verified/MyProject/Program.cs b/...mSupport.Nullable-False#TopLevel-False#ImplicitUsings-False.verified/MyProject/Program.cs
diff --git a/...port.Nullable-False#TopLevel-False#ImplicitUsings-False.verified/MyProject/console.csproj b/...port.Nullable-False#TopLevel-False#ImplicitUsings-False.verified/MyProject/console.csproj
diff --git a/...amSupport.Nullable-True#TopLevel-False#ImplicitUsings-False.verified/MyProject/Program.cs b/...amSupport.Nullable-True#TopLevel-False#ImplicitUsings-False.verified/MyProject/Program.cs
diff --git a/...pport.Nullable-True#TopLevel-False#ImplicitUsings-False.verified/MyProject/console.csproj b/...pport.Nullable-True#TopLevel-False#ImplicitUsings-False.verified/MyProject/console.csproj
diff --git a/...ramSupport.Nullable-True#TopLevel-True#ImplicitUsings-False.verified/MyProject/Program.cs b/...ramSupport.Nullable-True#TopLevel-True#ImplicitUsings-False.verified/MyProject/Program.cs
diff --git a/...upport.Nullable-True#TopLevel-True#ImplicitUsings-False.verified/MyProject/console.csproj b/...upport.Nullable-True#TopLevel-True#ImplicitUsings-False.verified/MyProject/console.csproj
diff --git a/...port.Nullable-True#TopLevel-True#ImplicitUsings-True#NoLang.verified/MyProject/Program.cs b/...port.Nullable-True#TopLevel-True#ImplicitUsings-True#NoLang.verified/MyProject/Program.cs
diff --git a/....Nullable-True#TopLevel-True#ImplicitUsings-True#NoLang.verified/MyProject/console.csproj b/....Nullable-True#TopLevel-True#ImplicitUsings-True#NoLang.verified/MyProject/console.csproj
diff --git a/...gramSupport.Nullable-True#TopLevel-True#ImplicitUsings-True.verified/MyProject/Program.cs b/...gramSupport.Nullable-True#TopLevel-True#ImplicitUsings-True.verified/MyProject/Program.cs
diff --git a/...Support.Nullable-True#TopLevel-True#ImplicitUsings-True.verified/MyProject/console.csproj b/...Support.Nullable-True#TopLevel-True#ImplicitUsings-True.verified/MyProject/console.csproj
diff --git a/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs b/src/Tests/dotnet-new.Tests/CommonTemplatesTests.cs
@@ -92,8 +92,8 @@ public async void AllCommonProjectsCreateRestoreAndBuild(string expectedTemplate
                 VerifyCommandOutput = true,
                 VerificationExcludePatterns = new[] { "*.cs", "*.fs", "*.vb", "*.*proj" },
                 DoNotPrependCallerMethodNameToScenarioName = false,
-                DoNotAppendParamsToScenarioName = true,
-                DoNotPrependTemplateToScenarioName = true,
+                DoNotAppendTemplateArgsToScenarioName = true,
+                DoNotPrependTemplateNameToScenarioName = true,
             }
             .WithCustomScrubbers(
                 ScrubbersDefinition.Empty
@@ -184,9 +184,9 @@ public async void AllCommonProjectsCreate_NoRestore(string expectedTemplateName,
                 ExpectationsDirectory = "Approvals",
                 VerifyCommandOutput = true,
                 VerificationIncludePatterns = new[] { "*.txt" },
-                DoNotAppendParamsToScenarioName = true,
+                DoNotAppendTemplateArgsToScenarioName = true,
                 SettingsDirectory = _fixture.HomeDirectory,
-                DoNotPrependTemplateToScenarioName = true,
+                DoNotPrependTemplateNameToScenarioName = true,
             }
             .WithCustomScrubbers(
                 ScrubbersDefinition.Empty
@@ -212,9 +212,9 @@ public async void AllCommonItemsCreate(string expectedTemplateName, string templ
                 ExpectationsDirectory = "Approvals",
                 VerifyCommandOutput = true,
                 VerificationIncludePatterns = new[] { "*.txt" },
-                DoNotAppendParamsToScenarioName = true,
+                DoNotAppendTemplateArgsToScenarioName = true,
                 SettingsDirectory = _fixture.HomeDirectory,
-                DoNotPrependTemplateToScenarioName = true,
+                DoNotPrependTemplateNameToScenarioName = true,
             }
             .WithCustomScrubbers(
                 ScrubbersDefinition.Empty
@@ -364,9 +364,9 @@ public async void TopLevelProgramSupport_WhenFlagIsEnabled(string? langVersion)
                 ExpectationsDirectory = "Approvals",
                 OutputDirectory = workingDir,
                 SettingsDirectory = _fixture.HomeDirectory,
-                // DoNotPrependTemplateToScenarioName = true,
-                DoNotAppendParamsToScenarioName = true,
-                ScenarioDistinguisher = langVersion == null ? "#NoLang" : null,
+                // DoNotPrependTemplateNameToScenarioName = true,
+                DoNotAppendTemplateArgsToScenarioName = true,
+                ScenarioName = langVersion == null ? "#NoLang" : null,
             }
             .WithCustomScrubbers(
                 ScrubbersDefinition.Empty
@@ -400,9 +400,9 @@ public async void TopLevelProgramSupport_WhenFlagIsEnabled_NoFileScopedNamespace
                 TemplateSpecificArgs = args,
                 ExpectationsDirectory = "Approvals",
                 SettingsDirectory = _fixture.HomeDirectory,
-                // DoNotPrependTemplateToScenarioName = true,
-                DoNotAppendParamsToScenarioName = true,
-                DoNotPrependTemplateToScenarioName = true,
+                // DoNotPrependTemplateNameToScenarioName = true,
+                DoNotAppendTemplateArgsToScenarioName = true,
+                DoNotPrependTemplateNameToScenarioName = true,
             }
             .WithCustomScrubbers(
                 ScrubbersDefinition.Empty
@@ -519,9 +519,9 @@ public async void FeaturesSupport(
                 ExpectationsDirectory = "Approvals",
                 OutputDirectory = workingDir,
                 SettingsDirectory = _fixture.HomeDirectory,
-                DoNotPrependTemplateToScenarioName = false,
-                DoNotAppendParamsToScenarioName = true,
-                ScenarioDistinguisher = !buildPass ?
+                DoNotPrependTemplateNameToScenarioName = false,
+                DoNotAppendTemplateArgsToScenarioName = true,
+                ScenarioName = !buildPass ?
                     "OutOfSupport" :
                     $"Nullable-{supportsNullable}#TopLevel-{supportsTopLevel}#ImplicitUsings-{supportsImplicitUsings}#FileScopedNs-{supportsFileScopedNs}" + (langVersion == null ? "#NoLang" : null),
                 VerificationExcludePatterns = buildPass ? null : new[] { "*" },