From c4a4044a2b89ed60119ac04872f92311a17d071b Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz <32700855+ilonatommy@users.noreply.github.com> Date: Fri, 18 Jul 2025 13:48:58 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"Baseline=20tests=20should=20check=20f?= =?UTF-8?q?or=20all=20possible=20extensions=20of=20not=20expect=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8bb2b2067815996d9a8224ee38aa80a79f797827. --- .../test/Templates.Tests/BaselineTest.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs b/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs index 3ae78e157ed8..55a1bc3e091b 100644 --- a/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs +++ b/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs @@ -88,7 +88,15 @@ public async Task Template_Produces_The_Right_Set_Of_FilesAsync(string arguments foreach (var file in filesInFolder) { var relativePath = file.Replace(Project.TemplateOutputDir, "").Replace("\\", "/").Trim('/'); - if (IsIgnoredPath(relativePath)) + if (relativePath.EndsWith(".csproj", StringComparison.Ordinal) || + relativePath.EndsWith(".fsproj", StringComparison.Ordinal) || + relativePath.EndsWith(".props", StringComparison.Ordinal) || + relativePath.EndsWith(".sln", StringComparison.Ordinal) || + relativePath.EndsWith(".targets", StringComparison.Ordinal) || + relativePath.StartsWith("bin/", StringComparison.Ordinal) || + relativePath.StartsWith("obj/", StringComparison.Ordinal) || + relativePath.Contains("/bin/", StringComparison.Ordinal) || + relativePath.Contains("/obj/", StringComparison.Ordinal)) { continue; } @@ -110,12 +118,6 @@ public async Task Template_Produces_The_Right_Set_Of_FilesAsync(string arguments } } - private static bool IsIgnoredPath(string relativePath) => - relativePath.StartsWith("bin/", StringComparison.Ordinal) || - relativePath.StartsWith("obj/", StringComparison.Ordinal) || - relativePath.Contains("/bin/", StringComparison.Ordinal) || - relativePath.Contains("/obj/", StringComparison.Ordinal); - private void AssertFileExists(string basePath, string path, bool shouldExist) { var fullPath = Path.Combine(basePath, path);