From 9e69ad0e004a4880909c9efeef94b62c52bd2672 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 1 Sep 2023 13:12:19 +0200
Subject: [PATCH 1/2] [NativeAOT] Don't publish any *.o files that comes from
 NativeAOT.

If anything we're supposed to link with *.o files, not publish them, but since
we're currently not handling any *.o files, just explicitly remove them from
the build. This avoids a warning where ComputeBundleLocation would issue a
warning about not knowing what to do with them.
---
 dotnet/targets/Xamarin.Shared.Sdk.targets | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 4b426679bacc..f1a71c393695 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -1727,6 +1727,18 @@
 				            "
 			/>
 
+			<!-- There's no need to ship any *.o files shipped by NativeAOT -->
+			<!-- We need to remove these from ResolvedFileToPublish before calling ComputeBundleLocation, because otherwise we get warnings about no knowing what to do with these files -->
+			<ResolvedFileToPublish
+				Remove="@(ResolvedFileToPublish)"
+				Condition=" '%(ResolvedFileToPublish.AssetType)' == 'native' And
+				            '%(ResolvedFileToPublish.RuntimeIdentifier)' == '$(RuntimeIdentifier)' And
+				            '%(ResolvedFileToPublish.Extension)' == '.o' And
+				            '%(ResolvedFileToPublish.NuGetPackageId)' == '$(_MonoNugetPackageId)' And
+				            '$(_UseNativeAot)' == 'true'
+				            "
+			/>
+
 			<!-- Put the 'createdump' executable in the expected location in the app bundle when using CoreCLR -->
 			<!-- Ref: https://github.com/xamarin/xamarin-macios/issues/11432 -->
 			<_CreateDumpExecutable

From b5e67bf798eb2d97bc14ef8943bab226cfaf918d Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Tue, 5 Sep 2023 08:07:05 +0200
Subject: [PATCH 2/2] Update dotnet/targets/Xamarin.Shared.Sdk.targets

Co-authored-by: Ivan Povazan <55002338+ivanpovazan@users.noreply.github.com>
---
 dotnet/targets/Xamarin.Shared.Sdk.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index f1a71c393695..d8215873a07e 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -1728,7 +1728,7 @@
 			/>
 
 			<!-- There's no need to ship any *.o files shipped by NativeAOT -->
-			<!-- We need to remove these from ResolvedFileToPublish before calling ComputeBundleLocation, because otherwise we get warnings about no knowing what to do with these files -->
+			<!-- We need to remove these from ResolvedFileToPublish before calling ComputeBundleLocation, because otherwise we get warnings about not knowing what to do with these files -->
 			<ResolvedFileToPublish
 				Remove="@(ResolvedFileToPublish)"
 				Condition=" '%(ResolvedFileToPublish.AssetType)' == 'native' And