From c3fc4961ab404bc812de3344d2d0048a5a5d953e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 28 Jul 2025 08:33:56 +0000 Subject: [PATCH 1/3] Remove unnecessary license and xml headers The license header is only needed in shipping content files. It explicitly isn't needed in input files. --- Directory.Build.props | 1 - Directory.Build.targets | 5 ++--- OverrideTest.targets | 8 ++++---- src/Layout/pkg/windows/Directory.Build.props | 4 ++-- src/Layout/pkg/windows/Directory.Build.targets | 3 ++- src/Layout/pkg/windows/bundles/sdk/bundle.thm | 3 +-- src/Layout/pkg/windows/bundles/sdk/bundle.wixproj | 1 - src/Layout/pkg/windows/bundles/sdk/bundle.wxs | 11 +++++------ src/Layout/pkg/windows/msis/Directory.Build.props | 3 ++- src/Layout/pkg/windows/msis/directories.wxs | 1 - .../pkg/windows/msis/placeholder/placeholder.wixproj | 5 +++-- src/Layout/pkg/windows/msis/placeholder/product.wxs | 1 - src/Layout/pkg/windows/msis/registrykeys.wxs | 1 - src/Layout/pkg/windows/msis/templates/product.wxs | 1 - .../pkg/windows/msis/templates/templates.wixproj | 3 ++- src/Layout/pkg/windows/msis/toolset/product.wxs | 1 - src/Layout/pkg/windows/msis/toolset/toolset.wixproj | 3 ++- src/Layout/redist/targets/GenerateMSIs.targets | 4 ++-- ...rosoft.NET.Build.Extensions.Tasks.UnitTests.csproj | 8 +++----- .../Microsoft.NET.Build.Extensions.Tasks.csproj | 8 +++----- .../Microsoft.NET.Build.Tasks.UnitTests.csproj | 4 +--- test/Common/Empty.props | 4 ++-- test/Common/Empty.targets | 4 ++-- test/Directory.Build.targets | 1 - .../Microsoft.NET.Build.Tests.csproj | 5 ++--- .../Microsoft.NET.Clean.Tests.csproj | 7 +++---- .../Microsoft.NET.Rebuild.Tests.csproj | 4 +--- .../Microsoft.NET.Restore.Tests.csproj | 6 ++---- .../content/ExternalStaticAssets.targets | 6 +++--- .../Microsoft.NET.Sdk.Razor.Tool.Tests.csproj | 4 +--- .../content/ExternalStaticAssets.targets | 4 ++-- .../Microsoft.NET.TestFramework.csproj | 4 +--- .../Microsoft.NET.TestFramework/SetupTestRoot.targets | 1 - .../Microsoft.NET.ToolPack.Tests.csproj | 4 +--- .../TestDirectoryBuildFiles/Directory.Build.props | 4 ++-- .../TestDirectoryBuildFiles/Directory.Build.targets | 5 +---- test/dotnet-watch.Tests/Directory.Build.targets | 2 +- 37 files changed, 58 insertions(+), 86 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 80ff52f11234..e5c8618bc5dd 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,4 +1,3 @@ - diff --git a/Directory.Build.targets b/Directory.Build.targets index 41731cf145bd..ec737fd75078 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,6 +1,5 @@ - - + - + + diff --git a/src/Layout/pkg/windows/Directory.Build.props b/src/Layout/pkg/windows/Directory.Build.props index ef56e23437cf..691a7ca5722f 100644 --- a/src/Layout/pkg/windows/Directory.Build.props +++ b/src/Layout/pkg/windows/Directory.Build.props @@ -1,5 +1,5 @@ - + @@ -24,5 +24,5 @@ $(DefineConstants);InstallerVersion=200 $(DefineConstants);InstallerVersion=500 - + diff --git a/src/Layout/pkg/windows/Directory.Build.targets b/src/Layout/pkg/windows/Directory.Build.targets index 100a43428a7c..cae3bada98bc 100644 --- a/src/Layout/pkg/windows/Directory.Build.targets +++ b/src/Layout/pkg/windows/Directory.Build.targets @@ -1,5 +1,5 @@ - + @@ -70,4 +70,5 @@ + diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.thm b/src/Layout/pkg/windows/bundles/sdk/bundle.thm index 1a935453f79c..5a98299c4986 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.thm +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.thm @@ -1,4 +1,3 @@ - Segoe UI - diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj index b324bfd1f745..7389e135944a 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wixproj @@ -1,4 +1,3 @@ - diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs index 706b90ea2792..60ba436b58f1 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs @@ -1,4 +1,3 @@ - @@ -135,7 +134,7 @@ + @@ -14,4 +14,5 @@ true + diff --git a/src/Layout/pkg/windows/msis/directories.wxs b/src/Layout/pkg/windows/msis/directories.wxs index 901dc30325bd..a8340075805c 100644 --- a/src/Layout/pkg/windows/msis/directories.wxs +++ b/src/Layout/pkg/windows/msis/directories.wxs @@ -1,4 +1,3 @@ - - + + @@ -19,4 +19,5 @@ $(DefineConstants);DependencyKeyName=NetCore_SdkPlaceholder + diff --git a/src/Layout/pkg/windows/msis/placeholder/product.wxs b/src/Layout/pkg/windows/msis/placeholder/product.wxs index 2265272ba71c..9a59f8e266a0 100644 --- a/src/Layout/pkg/windows/msis/placeholder/product.wxs +++ b/src/Layout/pkg/windows/msis/placeholder/product.wxs @@ -1,4 +1,3 @@ - diff --git a/src/Layout/pkg/windows/msis/registrykeys.wxs b/src/Layout/pkg/windows/msis/registrykeys.wxs index 610c8496fe58..233c49a0503c 100644 --- a/src/Layout/pkg/windows/msis/registrykeys.wxs +++ b/src/Layout/pkg/windows/msis/registrykeys.wxs @@ -1,4 +1,3 @@ - diff --git a/src/Layout/pkg/windows/msis/templates/product.wxs b/src/Layout/pkg/windows/msis/templates/product.wxs index 8bb7bdba7dbb..8577333abef9 100644 --- a/src/Layout/pkg/windows/msis/templates/product.wxs +++ b/src/Layout/pkg/windows/msis/templates/product.wxs @@ -1,4 +1,3 @@ - diff --git a/src/Layout/pkg/windows/msis/templates/templates.wixproj b/src/Layout/pkg/windows/msis/templates/templates.wixproj index 0a9530517b6a..68559665ab44 100644 --- a/src/Layout/pkg/windows/msis/templates/templates.wixproj +++ b/src/Layout/pkg/windows/msis/templates/templates.wixproj @@ -1,5 +1,5 @@ - + @@ -31,4 +31,5 @@ $(DefineConstants);DependencyKeyName=$(DependencyKeyName) + diff --git a/src/Layout/pkg/windows/msis/toolset/product.wxs b/src/Layout/pkg/windows/msis/toolset/product.wxs index abdac49688da..2c56887a8b1b 100644 --- a/src/Layout/pkg/windows/msis/toolset/product.wxs +++ b/src/Layout/pkg/windows/msis/toolset/product.wxs @@ -1,4 +1,3 @@ - diff --git a/src/Layout/pkg/windows/msis/toolset/toolset.wixproj b/src/Layout/pkg/windows/msis/toolset/toolset.wixproj index f16de2fb83b5..3131b34c4043 100644 --- a/src/Layout/pkg/windows/msis/toolset/toolset.wixproj +++ b/src/Layout/pkg/windows/msis/toolset/toolset.wixproj @@ -1,5 +1,5 @@ - + @@ -32,4 +32,5 @@ $(DefineConstants);DependencyKeyName=Dotnet_CLI + diff --git a/src/Layout/redist/targets/GenerateMSIs.targets b/src/Layout/redist/targets/GenerateMSIs.targets index 93b35c34eaad..6c0c1639ac82 100644 --- a/src/Layout/redist/targets/GenerateMSIs.targets +++ b/src/Layout/redist/targets/GenerateMSIs.targets @@ -1,5 +1,5 @@ - + GenerateSdkMsi; @@ -146,7 +146,7 @@ OutputPath=$([System.IO.Path]::GetDirectoryName(%(MSIInstallerFile))); OutputName=$([System.IO.Path]::GetFileNameWithoutExtension(%(MSIInstallerFile))); DependencyKeyName=%(DependencyKeyName);TemplateLayoutDirectoryToHarvest=%(LayoutPath); - BrandName=%(BrandName);UpgradeCode=%(UpgradeCode); + BrandName=%(BrandName);UpgradeCode=%(UpgradeCode); DotnetSrc=%(LayoutPath)"/> diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj index 603ae1a80b0e..0c556687fb77 100644 --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj +++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj @@ -1,6 +1,4 @@ - - - + Tests\$(MSBuildProjectName) @@ -13,7 +11,7 @@ $(SdkTargetFramework) false - + @@ -35,5 +33,5 @@ - + diff --git a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj index 969088345f1a..fea66b66efcc 100644 --- a/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj +++ b/src/Tasks/Microsoft.NET.Build.Extensions.Tasks/Microsoft.NET.Build.Extensions.Tasks.csproj @@ -1,6 +1,4 @@ - - - + @@ -8,7 +6,7 @@ Microsoft.NET.Build.Extensions $(Configuration)\Sdks\$(PackageId)\msbuildExtensions\Microsoft\Microsoft.NET.Build.Extensions\tools - + @@ -28,7 +26,7 @@ true - + $(BaseOutputPath) $(DefineConstants);EXTENSIONS diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj index bf4a545e84a5..62eb66041be9 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj @@ -1,6 +1,4 @@ - - - + Tests\$(MSBuildProjectName) diff --git a/test/Common/Empty.props b/test/Common/Empty.props index c112225b1be9..1c856ede75c4 100644 --- a/test/Common/Empty.props +++ b/test/Common/Empty.props @@ -1,5 +1,5 @@ - - + + diff --git a/test/Common/Empty.targets b/test/Common/Empty.targets index 1b661f64dd0e..9ba198ac6a7d 100644 --- a/test/Common/Empty.targets +++ b/test/Common/Empty.targets @@ -1,5 +1,5 @@ - - + + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 7574c07a19fc..14e3ac1e7dc6 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -1,4 +1,3 @@ - diff --git a/test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj b/test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj index cda2e95e19e4..42734c6a8cd7 100644 --- a/test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj +++ b/test/Microsoft.NET.Build.Tests/Microsoft.NET.Build.Tests.csproj @@ -1,6 +1,5 @@ - - - + + false Tests\$(MSBuildProjectName) diff --git a/test/Microsoft.NET.Clean.Tests/Microsoft.NET.Clean.Tests.csproj b/test/Microsoft.NET.Clean.Tests/Microsoft.NET.Clean.Tests.csproj index a5cc5adbeff4..12adb846f20a 100644 --- a/test/Microsoft.NET.Clean.Tests/Microsoft.NET.Clean.Tests.csproj +++ b/test/Microsoft.NET.Clean.Tests/Microsoft.NET.Clean.Tests.csproj @@ -1,6 +1,5 @@ - - - + + false Tests\$(MSBuildProjectName) @@ -16,7 +15,7 @@ testSdkClean - + diff --git a/test/Microsoft.NET.Rebuild.Tests/Microsoft.NET.Rebuild.Tests.csproj b/test/Microsoft.NET.Rebuild.Tests/Microsoft.NET.Rebuild.Tests.csproj index c160073157bc..214a424d8485 100644 --- a/test/Microsoft.NET.Rebuild.Tests/Microsoft.NET.Rebuild.Tests.csproj +++ b/test/Microsoft.NET.Rebuild.Tests/Microsoft.NET.Rebuild.Tests.csproj @@ -1,6 +1,4 @@ - - - + false diff --git a/test/Microsoft.NET.Restore.Tests/Microsoft.NET.Restore.Tests.csproj b/test/Microsoft.NET.Restore.Tests/Microsoft.NET.Restore.Tests.csproj index ba4c241ee8e7..0c8d9d66d319 100644 --- a/test/Microsoft.NET.Restore.Tests/Microsoft.NET.Restore.Tests.csproj +++ b/test/Microsoft.NET.Restore.Tests/Microsoft.NET.Restore.Tests.csproj @@ -1,6 +1,4 @@ - - - + false @@ -17,7 +15,7 @@ testSdkRestore - + diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/content/ExternalStaticAssets.targets b/test/Microsoft.NET.Sdk.Razor.Tests/content/ExternalStaticAssets.targets index a0083f3f9a49..64049b7cbd1e 100644 --- a/test/Microsoft.NET.Sdk.Razor.Tests/content/ExternalStaticAssets.targets +++ b/test/Microsoft.NET.Sdk.Razor.Tests/content/ExternalStaticAssets.targets @@ -1,5 +1,4 @@ - - + @@ -19,7 +18,7 @@ - + @@ -66,4 +65,5 @@ + diff --git a/test/Microsoft.NET.Sdk.Razor.Tool.Tests/Microsoft.NET.Sdk.Razor.Tool.Tests.csproj b/test/Microsoft.NET.Sdk.Razor.Tool.Tests/Microsoft.NET.Sdk.Razor.Tool.Tests.csproj index 0cabc4330a7c..67d5060c3a72 100644 --- a/test/Microsoft.NET.Sdk.Razor.Tool.Tests/Microsoft.NET.Sdk.Razor.Tool.Tests.csproj +++ b/test/Microsoft.NET.Sdk.Razor.Tool.Tests/Microsoft.NET.Sdk.Razor.Tool.Tests.csproj @@ -1,6 +1,4 @@ - - - + false diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/content/ExternalStaticAssets.targets b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/content/ExternalStaticAssets.targets index 8a2b8976b8d4..64049b7cbd1e 100644 --- a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/content/ExternalStaticAssets.targets +++ b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/content/ExternalStaticAssets.targets @@ -1,5 +1,4 @@ - - + @@ -66,4 +65,5 @@ + diff --git a/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj b/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj index 7829d0829246..7f206f2291f6 100644 --- a/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj +++ b/test/Microsoft.NET.TestFramework/Microsoft.NET.TestFramework.csproj @@ -1,6 +1,4 @@ - - - + false diff --git a/test/Microsoft.NET.TestFramework/SetupTestRoot.targets b/test/Microsoft.NET.TestFramework/SetupTestRoot.targets index 9167a88eaa01..4c917cc6a6d4 100644 --- a/test/Microsoft.NET.TestFramework/SetupTestRoot.targets +++ b/test/Microsoft.NET.TestFramework/SetupTestRoot.targets @@ -1,4 +1,3 @@ - diff --git a/test/Microsoft.NET.ToolPack.Tests/Microsoft.NET.ToolPack.Tests.csproj b/test/Microsoft.NET.ToolPack.Tests/Microsoft.NET.ToolPack.Tests.csproj index eff7863617a0..c5d593181bd2 100644 --- a/test/Microsoft.NET.ToolPack.Tests/Microsoft.NET.ToolPack.Tests.csproj +++ b/test/Microsoft.NET.ToolPack.Tests/Microsoft.NET.ToolPack.Tests.csproj @@ -1,6 +1,4 @@ - - - + false diff --git a/test/dotnet-new.IntegrationTests/TestDirectoryBuildFiles/Directory.Build.props b/test/dotnet-new.IntegrationTests/TestDirectoryBuildFiles/Directory.Build.props index b5f441385aef..635af35f8509 100644 --- a/test/dotnet-new.IntegrationTests/TestDirectoryBuildFiles/Directory.Build.props +++ b/test/dotnet-new.IntegrationTests/TestDirectoryBuildFiles/Directory.Build.props @@ -1,8 +1,8 @@ - - + false + diff --git a/test/dotnet-new.IntegrationTests/TestDirectoryBuildFiles/Directory.Build.targets b/test/dotnet-new.IntegrationTests/TestDirectoryBuildFiles/Directory.Build.targets index 39af617d4232..058246e40862 100644 --- a/test/dotnet-new.IntegrationTests/TestDirectoryBuildFiles/Directory.Build.targets +++ b/test/dotnet-new.IntegrationTests/TestDirectoryBuildFiles/Directory.Build.targets @@ -1,4 +1 @@ - - - - + diff --git a/test/dotnet-watch.Tests/Directory.Build.targets b/test/dotnet-watch.Tests/Directory.Build.targets index 6ae79f4c0f1b..03f8eb02206d 100644 --- a/test/dotnet-watch.Tests/Directory.Build.targets +++ b/test/dotnet-watch.Tests/Directory.Build.targets @@ -1,5 +1,5 @@ - + From 74858b3fb0b1019cb5a6f3b1b8497ed90718bf00 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 28 Jul 2025 15:23:52 +0200 Subject: [PATCH 2/3] Update Directory.Build.props --- src/Layout/pkg/windows/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Layout/pkg/windows/Directory.Build.props b/src/Layout/pkg/windows/Directory.Build.props index 691a7ca5722f..428856d328c1 100644 --- a/src/Layout/pkg/windows/Directory.Build.props +++ b/src/Layout/pkg/windows/Directory.Build.props @@ -24,5 +24,6 @@ $(DefineConstants);InstallerVersion=200 $(DefineConstants);InstallerVersion=500 + From a42ab298f3299b7134c2f6a88237b870e0123531 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 5 Aug 2025 12:49:30 +0200 Subject: [PATCH 3/3] Revert thm and wxs changes --- src/Layout/pkg/windows/bundles/sdk/bundle.thm | 3 ++- src/Layout/pkg/windows/bundles/sdk/bundle.wxs | 1 + src/Layout/pkg/windows/msis/directories.wxs | 1 + src/Layout/pkg/windows/msis/placeholder/product.wxs | 1 + src/Layout/pkg/windows/msis/registrykeys.wxs | 1 + src/Layout/pkg/windows/msis/templates/product.wxs | 1 + src/Layout/pkg/windows/msis/toolset/product.wxs | 1 + 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.thm b/src/Layout/pkg/windows/bundles/sdk/bundle.thm index 5a98299c4986..1a935453f79c 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.thm +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.thm @@ -1,3 +1,4 @@ + Segoe UI - diff --git a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs index 60ba436b58f1..3af687b6f499 100644 --- a/src/Layout/pkg/windows/bundles/sdk/bundle.wxs +++ b/src/Layout/pkg/windows/bundles/sdk/bundle.wxs @@ -1,3 +1,4 @@ + diff --git a/src/Layout/pkg/windows/msis/directories.wxs b/src/Layout/pkg/windows/msis/directories.wxs index a8340075805c..901dc30325bd 100644 --- a/src/Layout/pkg/windows/msis/directories.wxs +++ b/src/Layout/pkg/windows/msis/directories.wxs @@ -1,3 +1,4 @@ + diff --git a/src/Layout/pkg/windows/msis/registrykeys.wxs b/src/Layout/pkg/windows/msis/registrykeys.wxs index 233c49a0503c..610c8496fe58 100644 --- a/src/Layout/pkg/windows/msis/registrykeys.wxs +++ b/src/Layout/pkg/windows/msis/registrykeys.wxs @@ -1,3 +1,4 @@ + diff --git a/src/Layout/pkg/windows/msis/templates/product.wxs b/src/Layout/pkg/windows/msis/templates/product.wxs index 8577333abef9..8bb7bdba7dbb 100644 --- a/src/Layout/pkg/windows/msis/templates/product.wxs +++ b/src/Layout/pkg/windows/msis/templates/product.wxs @@ -1,3 +1,4 @@ + diff --git a/src/Layout/pkg/windows/msis/toolset/product.wxs b/src/Layout/pkg/windows/msis/toolset/product.wxs index 2c56887a8b1b..abdac49688da 100644 --- a/src/Layout/pkg/windows/msis/toolset/product.wxs +++ b/src/Layout/pkg/windows/msis/toolset/product.wxs @@ -1,3 +1,4 @@ +