From 264be7055e0c83d14e9ff8509c28c151d05f070a Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 21 Jun 2023 20:49:58 +0200
Subject: [PATCH] [dotnet] Disable SelfContained for the outer build of a
 universal app build when using NativeAOT.

---
 dotnet/targets/Xamarin.Shared.Sdk.props | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props
index 87d7b777b6..f823bae323 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.props
+++ b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -102,6 +102,20 @@
 		<SelfContained>true</SelfContained>
 	</PropertyGroup>
 
+	<!--
+
+		SelfContained is automatically enabled if PublishAot is true, and that
+		doesn't work properly (restore fails because RuntimeIdentifier is not
+		set) when doing the outer build of a universal apps (when
+		RuntimeIdentifier=''), so manually disable SelfContained in that case.
+
+		This might not be necessary after: https://github.com/dotnet/sdk/pull/33229
+
+	-->
+	<PropertyGroup Condition="'$(PublishAot)' == 'true' And '$(_IsPublishing)' == 'true' And '$(RuntimeIdentifiers)' != '' And '$(RuntimeIdentifier)' == '' And '$(SelfContained)' == ''">
+		<SelfContained>false</SelfContained>
+	</PropertyGroup>
+
 	<!--
 		Enable LLVM by default for mobile release builds.