From 0d56af9701c1aa6249e3c78f381f001ec9512440 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Fri, 18 Jul 2025 15:45:19 +0200 Subject: [PATCH 1/3] Changes in embedded dirs should also trigger the job. --- .azure/pipelines/template-tests-pr.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure/pipelines/template-tests-pr.yml b/.azure/pipelines/template-tests-pr.yml index 612a7589c99b..3df7568b5395 100644 --- a/.azure/pipelines/template-tests-pr.yml +++ b/.azure/pipelines/template-tests-pr.yml @@ -16,9 +16,9 @@ pr: - release/* paths: include: - - src/ProjectTemplates/* - - src/Components/* - - src/Mvc/* + - src/ProjectTemplates/** + - src/Components/** + - src/Mvc/** variables: - name: _UseHelixOpenQueues From 4a56f6aa6d1060fc11ba9ef24fec6e7336bb7d6e Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Fri, 18 Jul 2025 15:59:09 +0200 Subject: [PATCH 2/3] Tmp change, to test if double wildcard is working. --- .../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); From 069d8cbfa212aabf6e429a1576d4c6f7f986897e Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Fri, 18 Jul 2025 16:02:27 +0200 Subject: [PATCH 3/3] Remove the tmp change. --- .../test/Templates.Tests/BaselineTest.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs b/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs index 55a1bc3e091b..3ae78e157ed8 100644 --- a/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs +++ b/src/ProjectTemplates/test/Templates.Tests/BaselineTest.cs @@ -88,15 +88,7 @@ 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 (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)) + if (IsIgnoredPath(relativePath)) { continue; } @@ -118,6 +110,12 @@ 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);