From 21075362d44120b35d0d4ea248a9e8492a9adf68 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 7 Jul 2025 16:27:27 +0000 Subject: [PATCH 1/5] Initial plan From 5a9a2a7150eed3845c0d4fe4c3ec365aaf423ce7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 7 Jul 2025 16:58:01 +0000 Subject: [PATCH 2/5] Add AllSubsets option for comprehensive restore/build operations Co-authored-by: jtschuster <36744439+jtschuster@users.noreply.github.com> --- eng/Subsets.props | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/eng/Subsets.props b/eng/Subsets.props index c0d6664a1fc7d4..4f14aa799249a3 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -153,9 +153,23 @@ $(BootstrapSubsets)+clr.nativeaotlibs+clr.nativeaotruntime+libs.native true + + + clr+mono+libs+tools+host+packs + $(AllSubsetsExpansion)+clr.nativeprereqs+clr.iltools+clr.runtime+clr.native+clr.aot+clr.nativeaotlibs+clr.nativeaotruntime+clr.crossarchtools + $(AllSubsetsExpansion)+clr.paltests+clr.paltestlist+clr.hosts+clr.jit+clr.alljits+clr.alljitscommunity+clr.spmi+clr.corelib+clr.nativecorelib+clr.tools+clr.toolstests+clr.packages + $(AllSubsetsExpansion)+linuxdac+alpinedac + $(AllSubsetsExpansion)+crossdacpack + $(AllSubsetsExpansion)+mono.runtime+mono.emsdk+mono.aotcross+mono.corelib+mono.manifests+mono.packages+mono.tools+mono.wasmruntime+mono.wasiruntime+mono.wasmworkload+mono.mscordbi+mono.workloads + $(AllSubsetsExpansion)+tools.illink+tools.cdac+tools.illinktests+tools.cdactests + $(AllSubsetsExpansion)+host.native+host.pkg+host.tools+host.pretest+host.tests + $(AllSubsetsExpansion)+libs.native+libs.sfx+libs.oob+libs.pretest+libs.tests + $(AllSubsetsExpansion)+packs.product+packs.installers+packs.tests + $(AllSubsetsExpansion)+regeneratedownloadtable+regeneratethirdpartynotices+tasks+bootstrap + <_subset>$(_subset.Replace('+allsubsets+', '+$(AllSubsetsExpansion)+')) <_subset>$(_subset.Replace('+clr.paltests+', '+clr.paltests+clr.paltestlist+')) <_subset>$(_subset.Replace('+clr+', '+$(DefaultCoreClrSubsets)+')) <_subset>$(_subset.Replace('+clr.aot+', '+$(DefaultNativeAotSubsets)+')) @@ -264,6 +278,9 @@ + + + From 9cbb4f34994c507b66937fa4b2aa9dd044707ba6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 7 Jul 2025 18:16:10 +0000 Subject: [PATCH 3/5] Move AllSubsets replacement logic and use internal property Co-authored-by: jtschuster <36744439+jtschuster@users.noreply.github.com> --- eng/Subsets.props | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 4f14aa799249a3..6ebdc764720f3a 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -153,23 +153,9 @@ $(BootstrapSubsets)+clr.nativeaotlibs+clr.nativeaotruntime+libs.native true - - - clr+mono+libs+tools+host+packs - $(AllSubsetsExpansion)+clr.nativeprereqs+clr.iltools+clr.runtime+clr.native+clr.aot+clr.nativeaotlibs+clr.nativeaotruntime+clr.crossarchtools - $(AllSubsetsExpansion)+clr.paltests+clr.paltestlist+clr.hosts+clr.jit+clr.alljits+clr.alljitscommunity+clr.spmi+clr.corelib+clr.nativecorelib+clr.tools+clr.toolstests+clr.packages - $(AllSubsetsExpansion)+linuxdac+alpinedac - $(AllSubsetsExpansion)+crossdacpack - $(AllSubsetsExpansion)+mono.runtime+mono.emsdk+mono.aotcross+mono.corelib+mono.manifests+mono.packages+mono.tools+mono.wasmruntime+mono.wasiruntime+mono.wasmworkload+mono.mscordbi+mono.workloads - $(AllSubsetsExpansion)+tools.illink+tools.cdac+tools.illinktests+tools.cdactests - $(AllSubsetsExpansion)+host.native+host.pkg+host.tools+host.pretest+host.tests - $(AllSubsetsExpansion)+libs.native+libs.sfx+libs.oob+libs.pretest+libs.tests - $(AllSubsetsExpansion)+packs.product+packs.installers+packs.tests - $(AllSubsetsExpansion)+regeneratedownloadtable+regeneratethirdpartynotices+tasks+bootstrap - <_subset>$(_subset.Replace('+allsubsets+', '+$(AllSubsetsExpansion)+')) <_subset>$(_subset.Replace('+clr.paltests+', '+clr.paltests+clr.paltestlist+')) <_subset>$(_subset.Replace('+clr+', '+$(DefaultCoreClrSubsets)+')) <_subset>$(_subset.Replace('+clr.aot+', '+$(DefaultNativeAotSubsets)+')) @@ -283,6 +269,22 @@ + + + + + <_AllSubsetsExpansion>clr+clr.nativeprereqs+clr.iltools+clr.runtime+clr.native+clr.aot+clr.nativeaotlibs+clr.nativeaotruntime+clr.crossarchtools+clr.paltests+clr.paltestlist+clr.hosts+clr.jit+clr.alljits+clr.alljitscommunity+clr.spmi+clr.corelib+clr.nativecorelib+clr.tools+clr.toolstests+clr.packages + <_AllSubsetsExpansion Condition="$([MSBuild]::IsOsPlatform(Windows))">$(_AllSubsetsExpansion)+linuxdac+alpinedac + <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+crossdacpack + <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+mono+mono.runtime+mono.emsdk+mono.aotcross+mono.corelib+mono.manifests+mono.packages+mono.tools+mono.wasmruntime+mono.wasiruntime+mono.wasmworkload+mono.mscordbi+mono.workloads + <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+tools+tools.illink+tools.cdac+tools.illinktests+tools.cdactests + <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+host+host.native+host.pkg+host.tools+host.pretest+host.tests + <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+libs+libs.native+libs.sfx+libs.oob+libs.pretest+libs.tests + <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+packs+packs.product+packs.installers+packs.tests + <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+regeneratedownloadtable+regeneratethirdpartynotices+tasks+bootstrap + <_subset>$(_subset.Replace('+allsubsets+', '+$(_AllSubsetsExpansion)+')) + + From f6f8f2880d997e9c99ded078395203e230282b78 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 7 Jul 2025 19:25:11 +0000 Subject: [PATCH 4/5] Revert AllSubsets implementation to original state from 5a9a2a7 Co-authored-by: jtschuster <36744439+jtschuster@users.noreply.github.com> --- eng/Subsets.props | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 6ebdc764720f3a..4f14aa799249a3 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -153,9 +153,23 @@ $(BootstrapSubsets)+clr.nativeaotlibs+clr.nativeaotruntime+libs.native true + + + clr+mono+libs+tools+host+packs + $(AllSubsetsExpansion)+clr.nativeprereqs+clr.iltools+clr.runtime+clr.native+clr.aot+clr.nativeaotlibs+clr.nativeaotruntime+clr.crossarchtools + $(AllSubsetsExpansion)+clr.paltests+clr.paltestlist+clr.hosts+clr.jit+clr.alljits+clr.alljitscommunity+clr.spmi+clr.corelib+clr.nativecorelib+clr.tools+clr.toolstests+clr.packages + $(AllSubsetsExpansion)+linuxdac+alpinedac + $(AllSubsetsExpansion)+crossdacpack + $(AllSubsetsExpansion)+mono.runtime+mono.emsdk+mono.aotcross+mono.corelib+mono.manifests+mono.packages+mono.tools+mono.wasmruntime+mono.wasiruntime+mono.wasmworkload+mono.mscordbi+mono.workloads + $(AllSubsetsExpansion)+tools.illink+tools.cdac+tools.illinktests+tools.cdactests + $(AllSubsetsExpansion)+host.native+host.pkg+host.tools+host.pretest+host.tests + $(AllSubsetsExpansion)+libs.native+libs.sfx+libs.oob+libs.pretest+libs.tests + $(AllSubsetsExpansion)+packs.product+packs.installers+packs.tests + $(AllSubsetsExpansion)+regeneratedownloadtable+regeneratethirdpartynotices+tasks+bootstrap + <_subset>$(_subset.Replace('+allsubsets+', '+$(AllSubsetsExpansion)+')) <_subset>$(_subset.Replace('+clr.paltests+', '+clr.paltests+clr.paltestlist+')) <_subset>$(_subset.Replace('+clr+', '+$(DefaultCoreClrSubsets)+')) <_subset>$(_subset.Replace('+clr.aot+', '+$(DefaultNativeAotSubsets)+')) @@ -269,22 +283,6 @@ - - - - - <_AllSubsetsExpansion>clr+clr.nativeprereqs+clr.iltools+clr.runtime+clr.native+clr.aot+clr.nativeaotlibs+clr.nativeaotruntime+clr.crossarchtools+clr.paltests+clr.paltestlist+clr.hosts+clr.jit+clr.alljits+clr.alljitscommunity+clr.spmi+clr.corelib+clr.nativecorelib+clr.tools+clr.toolstests+clr.packages - <_AllSubsetsExpansion Condition="$([MSBuild]::IsOsPlatform(Windows))">$(_AllSubsetsExpansion)+linuxdac+alpinedac - <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+crossdacpack - <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+mono+mono.runtime+mono.emsdk+mono.aotcross+mono.corelib+mono.manifests+mono.packages+mono.tools+mono.wasmruntime+mono.wasiruntime+mono.wasmworkload+mono.mscordbi+mono.workloads - <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+tools+tools.illink+tools.cdac+tools.illinktests+tools.cdactests - <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+host+host.native+host.pkg+host.tools+host.pretest+host.tests - <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+libs+libs.native+libs.sfx+libs.oob+libs.pretest+libs.tests - <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+packs+packs.product+packs.installers+packs.tests - <_AllSubsetsExpansion>$(_AllSubsetsExpansion)+regeneratedownloadtable+regeneratethirdpartynotices+tasks+bootstrap - <_subset>$(_subset.Replace('+allsubsets+', '+$(_AllSubsetsExpansion)+')) - - From 7fc40e4e3261288dd8283cd4674418d0788a2e67 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 8 Jul 2025 18:53:06 +0000 Subject: [PATCH 5/5] Remove meta-subsets, crossdacpack, and bootstrap from AllSubsets Co-authored-by: jkoritzinsky <1571408+jkoritzinsky@users.noreply.github.com> --- eng/Subsets.props | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index 4f14aa799249a3..8a212549649b7c 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -155,17 +155,15 @@ true - clr+mono+libs+tools+host+packs - $(AllSubsetsExpansion)+clr.nativeprereqs+clr.iltools+clr.runtime+clr.native+clr.aot+clr.nativeaotlibs+clr.nativeaotruntime+clr.crossarchtools + clr.nativeprereqs+clr.iltools+clr.runtime+clr.native+clr.aot+clr.nativeaotlibs+clr.nativeaotruntime+clr.crossarchtools $(AllSubsetsExpansion)+clr.paltests+clr.paltestlist+clr.hosts+clr.jit+clr.alljits+clr.alljitscommunity+clr.spmi+clr.corelib+clr.nativecorelib+clr.tools+clr.toolstests+clr.packages $(AllSubsetsExpansion)+linuxdac+alpinedac - $(AllSubsetsExpansion)+crossdacpack $(AllSubsetsExpansion)+mono.runtime+mono.emsdk+mono.aotcross+mono.corelib+mono.manifests+mono.packages+mono.tools+mono.wasmruntime+mono.wasiruntime+mono.wasmworkload+mono.mscordbi+mono.workloads $(AllSubsetsExpansion)+tools.illink+tools.cdac+tools.illinktests+tools.cdactests $(AllSubsetsExpansion)+host.native+host.pkg+host.tools+host.pretest+host.tests $(AllSubsetsExpansion)+libs.native+libs.sfx+libs.oob+libs.pretest+libs.tests $(AllSubsetsExpansion)+packs.product+packs.installers+packs.tests - $(AllSubsetsExpansion)+regeneratedownloadtable+regeneratethirdpartynotices+tasks+bootstrap + $(AllSubsetsExpansion)+regeneratedownloadtable+regeneratethirdpartynotices+tasks