[dotnet] Add runtime packs to workload manifests

pjcollins · pjcollins · commit 4217ecee0965 · 2021-07-21T18:28:00.000-04:00
Runtime pack entries should be included in all workload manifest files, even though they will not yet be resolved from the packs folder due to dotnet/sdk#14044. These changes will also allow us to start producing .msi files for the runtime packs for an eventual inclusion in the Visual Studio installer.
diff --git a/dotnet/targets/WorkloadManifest.MacCatalyst.template.json b/dotnet/targets/WorkloadManifest.MacCatalyst.template.json
@@ -6,6 +6,8 @@
 			"packs": [
 				"Microsoft.@PLATFORM@.Sdk",
 				"Microsoft.@PLATFORM@.Ref",
+				"Microsoft.@PLATFORM@.Runtime.maccatalyst-arm64",
+				"Microsoft.@PLATFORM@.Runtime.maccatalyst-x64",
 				"Microsoft.@PLATFORM@.Templates"
 			],
 			"extends": [ 
@@ -22,6 +24,14 @@
 			"kind": "framework",
 			"version": "@VERSION@"
 		},
+		"Microsoft.@PLATFORM@.Runtime.maccatalyst-arm64": {
+			"kind": "framework",
+			"version": "@VERSION@"
+		},
+		"Microsoft.@PLATFORM@.Runtime.maccatalyst-x64": {
+			"kind": "framework",
+			"version": "@VERSION@"
+		},
 		"Microsoft.@PLATFORM@.Templates": {
 			"kind": "template",
 			"version": "@VERSION@"
diff --git a/dotnet/targets/WorkloadManifest.iOS.template.json b/dotnet/targets/WorkloadManifest.iOS.template.json
@@ -7,6 +7,10 @@
 				"Microsoft.@PLATFORM@.Sdk",
 				"Microsoft.@PLATFORM@.Windows.Sdk",
 				"Microsoft.@PLATFORM@.Ref",
+				"Microsoft.@PLATFORM@.Runtime.ios-arm",
+				"Microsoft.@PLATFORM@.Runtime.ios-arm64",
+				"Microsoft.@PLATFORM@.Runtime.iossimulator-x86",
+				"Microsoft.@PLATFORM@.Runtime.iossimulator-x64",
 				"Microsoft.@PLATFORM@.Templates"
 			],
 			"extends": [
@@ -27,6 +31,22 @@
 			"kind": "framework",
 			"version": "@VERSION@"
 		},
+		"Microsoft.@PLATFORM@.Runtime.ios-arm": {
+			"kind": "framework",
+			"version": "@VERSION@"
+		},
+		"Microsoft.@PLATFORM@.Runtime.ios-arm64": {
+			"kind": "framework",
+			"version": "@VERSION@"
+		},
+		"Microsoft.@PLATFORM@.Runtime.iossimulator-x86": {
+			"kind": "framework",
+			"version": "@VERSION@"
+		},
+		"Microsoft.@PLATFORM@.Runtime.iossimulator-x64": {
+			"kind": "framework",
+			"version": "@VERSION@"
+		},
 		"Microsoft.@PLATFORM@.Templates": {
 			"kind": "template",
 			"version": "@VERSION@"
diff --git a/dotnet/targets/WorkloadManifest.macOS.template.json b/dotnet/targets/WorkloadManifest.macOS.template.json
@@ -6,6 +6,8 @@
 			"packs": [
 				"Microsoft.@PLATFORM@.Sdk",
 				"Microsoft.@PLATFORM@.Ref",
+				"Microsoft.@PLATFORM@.Runtime.osx-arm64",
+				"Microsoft.@PLATFORM@.Runtime.osx-x64",
 				"Microsoft.@PLATFORM@.Templates"
 			],
 			"extends": [ 
@@ -22,6 +24,14 @@
 			"kind": "framework",
 			"version": "@VERSION@"
 		},
+		"Microsoft.@PLATFORM@.Runtime.osx-arm64": {
+			"kind": "framework",
+			"version": "@VERSION@"
+		},
+		"Microsoft.@PLATFORM@.Runtime.osx-x64": {
+			"kind": "framework",
+			"version": "@VERSION@"
+		},
 		"Microsoft.@PLATFORM@.Templates": {
 			"kind": "template",
 			"version": "@VERSION@"
diff --git a/dotnet/targets/WorkloadManifest.tvOS.template.json b/dotnet/targets/WorkloadManifest.tvOS.template.json
@@ -6,6 +6,8 @@
 			"packs": [
 				"Microsoft.@PLATFORM@.Sdk",
 				"Microsoft.@PLATFORM@.Ref",
+				"Microsoft.@PLATFORM@.Runtime.tvos-arm64",
+				"Microsoft.@PLATFORM@.Runtime.tvossimulator-x64",
 				"Microsoft.@PLATFORM@.Templates"
 			],
 			"extends": [
@@ -22,6 +24,14 @@
 			"kind": "framework",
 			"version": "@VERSION@"
 		},
+		"Microsoft.@PLATFORM@.Runtime.tvos-arm64": {
+			"kind": "framework",
+			"version": "@VERSION@"
+		},
+		"Microsoft.@PLATFORM@.Runtime.tvossimulator-x64": {
+			"kind": "framework",
+			"version": "@VERSION@"
+		},
 		"Microsoft.@PLATFORM@.Templates": {
 			"kind": "template",
 			"version": "@VERSION@"

-Original file line number
+Diff line change
 				"Microsoft.@[email protected]",
 				"Microsoft.@[email protected]",
 				"Microsoft.@[email protected]",
 +				"Microsoft.@[email protected]",
 +				"Microsoft.@[email protected]",
 +				"Microsoft.@[email protected]",
 +				"Microsoft.@[email protected]",
 				"Microsoft.@[email protected]"
 			],
 			"extends": [
 			"kind": "framework",
 			"version": "@VERSION@"
 		},
 +		"Microsoft.@[email protected]": {
 +			"kind": "framework",
 +			"version": "@VERSION@"
 +		},
 +		"Microsoft.@[email protected]": {
 +			"kind": "framework",
 +			"version": "@VERSION@"
 +		},
 +		"Microsoft.@[email protected]": {
 +			"kind": "framework",
 +			"version": "@VERSION@"
 +		},
 +		"Microsoft.@[email protected]": {
 +			"kind": "framework",
 +			"version": "@VERSION@"
 +		},
 		"Microsoft.@[email protected]": {
 			"kind": "template",
 			"version": "@VERSION@"