From 728c01d307b52afaab5268228237498f19417a58 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 27 Nov 2025 18:11:05 +0100
Subject: [PATCH 1/3] [dotnet] Set the default RuntimeIdentifier for publishing
 scenarios.

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

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props
index 38d185fb27fd..e0894c73eb64 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.props
+++ b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -137,6 +137,12 @@
 
 	</PropertyGroup>
 
+	<!-- Set the default RuntimeIdentifier when publishing -->
+	<PropertyGroup Condition="'$(PublishRuntimeIdentifier)' == ''">
+		<PublishRuntimeIdentifier Condition="'$(_PlatformName)' == 'iOS'">ios-arm64</PublishRuntimeIdentifier>
+		<PublishRuntimeIdentifier Condition="'$(_PlatformName)' == 'tvOS'">tvos-arm64</PublishRuntimeIdentifier>
+	</PropertyGroup>
+
 	<!-- Now that we know the runtime identifier, we can determine if we're building for a simulator -->
 	<PropertyGroup>
 		<_SdkIsSimulator Condition="$(RuntimeIdentifier.Contains('simulator')) Or $(RuntimeIdentifiers.Contains('simulator'))">true</_SdkIsSimulator>

From 2a628e67f82d20cdf4173d98f173600de75fc8cf Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Mon, 19 Jan 2026 12:36:49 +0100
Subject: [PATCH 2/3] override

---
 tests/xharness/Jenkins/TestVariationsFactory.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/xharness/Jenkins/TestVariationsFactory.cs b/tests/xharness/Jenkins/TestVariationsFactory.cs
index 5898ed462cdc..50f4c27c94b9 100644
--- a/tests/xharness/Jenkins/TestVariationsFactory.cs
+++ b/tests/xharness/Jenkins/TestVariationsFactory.cs
@@ -229,6 +229,8 @@ public IEnumerable<T> CreateTestVariations<T> (IEnumerable<T> tests, Func<MSBuil
 						if (publishaot) {
 							clone.Xml.SetProperty ("PublishAot", "true", last: false);
 							clone.Xml.SetProperty ("_IsPublishing", "true", last: false); // quack like "dotnet publish", otherwise PublishAot=true has no effect.
+							if (!string.IsNullOrEmpty (runtime_identifer))
+								clone.Xml.SetProperty ("PublishRuntimeIdentifier", runtime_identifer);
 						}
 						if (!string.IsNullOrEmpty (test_variation)) {
 							clone.Xml.SetProperty ("TestVariation", test_variation);

From 2aa94d07ce983f2b076da3c31764f1c551d98eca Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Tue, 20 Jan 2026 12:05:11 +0100
Subject: [PATCH 3/3] Add test

---
 tests/dotnet/UnitTests/PostBuildTest.cs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/dotnet/UnitTests/PostBuildTest.cs b/tests/dotnet/UnitTests/PostBuildTest.cs
index 197f6bd3de0e..3b2fc76feba1 100644
--- a/tests/dotnet/UnitTests/PostBuildTest.cs
+++ b/tests/dotnet/UnitTests/PostBuildTest.cs
@@ -233,5 +233,22 @@ public void PublishFailureTest (ApplePlatform platform, string runtimeIdentifier
 
 			Assert.That (pkgPath, Does.Not.Exist, "ipa/pkg creation");
 		}
+
+		[TestCase (ApplePlatform.iOS, "ios-arm64")]
+		[TestCase (ApplePlatform.TVOS, "tvos-arm64")]
+		public void DefaultPublishRid (ApplePlatform platform, string expectedRuntimeIdentifier)
+		{
+			var project = "MySimpleApp";
+			var configuration = "Release";
+			Configuration.IgnoreIfIgnoredPlatform (platform);
+			Configuration.AssertRuntimeIdentifiersAvailable (platform, expectedRuntimeIdentifier);
+
+			var project_path = GetProjectPath (project, expectedRuntimeIdentifier, platform: platform, out var appPath, configuration: configuration);
+			Clean (project_path);
+
+			var properties = GetDefaultProperties ();
+			var rv = DotNet.AssertPublish (project_path, properties);
+			Assert.That (appPath, Does.Exist, "App existence");
+		}
 	}
 }