diff --git a/dotnet/Makefile b/dotnet/Makefile
index a0a4479efce..baf94c9ceae 100644
--- a/dotnet/Makefile
+++ b/dotnet/Makefile
@@ -221,6 +221,7 @@ $(DOTNET_NUPKG_DIR)/vs-workload.props: Makefile $(GENERATE_VS_WORKLOAD)
 		--shorten Microsoft.NET.Sdk.MacCatalyst.Manifest=Microsoft.MacCatalyst.Manifest \
 		--shorten Microsoft.tvOS.Runtime.tvossimulator=Microsoft.tvOS.Runtime \
 		--tfm $(DOTNET_TFM) \
+		--xcode $(XCODE_VERSION) \
 		--output $@.tmp
 	$(Q) mv $@.tmp $@
 
diff --git a/scripts/generate-vs-workload/generate-vs-workload.cs b/scripts/generate-vs-workload/generate-vs-workload.cs
index 17095ee5260..2f255a4b500 100755
--- a/scripts/generate-vs-workload/generate-vs-workload.cs
+++ b/scripts/generate-vs-workload/generate-vs-workload.cs
@@ -12,6 +12,7 @@
 var platforms = new List<(string, string)> ();
 var windowsPlatforms = new List<string> ();
 var tfm = string.Empty;
+var xcodeName = string.Empty;
 var outputPath = string.Empty;
 
 var queue = new Queue<string> (args);
@@ -37,6 +38,9 @@
 	case "--tfm":
 		tfm = queue.Dequeue ();
 		break;
+	case "--xcode":
+		xcodeName = $"xcode{queue.Dequeue ()}";
+		break;
 	default:
 		Console.Error.WriteLine ($"Unknown argument: {arg}");
 		return 1;
@@ -48,7 +52,7 @@
 	writer.WriteLine ($"<Project>");
 	writer.WriteLine ($"  <PropertyGroup>");
 	var allPlatforms = string.Join (".", platforms.Select (v => v.Item1).OrderBy (v => v));
-	writer.WriteLine ($"    <TargetName>Microsoft.NET.Sdk.{allPlatforms}.Workload.{tfm}</TargetName>");
+	writer.WriteLine ($"    <TargetName>Microsoft.NET.Sdk.{allPlatforms}.Workload.{tfm}.{xcodeName}</TargetName>");
 	// Find the iOS version, otherwise use the version of the first platform listed.
 	var iOSPlatform = platforms.Where (v => v.Item1 == "iOS");
 	var manifestBuildVersion = iOSPlatform.Any () ? iOSPlatform.First ().Item2 : platforms.First ().Item2;