workaround for dotnet#4988

vlada-shubina · Jul 26, 2022 · 61badd8 · 61badd8
1 parent 3d98fbb
commit 61badd8
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 3 deletions.
diff --git a/...icrosoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.dockerignore b/...icrosoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.dockerignore
@@ -6,3 +6,4 @@ foo
 ## comment bar
 #bar
 #endif
+baz
diff --git a/...icrosoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.editorconfig b/...icrosoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.editorconfig
@@ -6,3 +6,4 @@ foo
 ## comment bar
 #bar
 #endif
+baz
diff --git a/...crosoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.gitattributes b/...crosoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.gitattributes
@@ -6,3 +6,4 @@ foo
 ## comment bar
 #bar
 #endif
+baz
diff --git a/test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.gitignore b/test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/.gitignore
@@ -6,3 +6,4 @@ foo
 ## comment bar
 #bar
 #endif
+baz
diff --git a/test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/Dockerfile b/test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/Dockerfile
@@ -6,3 +6,4 @@ foo
 ## comment bar
 #bar
 #endif
+baz
diff --git a/...Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/nuget.config b/...Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/nuget.config
@@ -6,3 +6,4 @@ foo
 <!-- comment bar -- >
 bar
 #endif -->
+baz
diff --git a/test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.cake b/test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.cake
@@ -6,3 +6,4 @@ foo
 // comment bar
 bar
 #endif
+baz
diff --git a/...soft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.md b/...soft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.md
@@ -6,3 +6,4 @@ foo
 <!-- comment bar -- >
 bar
 #endif -->
+baz
diff --git a/test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.sln b/test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.sln
@@ -6,3 +6,4 @@ foo
 ## comment bar
 #bar
 #endif
+baz
diff --git a/test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.yaml b/test/Microsoft.TemplateEngine.TestTemplates/test_templates/TemplateWithConditions/test.yaml
@@ -6,3 +6,4 @@ foo
 ## comment bar
 #bar
 #endif
+baz
diff --git a/test/dotnet-new3.UnitTests/DotnetNewInstantiate.cs b/test/dotnet-new3.UnitTests/DotnetNewInstantiate.cs
@@ -274,6 +274,7 @@ public void CanInstantiateTemplate_WithConditions_BasedOnFileName(string testCas
             //## comment bar
             //#bar
             //#endif
+            //baz
             //For extension test cases the template has 'test.<extension>' file defined.
 
             Helpers.InstallTestTemplate("TemplateWithConditions", _log, home, workingDirectory);
@@ -288,7 +289,7 @@ public void CanInstantiateTemplate_WithConditions_BasedOnFileName(string testCas
 
             string testFile = Path.Combine(workingDirectory, fileName);
             Assert.True(File.Exists(testFile));
-            Assert.Equal($"{string.Format(expectedCommandFormat, "foo")}{expectedEol}foo{expectedEol}", File.ReadAllText(testFile));
+            Assert.Equal($"{string.Format(expectedCommandFormat, "foo")}{expectedEol}foo{expectedEol}baz{expectedEol}", File.ReadAllText(testFile));
 
             workingDirectory = TestUtils.CreateTemporaryFolder();
             new DotnetNewCommand(_log, "TestAssets.TemplateWithConditions", "--A", "false")
@@ -302,7 +303,7 @@ public void CanInstantiateTemplate_WithConditions_BasedOnFileName(string testCas
 
             testFile = Path.Combine(workingDirectory, fileName);
             Assert.True(File.Exists(testFile));
-            Assert.Equal($"", File.ReadAllText(testFile));
+            Assert.Equal($"baz{expectedEol}", File.ReadAllText(testFile));
 
             workingDirectory = TestUtils.CreateTemporaryFolder();
             new DotnetNewCommand(_log, "TestAssets.TemplateWithConditions", "--B", "true")
@@ -316,7 +317,7 @@ public void CanInstantiateTemplate_WithConditions_BasedOnFileName(string testCas
 
             testFile = Path.Combine(workingDirectory, fileName);
             Assert.True(File.Exists(testFile));
-            Assert.Equal($"{string.Format(expectedCommandFormat, "bar")}{expectedEol}bar{expectedEol}", File.ReadAllText(testFile));
+            Assert.Equal($"{string.Format(expectedCommandFormat, "bar")}{expectedEol}bar{expectedEol}baz{expectedEol}", File.ReadAllText(testFile));
         }
 
         [Fact]