From 2cc02c8a1df88c4b36d2898b44e277d99a886947 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 2 Jul 2025 09:16:06 -0700 Subject: [PATCH 1/3] Restore Gradle dependencies to in-repo cache in CI --- .azure/pipelines/ci-public.yml | 2 ++ .azure/pipelines/ci.yml | 2 ++ .gitignore | 1 + 3 files changed, 5 insertions(+) diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index 00ef92c8c00b..f075662ae69d 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.azure/pipelines/ci-public.yml @@ -47,6 +47,8 @@ parameters: variables: - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE value: true +- name: GRADLE_USER_HOME + value: $(Build.SourcesDirectory)/.gradle - name: _TeamName value: AspNetCore - name: _PublishUsingPipelines diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 8ce211f0a907..b1dfbc20d544 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -31,6 +31,8 @@ parameters: variables: - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE value: true +- name: GRADLE_USER_HOME + value: $(Build.SourcesDirectory)/.gradle - name: _TeamName value: AspNetCore - name: _PublishUsingPipelines diff --git a/.gitignore b/.gitignore index 29f59c3a3e70..c6e8ed911f76 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ artifacts/ bin/ obj/ .dotnet/ +.gradle/ .nuget/ .packages/ .tools/ From f4c468c64eea8834a375e9298bffcad1fa18b230 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 2 Jul 2025 11:22:09 -0700 Subject: [PATCH 2/3] Use regular non-preview queue --- .azure/pipelines/jobs/default-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 0283be806cf1..23a0a0079bdf 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -112,7 +112,7 @@ jobs: demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(parameters.agentOs, 'Windows') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022preview.amd64.open + demands: ImageOverride -equals windows.vs2022.amd64.open ${{ if ne(parameters.container, '') }}: container: ${{ parameters.container }} ${{ if ne(parameters.disableComponentGovernance, '') }}: @@ -328,7 +328,7 @@ jobs: ${{ if eq(parameters.agentOs, 'Windows') }}: name: $(DncEngInternalBuildPool) # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing - image: windows.vs2022preview.amd64 + image: windows.vs2022.amd64 os: windows ${{ if ne(parameters.container, '') }}: container: ${{ parameters.container }} From 78160401e5c9476dc32cc5e27eb8109f277fc124 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 2 Jul 2025 14:29:23 -0700 Subject: [PATCH 3/3] Revert "Use regular non-preview queue" This reverts commit f4c468c64eea8834a375e9298bffcad1fa18b230. --- .azure/pipelines/jobs/default-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 23a0a0079bdf..0283be806cf1 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -112,7 +112,7 @@ jobs: demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open ${{ if eq(parameters.agentOs, 'Windows') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64.open + demands: ImageOverride -equals windows.vs2022preview.amd64.open ${{ if ne(parameters.container, '') }}: container: ${{ parameters.container }} ${{ if ne(parameters.disableComponentGovernance, '') }}: @@ -328,7 +328,7 @@ jobs: ${{ if eq(parameters.agentOs, 'Windows') }}: name: $(DncEngInternalBuildPool) # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing - image: windows.vs2022.amd64 + image: windows.vs2022preview.amd64 os: windows ${{ if ne(parameters.container, '') }}: container: ${{ parameters.container }}