From 3a609475634277577048abbde3a2e7144e1e12b8 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Thu, 30 May 2024 08:59:44 -0500 Subject: [PATCH 1/7] make the workload resolver only light up for the specific entrypoint SDKs we control --- .../Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml index 0cfa2e19f963..a976c12767c1 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml @@ -1,3 +1,4 @@ ..\..\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll +Microsoft.NET.SDK.WorkloadAutoImportPropsLocator|Microsoft.NET.SDK.WorkloadManifestTargetsLocator From cbba7a1ad3898b76ca54a465c8143240e31ae328 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 4 Dec 2024 10:24:17 -0600 Subject: [PATCH 2/7] update pattern to account for workload packs from all known workloads --- .../Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml index a976c12767c1..4cb600dcea23 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml @@ -1,4 +1,4 @@ ..\..\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll -Microsoft.NET.SDK.WorkloadAutoImportPropsLocator|Microsoft.NET.SDK.WorkloadManifestTargetsLocator +Microsoft\.NET\.SDK\.WorkloadAutoImportPropsLocator|Microsoft\.NET\.SDK\.WorkloadManifestTargetsLocator|Microsoft\..*|Samsung\..*|GtkSharp\..* From 37b88cbf70db6d166e8617c01869e7a7637d0f4e Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 4 Dec 2024 12:36:07 -0600 Subject: [PATCH 3/7] use simpler, broader patterns --- .../Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml index 4cb600dcea23..7a570420b240 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/SdkResolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.xml @@ -1,4 +1,4 @@ ..\..\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.dll -Microsoft\.NET\.SDK\.WorkloadAutoImportPropsLocator|Microsoft\.NET\.SDK\.WorkloadManifestTargetsLocator|Microsoft\..*|Samsung\..*|GtkSharp\..* +Microsoft\..*|Samsung\..*|GtkSharp\..* From c6ca5484f7d090de4caa704c22a6b67e599fd027 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 4 Dec 2024 12:52:49 -0600 Subject: [PATCH 4/7] make sure the netfx resolver xml configs get the updates too --- .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 1 + .../Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index 97834cf1313e..3920b0265d14 100644 --- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -37,6 +37,7 @@ + diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj index d713f088b96c..11bcf82d1470 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj @@ -45,6 +45,7 @@ + From eca6019848a65f2062ae16f9eb610a73f20472fd Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Sat, 7 Dec 2024 13:23:54 -0600 Subject: [PATCH 5/7] use pattern that combines both workloads and known-sdk names for the full framework resolver --- .../Microsoft.DotNet.MSBuildSdkResolver.xml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.xml diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.xml b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.xml new file mode 100644 index 000000000000..8ec4debbffaf --- /dev/null +++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/SdkResolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.xml @@ -0,0 +1,4 @@ + +..\..\Microsoft.DotNet.MSBuildSdkResolver.dll +Microsoft\..*|Samsung\..*|GtkSharp\..*|FSharp\.NET\.Sdk|NuGet\.Build\.Tasks\.Pack + From 3e0621d74ecbb393afc5307bbc1a1ee73a15d0d4 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Sat, 7 Dec 2024 13:25:14 -0600 Subject: [PATCH 6/7] Update patterns in generated netframework resolver --- .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index 3920b0265d14..ee8fc2789ce6 100644 --- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -37,7 +37,7 @@ - + From afed12eb01cbe47da61bf9b247f620993913d1cb Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Sat, 7 Dec 2024 13:38:26 -0600 Subject: [PATCH 7/7] try to include the generated xml file in the vs extension --- src/VSMSBuildExtensions/VSMSBuildExtensions.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/VSMSBuildExtensions/VSMSBuildExtensions.proj b/src/VSMSBuildExtensions/VSMSBuildExtensions.proj index b2a53d301096..2ae909fb3f55 100644 --- a/src/VSMSBuildExtensions/VSMSBuildExtensions.proj +++ b/src/VSMSBuildExtensions/VSMSBuildExtensions.proj @@ -56,6 +56,7 @@ + $(OutputPath)/%(VSMSBuildExtensionsContent.DeploymentSubpath)%(RecursiveDir)%(Filename)%(Extension)