[dotnet] BIG HACK TO MAKE THINGS WORK

Ref: dotnet/runtime#54996
rolfbjarne · Jul 16, 2021 · 68c9a4e · 68c9a4e
1 parent 9dbd8e2
commit 68c9a4e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/dotnet/Workloads/Microsoft.NET.Sdk.MacCatalyst/WorkloadManifest.targets b/dotnet/Workloads/Microsoft.NET.Sdk.MacCatalyst/WorkloadManifest.targets
@@ -1,6 +1,8 @@
 <Project>
 	<Import Project="Sdk.props" Sdk="Microsoft.MacCatalyst.Sdk" Condition="'$(TargetPlatformIdentifier)' == 'MacCatalyst'" />
 
+	<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64.SDKWorkaround" Condition="'$(TargetPlatformIdentifier)' == 'maccatalyst' And '$(RuntimeIdentifier)' == 'maccatalyst-arm64'" />
+
 	<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">
 		<SdkSupportedTargetPlatformIdentifier Include="maccatalyst" DisplayName="Mac Catalyst" />
 	</ItemGroup>

diff --git a/dotnet/targets/WorkloadManifest.MacCatalyst.template.json b/dotnet/targets/WorkloadManifest.MacCatalyst.template.json
@@ -4,6 +4,7 @@
 		"@PLATFORM_LOWERCASE@": {
 			"description": "Microsoft @PLATFORM@ SDK for .NET",
 			"packs": [
+										"Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64.SDKWorkaround",
 				"Microsoft.@[email protected]",
 				"Microsoft.@[email protected]",
 				"Microsoft.@[email protected]"
@@ -25,6 +26,14 @@
 		"Microsoft.@[email protected]": {
 			"kind": "template",
 			"version": "@VERSION@"
-		}
+		},
+									    "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64.SDKWorkaround": {
+									      "kind": "Sdk",
+									      "version": "@BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION@",
+									      "alias-to": {
+									        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64",
+									        "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64",
+									      }
+									    },
 	}
 }