From e41b8aec8147b272405d70cbcae35fc21442b704 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 24 Oct 2025 18:14:38 +0000 Subject: [PATCH 01/10] Initial plan From b3446e8eb65c6a923b93d120f1f156c873f4f1ae Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 24 Oct 2025 18:27:29 +0000 Subject: [PATCH 02/10] Extract common PackageReferences for MSBuild tasks into SDKDeliveredMSBuildTask.props Co-authored-by: rainersigwald <3347530+rainersigwald@users.noreply.github.com> --- eng/SDKDeliveredMSBuildTask.props | 21 +++++++++++++++++++ .../Microsoft.NET.Sdk.Razor.Tasks.csproj | 2 +- ...osoft.NET.Sdk.StaticWebAssets.Tasks.csproj | 2 +- .../Microsoft.NET.Build.Tasks.csproj | 11 +--------- src/Tasks/sdk-tasks/sdk-tasks.csproj | 5 ++--- 5 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 eng/SDKDeliveredMSBuildTask.props diff --git a/eng/SDKDeliveredMSBuildTask.props b/eng/SDKDeliveredMSBuildTask.props new file mode 100644 index 000000000000..48c3b2b14434 --- /dev/null +++ b/eng/SDKDeliveredMSBuildTask.props @@ -0,0 +1,21 @@ + + + + + + + + + + + + diff --git a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj index dad52815e5d4..6fdbc0d857ed 100644 --- a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj +++ b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj @@ -10,6 +10,7 @@ + Library @@ -45,7 +46,6 @@ - diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj index 3e34d3e2a29f..ce46a67f450f 100644 --- a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -11,6 +11,7 @@ + $(SdkTargetFramework);net472 @@ -47,7 +48,6 @@ - diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index d32804d3ee51..deb53382a293 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -7,6 +7,7 @@ + The MSBuild targets and properties for building .NET Core projects. @@ -73,16 +74,6 @@ - - - - - diff --git a/src/Tasks/sdk-tasks/sdk-tasks.csproj b/src/Tasks/sdk-tasks/sdk-tasks.csproj index e8bee1a42275..21ca0c1e0e1c 100644 --- a/src/Tasks/sdk-tasks/sdk-tasks.csproj +++ b/src/Tasks/sdk-tasks/sdk-tasks.csproj @@ -6,6 +6,8 @@ true + + @@ -22,9 +24,6 @@ - - - From f4d9a77e75ac413e2cc94076728940886767d126 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 24 Oct 2025 18:48:40 +0000 Subject: [PATCH 03/10] Include all *ToolsetPackageVersion references in SDKDeliveredMSBuildTask.props Co-authored-by: rainersigwald <3347530+rainersigwald@users.noreply.github.com> --- eng/SDKDeliveredMSBuildTask.props | 3 +++ src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj | 4 ---- .../Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj | 5 ----- src/Tasks/sdk-tasks/sdk-tasks.csproj | 1 - 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/eng/SDKDeliveredMSBuildTask.props b/eng/SDKDeliveredMSBuildTask.props index 48c3b2b14434..78e662ed89c3 100644 --- a/eng/SDKDeliveredMSBuildTask.props +++ b/eng/SDKDeliveredMSBuildTask.props @@ -14,8 +14,11 @@ + + + diff --git a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj index 6fdbc0d857ed..4dba8aec7f99 100644 --- a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj +++ b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj @@ -45,10 +45,6 @@ - - - - true diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj index ce46a67f450f..d35e6449b93c 100644 --- a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -47,11 +47,6 @@ - - - - - diff --git a/src/Tasks/sdk-tasks/sdk-tasks.csproj b/src/Tasks/sdk-tasks/sdk-tasks.csproj index 21ca0c1e0e1c..36e7ab8b7873 100644 --- a/src/Tasks/sdk-tasks/sdk-tasks.csproj +++ b/src/Tasks/sdk-tasks/sdk-tasks.csproj @@ -24,7 +24,6 @@ - From 9c9db97afd954d42f4b273dc14e579ae41a99bb5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 24 Oct 2025 19:30:18 +0000 Subject: [PATCH 04/10] Extract common MSBuild package references to shared props file Co-authored-by: rainersigwald <3347530+rainersigwald@users.noreply.github.com> --- eng/SDKDeliveredMSBuildTask.props | 5 +++++ src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj | 2 -- .../Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj | 2 -- .../Microsoft.NET.Build.Tasks.csproj | 3 --- src/Tasks/sdk-tasks/sdk-tasks.csproj | 1 - 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/eng/SDKDeliveredMSBuildTask.props b/eng/SDKDeliveredMSBuildTask.props index 78e662ed89c3..5c074cbea213 100644 --- a/eng/SDKDeliveredMSBuildTask.props +++ b/eng/SDKDeliveredMSBuildTask.props @@ -12,6 +12,11 @@ https://github.com/dotnet/msbuild/blob/main/src/MSBuild/app.config --> + + + + + diff --git a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj index 4dba8aec7f99..b6dcbc8c48b6 100644 --- a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj +++ b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj @@ -40,8 +40,6 @@ - - diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj index d35e6449b93c..517532c5a2df 100644 --- a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -36,8 +36,6 @@ - - diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index deb53382a293..b5ff33bc9708 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -52,8 +52,6 @@ - - @@ -72,7 +70,6 @@ - diff --git a/src/Tasks/sdk-tasks/sdk-tasks.csproj b/src/Tasks/sdk-tasks/sdk-tasks.csproj index 36e7ab8b7873..4cf492d49cec 100644 --- a/src/Tasks/sdk-tasks/sdk-tasks.csproj +++ b/src/Tasks/sdk-tasks/sdk-tasks.csproj @@ -16,7 +16,6 @@ - From eb199989393797ea7ec2118aaf592379dad6a9f6 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 24 Oct 2025 15:04:46 -0500 Subject: [PATCH 05/10] Pull more packages to a common location --- eng/SDKDeliveredMSBuildTask.props | 5 +++-- .../Microsoft.NET.Build.Tasks.csproj | 1 - src/Tasks/sdk-tasks/sdk-tasks.csproj | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/eng/SDKDeliveredMSBuildTask.props b/eng/SDKDeliveredMSBuildTask.props index 5c074cbea213..09d1af71eaab 100644 --- a/eng/SDKDeliveredMSBuildTask.props +++ b/eng/SDKDeliveredMSBuildTask.props @@ -3,16 +3,17 @@ + diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index b5ff33bc9708..bf86281fa569 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -51,7 +51,6 @@ - diff --git a/src/Tasks/sdk-tasks/sdk-tasks.csproj b/src/Tasks/sdk-tasks/sdk-tasks.csproj index 4cf492d49cec..2a0cfd2c30d6 100644 --- a/src/Tasks/sdk-tasks/sdk-tasks.csproj +++ b/src/Tasks/sdk-tasks/sdk-tasks.csproj @@ -14,8 +14,6 @@ - - From 313f67fb090f06c5c7dd2a24f499a7d40ba83280 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 24 Oct 2025 15:28:59 -0500 Subject: [PATCH 06/10] Pull out some properties too --- eng/SDKDeliveredMSBuildTask.props | 15 +++++++++++++++ .../Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj | 6 ------ ...Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj | 5 ----- .../Microsoft.NET.Build.Tasks.csproj | 6 ------ src/Tasks/sdk-tasks/sdk-tasks.csproj | 4 +--- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/eng/SDKDeliveredMSBuildTask.props b/eng/SDKDeliveredMSBuildTask.props index 09d1af71eaab..8dcf08c47549 100644 --- a/eng/SDKDeliveredMSBuildTask.props +++ b/eng/SDKDeliveredMSBuildTask.props @@ -12,6 +12,21 @@ https://github.com/dotnet/msbuild/blob/main/src/MSBuild/app.config --> + + Library + $(SdkTargetFramework);net472 + + + true + + + false + + + false + + + diff --git a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj index b6dcbc8c48b6..0b6b2c9643e7 100644 --- a/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj +++ b/src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj @@ -13,18 +13,13 @@ - Library - false - false false true true false - - true $(BaseOutputPath) true @@ -36,7 +31,6 @@ SDK for building and publishing Razor applications. Library Microsoft.NET.Sdk.Razor - $(SdkTargetFramework);net472 diff --git a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj index 517532c5a2df..c33ecf791612 100644 --- a/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj +++ b/src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj @@ -14,20 +14,15 @@ - $(SdkTargetFramework);net472 - Library SDK for building and publishing applications containing static web assets. Microsoft.NET.Sdk.StaticWebAssets - false false true true false - - true $(BaseOutputPath) true diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index bf86281fa569..df647edbecde 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -18,7 +18,6 @@ true false - false false @@ -26,11 +25,6 @@ true true - - true - - - false diff --git a/src/Tasks/sdk-tasks/sdk-tasks.csproj b/src/Tasks/sdk-tasks/sdk-tasks.csproj index 2a0cfd2c30d6..fa2cf2ece084 100644 --- a/src/Tasks/sdk-tasks/sdk-tasks.csproj +++ b/src/Tasks/sdk-tasks/sdk-tasks.csproj @@ -1,13 +1,11 @@  + - $(SdkTargetFramework);net472 true true - - From 561abac8ac0c54184c52035da728373d77dc45a4 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 24 Oct 2025 15:34:44 -0500 Subject: [PATCH 07/10] Expand comment --- eng/SDKDeliveredMSBuildTask.props | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/eng/SDKDeliveredMSBuildTask.props b/eng/SDKDeliveredMSBuildTask.props index 8dcf08c47549..5b5ec1568844 100644 --- a/eng/SDKDeliveredMSBuildTask.props +++ b/eng/SDKDeliveredMSBuildTask.props @@ -1,16 +1,7 @@ - + Library @@ -26,13 +17,30 @@ false - + + + From 47ecad15abf605689d2baa475ae850164f82f413 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Fri, 24 Oct 2025 16:43:19 -0500 Subject: [PATCH 08/10] Provide deps for test --- test/sdk-tasks.Tests/sdk-tasks.Tests.csproj | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/sdk-tasks.Tests/sdk-tasks.Tests.csproj b/test/sdk-tasks.Tests/sdk-tasks.Tests.csproj index f2f61e6ca1f1..74bd01b8ba94 100644 --- a/test/sdk-tasks.Tests/sdk-tasks.Tests.csproj +++ b/test/sdk-tasks.Tests/sdk-tasks.Tests.csproj @@ -10,8 +10,14 @@ + + + - \ No newline at end of file + From 3259b3336276179785d5f188d206626594501a33 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Tue, 28 Oct 2025 10:48:01 -0500 Subject: [PATCH 09/10] Let STJ float for MS.NET.Build.Tasks Live dependency is needed for GenerateDepsFile so deps file outputs can be up to date. --- .../Microsoft.NET.Build.Tasks.csproj | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index df647edbecde..8af651fa079a 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -54,6 +54,13 @@ + + + From 3ee93ecb933e0e96cb51b2a962f72af72ad48fea Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Tue, 28 Oct 2025 10:48:40 -0500 Subject: [PATCH 10/10] Drop Bcl.AsyncInterfaces This is a transitive dependency of STJ on framework so it doesn't need to be directly referenced. --- .../Microsoft.NET.Build.Tasks.csproj | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj index 8af651fa079a..fce8ecc9e8b3 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj @@ -68,11 +68,6 @@ - - - - -