From 3c9d5b57aad0210acedeaa1c498f022744be8fc8 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Mon, 23 Sep 2024 16:28:08 -0700 Subject: [PATCH 1/3] Remove WorkloadManifestValidator stub project Stub project was created 4 years ago and unchanged since then. This popped out because it restores cross-arch windows assets due to the RuntimeIdentifiers property. Instead of fixing that property (which is not needed), I figured it was better to just remove this unused functionality --- sdk.sln | 2 -- source-build.slnf | 1 - .../WorkloadManifestValidator/Program.cs | 13 ------------- .../WorkloadManifestValidator.csproj | 17 ----------------- src/Tasks/Microsoft.NET.slnf | 3 +-- 5 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 src/Resolvers/WorkloadManifestValidator/Program.cs delete mode 100644 src/Resolvers/WorkloadManifestValidator/WorkloadManifestValidator.csproj diff --git a/sdk.sln b/sdk.sln index c57d23959f8c..4102b787dd90 100644 --- a/sdk.sln +++ b/sdk.sln @@ -262,8 +262,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.SdkResolve EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.WorkloadManifestReader", "src\Resolvers\Microsoft.NET.Sdk.WorkloadManifestReader\Microsoft.NET.Sdk.WorkloadManifestReader.csproj", "{C22A85E0-C09F-4E2D-81F6-82AB97932FE2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkloadManifestValidator", "src\Resolvers\WorkloadManifestValidator\WorkloadManifestValidator.csproj", "{565411E4-E89D-4DF3-ADD5-55D3295F30EE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.WorkloadManifestReader.Tests", "test\Microsoft.NET.Sdk.WorkloadManifestReader.Tests\Microsoft.NET.Sdk.WorkloadManifestReader.Tests.csproj", "{988D4839-B97F-42BB-A045-C79157CA7780}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver", "src\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj", "{56F189B0-6A8E-4A9D-B7AE-24241204E98D}" diff --git a/source-build.slnf b/source-build.slnf index dd00078d19a6..7e3bccf3392b 100644 --- a/source-build.slnf +++ b/source-build.slnf @@ -37,7 +37,6 @@ "src\\Resolvers\\Microsoft.DotNet.SdkResolver\\Microsoft.DotNet.SdkResolver.csproj", "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj", "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadManifestReader\\Microsoft.NET.Sdk.WorkloadManifestReader.csproj", - "src\\Resolvers\\WorkloadManifestValidator\\WorkloadManifestValidator.csproj", "src\\StaticWebAssetsSdk\\Tasks\\Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj", "src\\StaticWebAssetsSdk\\Tool\\Microsoft.NET.Sdk.StaticWebAssets.Tool.csproj", "src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks\\Microsoft.NET.Build.Extensions.Tasks.csproj", diff --git a/src/Resolvers/WorkloadManifestValidator/Program.cs b/src/Resolvers/WorkloadManifestValidator/Program.cs deleted file mode 100644 index fe872e1aa261..000000000000 --- a/src/Resolvers/WorkloadManifestValidator/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -namespace WorkloadManifestValidator -{ - class Program - { - static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} diff --git a/src/Resolvers/WorkloadManifestValidator/WorkloadManifestValidator.csproj b/src/Resolvers/WorkloadManifestValidator/WorkloadManifestValidator.csproj deleted file mode 100644 index 89004de265d4..000000000000 --- a/src/Resolvers/WorkloadManifestValidator/WorkloadManifestValidator.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(SdkTargetFramework);net472 - $(SdkTargetFramework) - - AnyCPU - win-x86;win-x64 - true - Enable - - - - - - - diff --git a/src/Tasks/Microsoft.NET.slnf b/src/Tasks/Microsoft.NET.slnf index 074502dba0b3..b00e01434e0e 100644 --- a/src/Tasks/Microsoft.NET.slnf +++ b/src/Tasks/Microsoft.NET.slnf @@ -20,7 +20,6 @@ "src\\Resolvers\\Microsoft.DotNet.SdkResolver\\Microsoft.DotNet.SdkResolver.csproj", "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj", "src\\Resolvers\\Microsoft.NET.Sdk.WorkloadManifestReader\\Microsoft.NET.Sdk.WorkloadManifestReader.csproj", - "src\\Resolvers\\WorkloadManifestValidator\\WorkloadManifestValidator.csproj", "src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks.UnitTests\\Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj", "src\\Tasks\\Microsoft.NET.Build.Extensions.Tasks\\Microsoft.NET.Build.Extensions.Tasks.csproj", "src\\Tasks\\Microsoft.NET.Build.Tasks.UnitTests\\Microsoft.NET.Build.Tasks.UnitTests.csproj", @@ -60,4 +59,4 @@ "test\\msbuild.Integration.Tests\\msbuild.Integration.Tests.csproj" ] } -} \ No newline at end of file +} From 56e3bd3e8fc99029f26148b80536b9fd0048600d Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Tue, 24 Sep 2024 08:08:36 -0700 Subject: [PATCH 2/3] Remove leading line? --- sdk.sln | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk.sln b/sdk.sln index 4102b787dd90..fc6608a1fcd5 100644 --- a/sdk.sln +++ b/sdk.sln @@ -1,5 +1,4 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.31903.286 MinimumVisualStudioVersion = 10.0.40219.1 From 103be8048cbd5fe28f51eb24a74f8e5c15bdfcbb Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Tue, 24 Sep 2024 08:25:56 -0700 Subject: [PATCH 3/3] Remove project references --- sdk.sln | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sdk.sln b/sdk.sln index fc6608a1fcd5..9fbb11eeb68c 100644 --- a/sdk.sln +++ b/sdk.sln @@ -1,4 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 + +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.1.31903.286 MinimumVisualStudioVersion = 10.0.40219.1 @@ -698,10 +699,6 @@ Global {C22A85E0-C09F-4E2D-81F6-82AB97932FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU {C22A85E0-C09F-4E2D-81F6-82AB97932FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU {C22A85E0-C09F-4E2D-81F6-82AB97932FE2}.Release|Any CPU.Build.0 = Release|Any CPU - {565411E4-E89D-4DF3-ADD5-55D3295F30EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {565411E4-E89D-4DF3-ADD5-55D3295F30EE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {565411E4-E89D-4DF3-ADD5-55D3295F30EE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {565411E4-E89D-4DF3-ADD5-55D3295F30EE}.Release|Any CPU.Build.0 = Release|Any CPU {988D4839-B97F-42BB-A045-C79157CA7780}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {988D4839-B97F-42BB-A045-C79157CA7780}.Debug|Any CPU.Build.0 = Debug|Any CPU {988D4839-B97F-42BB-A045-C79157CA7780}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -1044,7 +1041,6 @@ Global {2207EE89-63BC-4498-A5BE-F285FBCC8FD9} = {8F22FBD6-BDC8-431E-8402-B7460D3A9724} {29D14D1A-F236-4D11-8E2A-8DCEBC4FAEC0} = {8F22FBD6-BDC8-431E-8402-B7460D3A9724} {C22A85E0-C09F-4E2D-81F6-82AB97932FE2} = {8F22FBD6-BDC8-431E-8402-B7460D3A9724} - {565411E4-E89D-4DF3-ADD5-55D3295F30EE} = {8F22FBD6-BDC8-431E-8402-B7460D3A9724} {988D4839-B97F-42BB-A045-C79157CA7780} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} {56F189B0-6A8E-4A9D-B7AE-24241204E98D} = {8F22FBD6-BDC8-431E-8402-B7460D3A9724} {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E}