From 9b4b1209c8b507060dd3046c7201cf3164b9b4b6 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Wed, 30 Jul 2025 12:06:14 +0200 Subject: [PATCH 1/5] Restore re-execution middleware in templates. --- .../content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs | 1 + .../content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs | 2 +- src/submodules/googletest | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs index be71c6ad04dd..1b8771773c04 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.Main.cs @@ -107,6 +107,7 @@ public static void Main(string[] args) #endif } + app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true); #if (HasHttpsProfile) app.UseHttpsRedirection(); diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs index c325a1f788a6..ae3fb9dcfce7 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWebCSharp.1/Program.cs @@ -100,7 +100,7 @@ app.UseHsts(); #endif } - +app.UseStatusCodePagesWithReExecute("/not-found", createScopeForStatusCodePages: true); #if (HasHttpsProfile) app.UseHttpsRedirection(); diff --git a/src/submodules/googletest b/src/submodules/googletest index 32f9f4c82afa..3983f67e32fb 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 32f9f4c82afa4249af66b55278df15c16b3031ea +Subproject commit 3983f67e32fb3e9294487b9d4f9586efa6e5d088 From f0179f05ebd57f23194e529343db898dfaed615a Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Wed, 6 Aug 2025 11:16:25 +0200 Subject: [PATCH 2/5] Checkout file to main --- src/submodules/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/googletest b/src/submodules/googletest index 3983f67e32fb..373af2e3df71 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 3983f67e32fb3e9294487b9d4f9586efa6e5d088 +Subproject commit 373af2e3df71599b87a40ce0e37164523849166b From 7c891e9251d7c20a49c98662841cf508c4e24b91 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Wed, 6 Aug 2025 11:21:21 +0200 Subject: [PATCH 3/5] Disable the job. --- .azure/pipelines/ci-public.yml | 73 +++++++++++++++++----------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index 7cf5ea808e5a..bd45fd60c992 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -628,43 +628,44 @@ stages: publishOnError: true includeForks: true + # active issue: https://github.com/dotnet/aspnetcore/issues/63140 # Local development validation - - template: jobs/default-build.yml - parameters: - jobName: Local_Windows - jobDisplayName: 'Test: Windows local development validation' - agentOs: Windows - isAzDOTestingJob: true - timeoutInMinutes: 240 - steps: - - script: git submodule update --init - displayName: Update submodules - - script: ./restore.cmd - displayName: Run restore.cmd - - powershell: ./eng/build.ps1 -all -noBuildJava -noBuildNodeJS "-WarnAsError:false" - displayName: Build (No NodeJS) - - script: npm run build - displayName: Build JS - - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug - displayName: Build (Debug) - - script: ./eng/build.cmd -all -noBuildJava -pack -c Release - displayName: Build (Release) - - script: ./src/ProjectTemplates/build.cmd - -test - -NoRestore - -NoBuild - -NoBuildDeps - -configuration Release - -bl - displayName: Run project template tests - - powershell: . ./activate.ps1; ./src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 -Verbose - displayName: Run Blazor web app test script - - artifacts: - - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt) - path: artifacts/log/ - publishOnError: true - includeForks: true + # - template: jobs/default-build.yml + # parameters: + # jobName: Local_Windows + # jobDisplayName: 'Test: Windows local development validation' + # agentOs: Windows + # isAzDOTestingJob: true + # timeoutInMinutes: 240 + # steps: + # - script: git submodule update --init + # displayName: Update submodules + # - script: ./restore.cmd + # displayName: Run restore.cmd + # - powershell: ./eng/build.ps1 -all -noBuildJava -noBuildNodeJS "-WarnAsError:false" + # displayName: Build (No NodeJS) + # - script: npm run build + # displayName: Build JS + # - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug + # displayName: Build (Debug) + # - script: ./eng/build.cmd -all -noBuildJava -pack -c Release + # displayName: Build (Release) + # - script: ./src/ProjectTemplates/build.cmd + # -test + # -NoRestore + # -NoBuild + # -NoBuildDeps + # -configuration Release + # -bl + # displayName: Run project template tests + # - powershell: . ./activate.ps1; ./src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 -Verbose + # displayName: Run Blazor web app test script + + # artifacts: + # - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt) + # path: artifacts/log/ + # publishOnError: true + # includeForks: true # Source build - template: /eng/common/templates/job/source-build.yml From 7fb4934bf5cfe68589b89979a05c5d62a4b90fd0 Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Wed, 6 Aug 2025 11:29:19 +0200 Subject: [PATCH 4/5] Feedback: neater disabling than just commenting out. --- .azure/pipelines/ci-public.yml | 75 +++++++++++++++++----------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index bd45fd60c992..ac7f5a8cade5 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -628,44 +628,45 @@ stages: publishOnError: true includeForks: true - # active issue: https://github.com/dotnet/aspnetcore/issues/63140 # Local development validation - # - template: jobs/default-build.yml - # parameters: - # jobName: Local_Windows - # jobDisplayName: 'Test: Windows local development validation' - # agentOs: Windows - # isAzDOTestingJob: true - # timeoutInMinutes: 240 - # steps: - # - script: git submodule update --init - # displayName: Update submodules - # - script: ./restore.cmd - # displayName: Run restore.cmd - # - powershell: ./eng/build.ps1 -all -noBuildJava -noBuildNodeJS "-WarnAsError:false" - # displayName: Build (No NodeJS) - # - script: npm run build - # displayName: Build JS - # - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug - # displayName: Build (Debug) - # - script: ./eng/build.cmd -all -noBuildJava -pack -c Release - # displayName: Build (Release) - # - script: ./src/ProjectTemplates/build.cmd - # -test - # -NoRestore - # -NoBuild - # -NoBuildDeps - # -configuration Release - # -bl - # displayName: Run project template tests - # - powershell: . ./activate.ps1; ./src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 -Verbose - # displayName: Run Blazor web app test script - - # artifacts: - # - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt) - # path: artifacts/log/ - # publishOnError: true - # includeForks: true + - template: jobs/default-build.yml + parameters: + jobName: Local_Windows + jobDisplayName: 'Test: Windows local development validation' + agentOs: Windows + isAzDOTestingJob: true + timeoutInMinutes: 240 + # Temporarily disabled due to https://github.com/dotnet/aspnetcore/issues/63140 + condition: false + steps: + - script: git submodule update --init + displayName: Update submodules + - script: ./restore.cmd + displayName: Run restore.cmd + - powershell: ./eng/build.ps1 -all -noBuildJava -noBuildNodeJS "-WarnAsError:false" + displayName: Build (No NodeJS) + - script: npm run build + displayName: Build JS + - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug + displayName: Build (Debug) + - script: ./eng/build.cmd -all -noBuildJava -pack -c Release + displayName: Build (Release) + - script: ./src/ProjectTemplates/build.cmd + -test + -NoRestore + -NoBuild + -NoBuildDeps + -configuration Release + -bl + displayName: Run project template tests + - powershell: . ./activate.ps1; ./src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 -Verbose + displayName: Run Blazor web app test script + + artifacts: + - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt) + path: artifacts/log/ + publishOnError: true + includeForks: true # Source build - template: /eng/common/templates/job/source-build.yml From 54a77b4271de357a8d7f4172ac8d850641dfc76a Mon Sep 17 00:00:00 2001 From: Ilona Tomkowicz Date: Wed, 6 Aug 2025 13:25:01 +0200 Subject: [PATCH 5/5] Condition should be a string. --- .azure/pipelines/ci-public.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index ac7f5a8cade5..e0d7b2fae27e 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -637,7 +637,7 @@ stages: isAzDOTestingJob: true timeoutInMinutes: 240 # Temporarily disabled due to https://github.com/dotnet/aspnetcore/issues/63140 - condition: false + condition: 'false' steps: - script: git submodule update --init displayName: Update submodules