From c7c04de16b20044fa3f0cac1264847e685fbc333 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 23 Aug 2023 18:10:46 +0200
Subject: [PATCH 01/19] [msbuild] Run the generator on Windows instead of
 remotely.

And add an escape hatch to keep running it remotely if need be.
---
 msbuild/Xamarin.Shared/Xamarin.Shared.targets | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
index ff3f9d6d7194..9efbe8a7d04f 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -1784,6 +1784,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		</_GenerateBindingsDependsOn>
 
 		<_GenerateBindingsDependsOn>
+			_ComputeGenerationLocation;
 			_CompileApiDefinitions;
 			$(_GenerateBindingsDependsOn);
 		</_GenerateBindingsDependsOn>
@@ -1863,7 +1864,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			@(_CompiledApiDefinitionsCompile);"
 		Outputs="$(_CompiledApiDefinitionAssembly);$(_CompiledApiDefinitionDocumentationFile)"
 		DependsOnTargets="_ComputeCompileApiDefinitionsInputs"
-		Condition="'$(IsBindingProject)' == 'true' And '$(DesignTimeBuild)' != 'true'"
+		Condition="'$(IsBindingProject)' == 'true'"
 		>
 
 		<!-- This is a mirror of the method GetCompiledApiBindingsAssembly in BindingTouch.cs where the compilation is done inside bgen -->
@@ -1890,13 +1891,22 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		</Csc>
 	</Target>
 
+	<Target Name="_ComputeGenerationLocation">
+		<PropertyGroup>
+			<BuildBindingProjectLocally Condition="'$(BuildBindingProjectLocally)' == '' And '$(UsingAppleNETSdk)' == 'true'">true</BuildBindingProjectLocally>
+			<BuildBindingProjectLocally Condition="'$(BuildBindingProjectLocally)' == ''">false</BuildBindingProjectLocally>
+			<BindingProjectBuildSessionId Condition="'$(BuildBindingProjectLocally)' != 'true'">$(BuildSessionId)</BindingProjectBuildSessionId>
+		</PropertyGroup>
+	</Target>
+
 	<Target Name="_GenerateBindings"
 		Inputs="$(MSBuildAllProjects);@(ObjcBindingApiDefinition);@(ObjcBindingCoreSource);@(ReferencePath);@(ObjcBindingNativeLibrary)"
 		Outputs="$(_GeneratedSourcesFileList)"
 		DependsOnTargets="$(_GenerateBindingsDependsOn)"
-		Condition="'$(IsBindingProject)' == 'true' And '$(DesignTimeBuild)' != 'true'">
+		Condition="'$(IsBindingProject)' == 'true'">
 
-		<Warning Condition="'$(IsMacEnabled)' != 'true'" Text="It's currently not supported to build a binding project from Windows unless a connection to a Mac is available." />
+		<Error Condition="'$(IsMacEnabled)' != 'true' And '$(BuildBindingProjectLocally)' == 'true' And '$(UsingAppleNETSdk)' != 'true'" Text="It's not supported to build binding project locally on Windows in legacy Xamarin projects. Please upgrade the project to a .NET project, or connect to a remote Mac." />
+		<Error Condition="'$(IsMacEnabled)' != 'true' And '$(BuildBindingProjectLocally)' != 'true'" Text="The property 'BuildBindingProjectLocally' build is disabled, but there's no connection to a remote Mac." />
 
 		<PropertyGroup>
 			<BGenEmitDebugInformation Condition="'$(BGenEmitDebugInformation)' == ''">$(BTouchEmitDebugInformation)</BGenEmitDebugInformation>
@@ -1910,12 +1920,12 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			<BGenReferencePath Include="@(BTouchReferencePath)" />
 		</ItemGroup>
 
-		<MakeDir SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Directories="$(GeneratedSourcesDir)" />
+		<MakeDir SessionId="$(BindingProjectBuildSessionId)" Directories="$(GeneratedSourcesDir)" />
 
 		<!-- Compute some variables on the mac: this task is only executed when building on Windows -->
 		<ComputeRemoteGeneratorProperties
-			SessionId="$(BuildSessionId)"
-			Condition="'$(IsMacEnabled)' == 'true' And '$(BuildSessionId)' != ''"
+			SessionId="$(BindingProjectBuildSessionId)"
+			Condition="'$(IsMacEnabled)' == 'true' And '$(BindingProjectBuildSessionId)' != ''"
 			IntermediateOutputPath="$(IntermediateOutputPath)"
 			TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
 		>
@@ -1927,8 +1937,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		</ComputeRemoteGeneratorProperties>
 
 		<BGen
-			Condition="'$(IsMacEnabled)' == 'true'"
-			SessionId="$(BuildSessionId)"
+			SessionId="$(BindingProjectBuildSessionId)"
 			OutputPath="$(OutputPath)"
 			ObjectiveCLibraries="@(ObjcBindingNativeLibrary)"
 			AdditionalLibPaths="$(AdditionalLibPaths)"

From a1e5a5ac8871384157901774e028b0442c2a56a0 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 25 Aug 2023 14:50:56 +0200
Subject: [PATCH 02/19] [tests] Run the .NET tests involving binding projects
 on Windows.

---
 tests/dotnet/UnitTests/PackTest.cs                       | 3 +++
 tests/dotnet/UnitTests/ProjectTest.cs                    | 9 +++++++++
 .../automation/scripts/run-local-windows-tests.ps1       | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/tests/dotnet/UnitTests/PackTest.cs b/tests/dotnet/UnitTests/PackTest.cs
index aa52a321d141..29e4cba656b2 100644
--- a/tests/dotnet/UnitTests/PackTest.cs
+++ b/tests/dotnet/UnitTests/PackTest.cs
@@ -11,6 +11,7 @@ public class PackTest : TestBaseClass {
 		[TestCase (ApplePlatform.MacCatalyst)]
 		[TestCase (ApplePlatform.TVOS)]
 		[TestCase (ApplePlatform.MacOSX)]
+		[Category ("AllPlatforms")]
 		public void BindingOldStyle (ApplePlatform platform)
 		{
 			var project = "BindingOldStyle";
@@ -97,6 +98,7 @@ public void BindingFrameworksProject (ApplePlatform platform, bool noBindingEmbe
 		[TestCase (ApplePlatform.TVOS, false)]
 		[TestCase (ApplePlatform.MacOSX, true)]
 		[TestCase (ApplePlatform.MacOSX, false)]
+		[Category ("AllPlatforms")]
 		public void BindingXcFrameworksProject (ApplePlatform platform, bool noBindingEmbedding)
 		{
 			var project = "bindings-xcframework-test";
@@ -248,6 +250,7 @@ public void BindingCompressedXcFrameworksProject (ApplePlatform platform, bool c
 		[TestCase (ApplePlatform.MacCatalyst)]
 		[TestCase (ApplePlatform.TVOS)]
 		[TestCase (ApplePlatform.MacOSX)]
+		[Category ("AllPlatforms")]
 		public void LibraryProject (ApplePlatform platform)
 		{
 			var project = "MyClassLibrary";
diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
index 30a9a50e4745..c591891cc3d8 100644
--- a/tests/dotnet/UnitTests/ProjectTest.cs
+++ b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -96,6 +96,7 @@ public void BuildMyCatalystApp (string runtimeIdentifier)
 		[TestCase ("tvOS")]
 		[TestCase ("macOS")]
 		[TestCase ("MacCatalyst")]
+		[Category ("AllPlatforms")]
 		public void BuildMyClassLibrary (string platform)
 		{
 			Configuration.IgnoreIfIgnoredPlatform (platform);
@@ -109,6 +110,7 @@ public void BuildMyClassLibrary (string platform)
 		[TestCase ("tvOS")]
 		[TestCase ("macOS")]
 		[TestCase ("MacCatalyst")]
+		[Category ("AllPlatforms")]
 		public void BuildEmbeddedResourcesTest (string platform)
 		{
 			Configuration.IgnoreIfIgnoredPlatform (platform);
@@ -141,6 +143,7 @@ public void BuildEmbeddedResourcesTest (string platform)
 		[TestCase ("tvOS")]
 		[TestCase ("macOS")]
 		[TestCase ("MacCatalyst")]
+		[Category ("AllPlatforms")]
 		public void BuildFSharpLibraryTest (string platform)
 		{
 			Configuration.IgnoreIfIgnoredPlatform (platform);
@@ -173,6 +176,7 @@ public void BuildFSharpLibraryTest (string platform)
 		[TestCase (ApplePlatform.TVOS)]
 		[TestCase (ApplePlatform.MacOSX)]
 		[TestCase (ApplePlatform.MacCatalyst)]
+		[Category ("AllPlatforms")]
 		public void BuildBindingsTest (ApplePlatform platform)
 		{
 			Configuration.IgnoreIfIgnoredPlatform (platform);
@@ -206,6 +210,7 @@ public void BuildBindingsTest (ApplePlatform platform)
 		[TestCase (ApplePlatform.TVOS)]
 		[TestCase (ApplePlatform.MacOSX)]
 		[TestCase (ApplePlatform.MacCatalyst)]
+		[Category ("AllPlatforms")]
 		public void BuildBindingsTest2 (ApplePlatform platform)
 		{
 			Configuration.IgnoreIfIgnoredPlatform (platform);
@@ -236,6 +241,7 @@ public void BuildBindingsTest2 (ApplePlatform platform)
 		[TestCase ("tvOS", "monotouch")]
 		[TestCase ("macOS", "xammac")]
 		[TestCase ("MacCatalyst", "monotouch")]
+		// [Category ("AllPlatforms")]
 		public void BuildBundledResources (string platform, string prefix)
 		{
 			Configuration.IgnoreIfIgnoredPlatform (platform);
@@ -269,6 +275,7 @@ public void BuildBundledResources (string platform, string prefix)
 		[TestCase ("tvOS")]
 		[TestCase ("macOS")]
 		[TestCase ("MacCatalyst")]
+		// [Category ("AllPlatforms")] // builds a complete app, not just the binding projects, so can only be built on macOS
 		public void BuildInterdependentBindingProjects (string platform)
 		{
 			Configuration.IgnoreIfIgnoredPlatform (platform);
@@ -400,6 +407,7 @@ public void InvalidRuntimeIdentifiers (ApplePlatform platform, string runtimeIde
 		[TestCase (ApplePlatform.iOS, "ios-arm64", true, null, "Release")]
 		[TestCase (ApplePlatform.iOS, "ios-arm64", true, "PublishTrimmed=true;UseInterpreter=true")]
 		[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64;maccatalyst-x64", false)]
+		[Category ("AllPlatforms")]
 		public void IsNotMacBuild (ApplePlatform platform, string runtimeIdentifiers, bool isDeviceBuild, string? extraProperties = null, string configuration = "Debug")
 		{
 			var project = "MySimpleApp";
@@ -1110,6 +1118,7 @@ public void DoubleBuild (ApplePlatform platform, string runtimeIdentifiers)
 		[TestCase (ApplePlatform.TVOS)]
 		[TestCase (ApplePlatform.MacCatalyst)]
 		[TestCase (ApplePlatform.MacOSX)]
+		[Category ("AllPlatforms")]
 		public void LibraryReferencingBindingLibrary (ApplePlatform platform)
 		{
 			var project = "LibraryReferencingBindingLibrary";
diff --git a/tools/devops/automation/scripts/run-local-windows-tests.ps1 b/tools/devops/automation/scripts/run-local-windows-tests.ps1
index 9cdc714ffd1f..349192bae91c 100644
--- a/tools/devops/automation/scripts/run-local-windows-tests.ps1
+++ b/tools/devops/automation/scripts/run-local-windows-tests.ps1
@@ -15,7 +15,7 @@ $Env:XMA_PASSWORD = ""
 & $Env:DOTNET `
     test `
     "$Env:BUILD_SOURCESDIRECTORY/$Env:BUILD_REPOSITORY_TITLE/tests/dotnet/UnitTests/DotNetUnitTests.csproj" `
-    --filter Category=Windows `
+    --filter "Category=Windows|Category=AllPlatforms" `
     --verbosity quiet `
     --settings $Env:BUILD_SOURCESDIRECTORY/$Env:BUILD_REPOSITORY_TITLE/tests/dotnet/Windows/config.runsettings `
     "--results-directory:$Env:BUILD_SOURCESDIRECTORY/$Env:BUILD_REPOSITORY_TITLE/jenkins-results/windows-remote-tests/" `

From de34c5d8c2e49923bebf97772416c3ee3610fe33 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Mon, 28 Aug 2023 17:54:41 +0200
Subject: [PATCH 03/19] [tests] Add a few more generated files to
 package-test-libraries.zip

---
 tests/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Makefile b/tests/Makefile
index 1dec5b2ffcc0..d840914d7387 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -200,6 +200,8 @@ package-test-libraries.zip:
 	$(Q_GEN) rm -f "$@" "$@.tmp"
 	$(Q_GEN) cd $(TOP) && zip -9r --symlinks $(abspath $@).tmp ./tests/test-libraries
 	$(Q_GEN) cd $(TOP) && find tests -regex 'tests/test-libraries/custom-type-assembly/.libs/.*dll' -exec zip -9r --symlinks $(abspath $@).tmp {} +
+	$(Q_GEN) cd $(TOP) && git ls-files -o -- 'tests/*/Info-*plist' | zip -9r --symlinks $(abspath $@).tmp -@
+	$(Q_GEN) cd $(TOP) && git ls-files -o -- 'tests/bindings-test/*.generated.cs' | zip -9r --symlinks $(abspath $@).tmp -@
 	$(Q) mv "$@".tmp "$@"
 
 build-all:

From f05712406fc32c5839f8aa181ae2e375cc752081 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Tue, 29 Aug 2023 12:45:10 +0200
Subject: [PATCH 04/19] [tests] Make code a bit more platform agnostic.

---
 tests/dotnet/UnitTests/ProjectTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
index c591891cc3d8..db886e7ef627 100644
--- a/tests/dotnet/UnitTests/ProjectTest.cs
+++ b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -297,7 +297,7 @@ public void BuildInterdependentBindingProjects (string platform)
 						return false;
 					if (!v.EndsWith ($"{assemblyName}.dll", StringComparison.Ordinal))
 						return false;
-					if (!v.Contains ("/bin/", StringComparison.Ordinal))
+					if (!(v.Contains ("/bin/", StringComparison.Ordinal) || v.Contains ("\\bin\\", StringComparison.Ordinal)))
 						return false;
 					if (!v.Contains ($"{assemblyName}.app", StringComparison.Ordinal))
 						return false;

From d1ec867a68842a91cd582491213bd78eb9dea567 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Mon, 28 Aug 2023 17:54:56 +0200
Subject: [PATCH 05/19] [tests] Add debug spew to track down failures on
 Windows.

---
 tests/dotnet/UnitTests/PackTest.cs    |  11 +++
 tests/dotnet/UnitTests/ProjectTest.cs | 103 ++++++++++++++++++++++----
 2 files changed, 99 insertions(+), 15 deletions(-)

diff --git a/tests/dotnet/UnitTests/PackTest.cs b/tests/dotnet/UnitTests/PackTest.cs
index 29e4cba656b2..eaeec492f683 100644
--- a/tests/dotnet/UnitTests/PackTest.cs
+++ b/tests/dotnet/UnitTests/PackTest.cs
@@ -65,6 +65,9 @@ public void BindingFrameworksProject (ApplePlatform platform, bool noBindingEmbe
 			var files = archive.Entries.Select (v => v.FullName).ToHashSet ();
 			var tfm = platform.ToFrameworkWithPlatformVersion (isExecutable: false);
 			var hasSymlinks = noBindingEmbedding && (platform == ApplePlatform.MacCatalyst || platform == ApplePlatform.MacOSX);
+			Console.WriteLine ($"Got {files.Count ()} files in nupkg:");
+			foreach (var file in files)
+				Console.WriteLine ($"    {file}");
 			if (noBindingEmbedding) {
 				Assert.That (archive.Entries.Count, Is.EqualTo (hasSymlinks ? 6 : 10), $"nupkg file count - {nupkg}");
 			} else {
@@ -131,6 +134,11 @@ public void BindingXcFrameworksProject (ApplePlatform platform, bool noBindingEm
 			var archive = ZipFile.OpenRead (nupkg);
 			var files = archive.Entries.Select (v => v.FullName).ToHashSet ();
 			var tfm = platform.ToFrameworkWithPlatformVersion (isExecutable: false);
+
+			Console.WriteLine ($"Got {files.Count ()} files in nupkg:");
+			foreach (var file in files)
+				Console.WriteLine ($"    {file}");
+
 			Assert.That (archive.Entries.Count, Is.EqualTo (noBindingEmbedding ? 6 : 5), $"nupkg file count - {nupkg}");
 			Assert.That (files, Does.Contain (assemblyName + ".nuspec"), "nuspec");
 			Assert.That (files, Does.Contain ("_rels/.rels"), ".rels");
@@ -268,6 +276,9 @@ public void LibraryProject (ApplePlatform platform)
 
 			var archive = ZipFile.OpenRead (nupkg);
 			var files = archive.Entries.Select (v => v.FullName).ToHashSet ();
+			Console.WriteLine ($"Got {files.Count ()} files in nupkg:");
+			foreach (var file in files)
+				Console.WriteLine ($"    {file}");
 			Assert.That (archive.Entries.Count, Is.EqualTo (5), "nupkg file count");
 			Assert.That (files, Does.Contain (project + ".nuspec"), "nuspec");
 			Assert.That (files, Does.Contain ("_rels/.rels"), ".rels");
diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
index db886e7ef627..af64f28b3532 100644
--- a/tests/dotnet/UnitTests/ProjectTest.cs
+++ b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -155,10 +155,10 @@ public void BuildFSharpLibraryTest (string platform)
 			var result = DotNet.AssertBuild (project_path, verbosity);
 			var lines = BinLog.PrintToLines (result.BinLogPath);
 			// Find the resulting binding assembly from the build log
-			var assemblies = FilterToAssembly (lines, assemblyName);
+			var assemblies = FilterToAssembly (lines, assemblyName).Distinct ();
 			Assert.That (assemblies, Is.Not.Empty, "Assemblies");
 			// Make sure there's no other assembly confusing our logic
-			Assert.That (assemblies.Distinct ().Count (), Is.EqualTo (1), "Unique assemblies");
+			Assert.That (assemblies.Count (), Is.EqualTo (1), $"Unique assemblies:\n\t{string.Join ("\n\t", assemblies)}");
 			var asm = assemblies.First ();
 			Assert.That (asm, Does.Exist, "Assembly existence");
 			// Verify that there's no resources in the assembly
@@ -263,12 +263,14 @@ public void BuildBundledResources (string platform, string prefix)
 
 			// Verify that there's one resource in the binding assembly, and its name
 			var ad = AssemblyDefinition.ReadAssembly (asm, new ReaderParameters { ReadingMode = ReadingMode.Deferred });
-			Assert.That (ad.MainModule.Resources.Count, Is.EqualTo (3), "3 resources");
 			// Sort the resources before we assert, since we don't care about the order, and sorted order makes the asserts simpler.
-			var resources = ad.MainModule.Resources.OrderBy (v => v.Name).ToArray ();
-			Assert.That (resources [0].Name, Is.EqualTo ($"__{prefix}_content_basn3p08__with__loc.png"), $"__{prefix}_content_basn3p08__with__loc.png");
-			Assert.That (resources [1].Name, Is.EqualTo ($"__{prefix}_content_basn3p08.png"), $"__{prefix}_content_basn3p08.png");
-			Assert.That (resources [2].Name, Is.EqualTo ($"__{prefix}_content_xamvideotest.mp4"), $"__{prefix}_content_xamvideotest.mp4");
+			var resources = ad.MainModule.Resources.OrderBy (v => v.Name).Select (v => v.Name).ToArray ();
+			var expectedResources = new string [] {
+				$"__{prefix}_content_basn3p08__with__loc.png",
+				$"__{prefix}_content_basn3p08.png",
+				$"__{prefix}_content_xamvideotest.mp4",
+			};
+			Assert.That (resources, Is.EqualTo (expectedResources), "Resources");
 		}
 
 		[TestCase ("iOS")]
@@ -293,8 +295,15 @@ public void BuildInterdependentBindingProjects (string platform)
 				Where (v => {
 					if (v.Length < 10)
 						return false;
-					if (v [0] != '/')
-						return false;
+					if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
+						if (v [1] != ':') {
+							return false;
+						}
+					} else {
+						if (v [0] != '/') {
+							return false;
+						}
+					}
 					if (!v.EndsWith ($"{assemblyName}.dll", StringComparison.Ordinal))
 						return false;
 					if (!(v.Contains ("/bin/", StringComparison.Ordinal) || v.Contains ("\\bin\\", StringComparison.Ordinal)))
@@ -1135,6 +1144,23 @@ public void LibraryReferencingBindingLibrary (ApplePlatform platform)
 				Path.Combine ("BindingWithUncompressedResourceBundle.resources", "manifest"),
 			};
 
+			switch (platform) {
+			case ApplePlatform.iOS:
+			case ApplePlatform.TVOS:
+				bindingResourcePackages.Add (Path.Combine ("bindings-framework-test.resources", "XStaticArTest.framework", "XStaticArTest"));
+				bindingResourcePackages.Add (Path.Combine ("bindings-framework-test.resources", "XStaticObjectTest.framework", "XStaticObjectTest"));
+				bindingResourcePackages.Add (Path.Combine ("bindings-framework-test.resources", "XTest.framework", "Info.plist"));
+				bindingResourcePackages.Add (Path.Combine ("bindings-framework-test.resources", "XTest.framework", "XTest"));
+				bindingResourcePackages.Add (Path.Combine ("bindings-framework-test.resources", "manifest"));
+				break;
+			case ApplePlatform.MacCatalyst:
+			case ApplePlatform.MacOSX:
+				bindingResourcePackages.Add ("bindings-framework-test.resources.zip");
+				break;
+			}
+
+			DumpFiles (bindir);
+
 			foreach (var brp in bindingResourcePackages) {
 				var file = Path.Combine (bindir, brp);
 				Assert.That (file, Does.Exist, "Existence");
@@ -1272,6 +1298,14 @@ public void LibraryReferencingBindingLibrary (ApplePlatform platform)
 			}
 		}
 
+		void DumpFiles (string dir)
+		{
+			var files = Directory.GetFileSystemEntries (dir, "*", SearchOption.AllDirectories).ToArray ();
+			Console.WriteLine ($"DumpFiles ({dir}): {files.Length} files:");
+			foreach (var file in files)
+				Console.WriteLine ($"    {file}");
+		}
+
 		void AssertAppContents (ApplePlatform platform, string app_directory)
 		{
 			var info_plist_path = GetInfoPListPath (platform, app_directory);
@@ -1299,20 +1333,59 @@ void AssertAppContents (ApplePlatform platform, string app_directory)
 		}
 
 		IEnumerable<string> FilterToAssembly (IEnumerable<string> lines, string assemblyName)
+		{
+			var rv = FilterToAssembly2 (lines, assemblyName, false);
+			if (!rv.Any ()) {
+				Console.WriteLine ($"Could not find any matching lines of {lines.Count ()} lines matching {assemblyName}");
+				rv = FilterToAssembly2 (lines, assemblyName, true);
+			}
+			return rv;
+		}
+
+		IEnumerable<string> FilterToAssembly2 (IEnumerable<string> lines, string assemblyName, bool log)
 		{
 			return lines.
 				Select (v => v.Trim ()).
 				Where (v => {
-					if (v.Length < 10)
+					if (v.Length < 10) {
+						if (log)
+							Console.WriteLine ($"    1: {v}");
 						return false;
-					if (v [0] != '/' && !(char.IsAsciiLetter (v [0]) && v [1] == ':'))
-						return false;
-					if (!v.EndsWith ($"{assemblyName}.dll", StringComparison.Ordinal))
+					}
+					if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
+						if (v [1] != ':') {
+							if (log)
+								Console.WriteLine ($"    2a: {v}");
+							return false;
+						}
+					} else {
+						if (v [0] != '/') {
+							if (log)
+								Console.WriteLine ($"    2b: {v}");
+							return false;
+						}
+					}
+					if (!v.EndsWith ($"{assemblyName}.dll", StringComparison.Ordinal)) {
+						if (log)
+							Console.WriteLine ($"    3: {v}");
 						return false;
-					if (!(v.Contains ("/bin/", StringComparison.Ordinal) || v.Contains ("\\bin\\", StringComparison.Ordinal)))
+					}
+					if (!(v.Contains ("/bin/", StringComparison.Ordinal) || v.Contains ("\\bin\\", StringComparison.Ordinal))) {
+						if (log)
+							Console.WriteLine ($"    4: {v}");
 						return false;
-					if (v.Contains ("/ref/", StringComparison.Ordinal) || v.Contains ("\\ref\\", StringComparison.Ordinal))
+					if (!(v.Contains ("/bin/", StringComparison.Ordinal) || v.Contains ("\\bin\\", StringComparison.Ordinal))) {
+						if (log)
+							Console.WriteLine ($"    5: {v}");
 						return false; // Skip reference assemblies
+					}
+					if (!File.Exists (v)) {
+						if (log)
+							Console.WriteLine ($"    6: {v}");
+						return false;
+					}
+
+					Console.WriteLine ($"    YAY 7: {v}");
 					return true;
 				});
 		}

From ba232ea77542e996b19ca5ca4d6188d591327747 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Mon, 28 Aug 2023 17:58:10 +0200
Subject: [PATCH 06/19] [msbuild] Allow packing on Windows as well.

---
 msbuild/Xamarin.Shared/Xamarin.Shared.targets | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
index 9efbe8a7d04f..cf7ee4b2e2ae 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -190,7 +190,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			<CompressBindingResourcePackage>auto</CompressBindingResourcePackage>
 		</PropertyGroup>
 
-		<CreateBindingResourcePackage Condition="'$(IsMacEnabled)' == 'true'"
+		<CreateBindingResourcePackage
 			SessionId="$(BuildSessionId)"
 			NativeReferences="@(NativeReference)"
 			BindingResourcePath="$(BindingResourcePath)"
@@ -201,13 +201,11 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 
 		<MakeDir
 			SessionId="$(BuildSessionId)"
-			Condition="'$(IsMacEnabled)' == 'true'"
 			Directories="$([System.IO.Path]::GetDirectoryName($(BindingResourcePath)))"
 		/>
 
 		<Touch
 			SessionId="$(BuildSessionId)"
-			Condition="'$(IsMacEnabled)' == 'true'"
 			AlwaysCreate="true"
 			Files="$(BindingResourcePath).stamp"
 			>
@@ -245,7 +243,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_IncludeBindingResourcesInNuGetPackage</TargetsForTfmSpecificContentInPackage>
 	</PropertyGroup>
 	<Target Name="_IncludeBindingResourcesInNuGetPackage"
-		Condition="'$(IsMacEnabled)' == 'true' And '$(IncludeBuildOutput)' != 'false'"
+		Condition="'$(IncludeBuildOutput)' != 'false'"
 	>
 		<PropertyGroup>
 			<_HasOldStyleBindingItems Condition="@(ObjcBindingNativeLibrary->Count()) > 0">true</_HasOldStyleBindingItems>

From 964ba6ec679e46a60c77dc3c50c166d6000ddd5e Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Tue, 29 Aug 2023 12:34:02 +0200
Subject: [PATCH 07/19] [tools] Add Windows support to PathUtils.IsSymlink.

---
 msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx         | 4 ++++
 .../Tasks/CreateBindingResourcePackage.cs                    | 5 ++++-
 tools/common/PathUtils.cs                                    | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx b/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx
index 32cd700a7c59..41d34a42d204 100644
--- a/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx
+++ b/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx
@@ -1662,4 +1662,8 @@
     <data name="E7136" xml:space="preserve">
         <value>Unknown resource type: {1}.</value>
     </data>
+
+    <data name="E7120_TEMP" xml:space="preserve">
+        <value>Can't process the native reference '{0}' on this platform because it is or contains a symlink.</value>
+    </data>
 </root>
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateBindingResourcePackage.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateBindingResourcePackage.cs
index 41b74c9d6553..bdd15da8d671 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateBindingResourcePackage.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateBindingResourcePackage.cs
@@ -130,8 +130,11 @@ public override bool Execute ()
 		static bool ContainsSymlinks (ITaskItem [] items)
 		{
 			foreach (var item in items) {
-				if (PathUtils.IsSymlinkOrContainsSymlinks (item.ItemSpec))
+				if (PathUtils.IsSymlinkOrContainsSymlinks (item.ItemSpec)) {
+					if (Environment.OSVersion.Platform == PlatformID.Win32NT)
+						Log.LogError (MSBStrings.E7120_TEMP /* Can't process the native reference '{0}' on this platform because it is or contains a symlink. */, item.ItemSpec);
 					return true;
+				}
 			}
 
 			return false;
diff --git a/tools/common/PathUtils.cs b/tools/common/PathUtils.cs
index f3bb302c3a02..19dcc31df8fe 100644
--- a/tools/common/PathUtils.cs
+++ b/tools/common/PathUtils.cs
@@ -348,6 +348,10 @@ static int lstat (string path, out Stat buf)
 
 		public static bool IsSymlink (string file)
 		{
+			if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
+				var attr = File.GetAttributes (file);
+				return attr.HasFlag (FileAttributes.ReparsePoint);
+			}
 			Stat buf;
 			var rv = lstat (file, out buf);
 			if (rv != 0)

From f2583ff5995a955f750face2310cc976def9fdd0 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Tue, 29 Aug 2023 17:24:34 +0200
Subject: [PATCH 08/19] [tools] Add Windows support to
 FileCopier.TryUpdateDirectory.

---
 tools/common/FileCopier.cs | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tools/common/FileCopier.cs b/tools/common/FileCopier.cs
index 9c5de9884744..1b4ab8205c3d 100644
--- a/tools/common/FileCopier.cs
+++ b/tools/common/FileCopier.cs
@@ -135,6 +135,38 @@ static void UpdateDirectory (string source, string target)
 		}
 
 		static bool TryUpdateDirectory (string source, string target, out int errno)
+		{
+			var windows = Environment.OSVersion.Platform == PlatformID.Win32NT;
+			if (windows)
+				return TryUpdateDirectoryWindows (source, target, out errno);
+			return TryUpdateDirectoryMacOS (source, target, out errno);
+		}
+
+		static bool TryUpdateDirectoryWindows (string source, string target, out int errno)
+		{
+			errno = 0;
+			Directory.CreateDirectory (target);
+
+			var rv = true;
+			var attr = File.GetAttributes (source);
+			var dir = new DirectoryInfo (source);
+			foreach (var sourceFile in dir.GetFiles ()) {
+				var sourcePath = Path.Combine (source, sourceFile.Name);
+				var targetPath = Path.Combine (target, sourceFile.Name);
+				if (!IsUptodate (sourcePath, targetPath)) {
+					sourceFile.CopyTo (targetPath, true);
+					Log (1, "Copied {0} to {1}", sourcePath, targetPath);
+				} else {
+					Log (3, "Target '{0}' is up-to-date", targetPath);
+				}
+			}
+			foreach (var subdir in dir.GetDirectories ()) {
+				rv &= TryUpdateDirectoryWindows (Path.Combine (source, subdir.Name), Path.Combine (target, subdir.Name), out errno);
+			}
+			return rv;
+		}
+
+		static bool TryUpdateDirectoryMacOS (string source, string target, out int errno)
 		{
 			Directory.CreateDirectory (target);
 

From 7dc0187986835e23ddc003a01a19e98b72f13394 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 30 Aug 2023 11:30:34 +0200
Subject: [PATCH 09/19] [tests] Don't use symlinks, it doesn't work on Windows
 :/

Instead copy each file 4 times, and add a notice to remember to update the
other identical files if any of them are modified.
---
 .../BindingWithDefaultCompileInclude/ApiDefinition.cs  |  7 -------
 .../MacCatalyst/ApiDefinition.cs                       |  9 ++++++++-
 .../MacCatalyst/MyClass.cs                             | 10 +++++++++-
 .../MacCatalyst/StructsAndEnums.cs                     |  8 +++++++-
 .../dotnet/BindingWithDefaultCompileInclude/MyClass.cs |  8 --------
 .../StructsAndEnums.cs                                 |  6 ------
 .../iOS/ApiDefinition.cs                               |  9 ++++++++-
 .../BindingWithDefaultCompileInclude/iOS/MyClass.cs    | 10 +++++++++-
 .../iOS/StructsAndEnums.cs                             |  8 +++++++-
 .../macOS/ApiDefinition.cs                             |  9 ++++++++-
 .../BindingWithDefaultCompileInclude/macOS/MyClass.cs  | 10 +++++++++-
 .../macOS/StructsAndEnums.cs                           |  8 +++++++-
 .../tvOS/ApiDefinition.cs                              |  9 ++++++++-
 .../BindingWithDefaultCompileInclude/tvOS/MyClass.cs   | 10 +++++++++-
 .../tvOS/StructsAndEnums.cs                            |  8 +++++++-
 15 files changed, 96 insertions(+), 33 deletions(-)
 delete mode 100644 tests/dotnet/BindingWithDefaultCompileInclude/ApiDefinition.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/ApiDefinition.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/MyClass.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/StructsAndEnums.cs
 delete mode 100644 tests/dotnet/BindingWithDefaultCompileInclude/MyClass.cs
 delete mode 100644 tests/dotnet/BindingWithDefaultCompileInclude/StructsAndEnums.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/iOS/ApiDefinition.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/iOS/MyClass.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/iOS/StructsAndEnums.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/macOS/ApiDefinition.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/macOS/MyClass.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/macOS/StructsAndEnums.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/tvOS/ApiDefinition.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/tvOS/MyClass.cs
 mode change 120000 => 100644 tests/dotnet/BindingWithDefaultCompileInclude/tvOS/StructsAndEnums.cs

diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/ApiDefinition.cs b/tests/dotnet/BindingWithDefaultCompileInclude/ApiDefinition.cs
deleted file mode 100644
index 57b6c66be50f..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/ApiDefinition.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-using Foundation;
-
-namespace MyApiDefinition {
-	[BaseType (typeof (NSObject))]
-	interface MyNativeClass {
-	}
-}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/ApiDefinition.cs b/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/ApiDefinition.cs
deleted file mode 120000
index f0f219820ed4..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/ApiDefinition.cs
+++ /dev/null
@@ -1 +0,0 @@
-../ApiDefinition.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/ApiDefinition.cs b/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/ApiDefinition.cs
new file mode 100644
index 000000000000..f3a6430670fa
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/ApiDefinition.cs
@@ -0,0 +1,8 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+using Foundation;
+
+namespace MyApiDefinition {
+	[BaseType (typeof (NSObject))]
+	interface MyNativeClass {
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/MyClass.cs b/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/MyClass.cs
deleted file mode 120000
index a8c5f5dd7287..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/MyClass.cs
+++ /dev/null
@@ -1 +0,0 @@
-../MyClass.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/MyClass.cs b/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/MyClass.cs
new file mode 100644
index 000000000000..69de7b469b7c
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/MyClass.cs
@@ -0,0 +1,9 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+using System;
+namespace MyClassLibrary {
+	public class MyClass {
+		public MyClass ()
+		{
+		}
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/StructsAndEnums.cs b/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/StructsAndEnums.cs
deleted file mode 120000
index 082d90ff1d72..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/StructsAndEnums.cs
+++ /dev/null
@@ -1 +0,0 @@
-../StructsAndEnums.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/StructsAndEnums.cs b/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/StructsAndEnums.cs
new file mode 100644
index 000000000000..891d49cd9ecb
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/MacCatalyst/StructsAndEnums.cs
@@ -0,0 +1,7 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+namespace MyClassLibrary {
+	public struct MyStruct {
+		public int A;
+		public int B;
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/MyClass.cs b/tests/dotnet/BindingWithDefaultCompileInclude/MyClass.cs
deleted file mode 100644
index 89ef0fec5fc9..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/MyClass.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-namespace MyClassLibrary {
-	public class MyClass {
-		public MyClass ()
-		{
-		}
-	}
-}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/StructsAndEnums.cs b/tests/dotnet/BindingWithDefaultCompileInclude/StructsAndEnums.cs
deleted file mode 100644
index 6e8191ddb814..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/StructsAndEnums.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-namespace MyClassLibrary {
-	public struct MyStruct {
-		public int A;
-		public int B;
-	}
-}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/iOS/ApiDefinition.cs b/tests/dotnet/BindingWithDefaultCompileInclude/iOS/ApiDefinition.cs
deleted file mode 120000
index f0f219820ed4..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/iOS/ApiDefinition.cs
+++ /dev/null
@@ -1 +0,0 @@
-../ApiDefinition.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/iOS/ApiDefinition.cs b/tests/dotnet/BindingWithDefaultCompileInclude/iOS/ApiDefinition.cs
new file mode 100644
index 000000000000..f3a6430670fa
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/iOS/ApiDefinition.cs
@@ -0,0 +1,8 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+using Foundation;
+
+namespace MyApiDefinition {
+	[BaseType (typeof (NSObject))]
+	interface MyNativeClass {
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/iOS/MyClass.cs b/tests/dotnet/BindingWithDefaultCompileInclude/iOS/MyClass.cs
deleted file mode 120000
index a8c5f5dd7287..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/iOS/MyClass.cs
+++ /dev/null
@@ -1 +0,0 @@
-../MyClass.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/iOS/MyClass.cs b/tests/dotnet/BindingWithDefaultCompileInclude/iOS/MyClass.cs
new file mode 100644
index 000000000000..69de7b469b7c
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/iOS/MyClass.cs
@@ -0,0 +1,9 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+using System;
+namespace MyClassLibrary {
+	public class MyClass {
+		public MyClass ()
+		{
+		}
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/iOS/StructsAndEnums.cs b/tests/dotnet/BindingWithDefaultCompileInclude/iOS/StructsAndEnums.cs
deleted file mode 120000
index 082d90ff1d72..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/iOS/StructsAndEnums.cs
+++ /dev/null
@@ -1 +0,0 @@
-../StructsAndEnums.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/iOS/StructsAndEnums.cs b/tests/dotnet/BindingWithDefaultCompileInclude/iOS/StructsAndEnums.cs
new file mode 100644
index 000000000000..891d49cd9ecb
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/iOS/StructsAndEnums.cs
@@ -0,0 +1,7 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+namespace MyClassLibrary {
+	public struct MyStruct {
+		public int A;
+		public int B;
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/macOS/ApiDefinition.cs b/tests/dotnet/BindingWithDefaultCompileInclude/macOS/ApiDefinition.cs
deleted file mode 120000
index f0f219820ed4..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/macOS/ApiDefinition.cs
+++ /dev/null
@@ -1 +0,0 @@
-../ApiDefinition.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/macOS/ApiDefinition.cs b/tests/dotnet/BindingWithDefaultCompileInclude/macOS/ApiDefinition.cs
new file mode 100644
index 000000000000..f3a6430670fa
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/macOS/ApiDefinition.cs
@@ -0,0 +1,8 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+using Foundation;
+
+namespace MyApiDefinition {
+	[BaseType (typeof (NSObject))]
+	interface MyNativeClass {
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/macOS/MyClass.cs b/tests/dotnet/BindingWithDefaultCompileInclude/macOS/MyClass.cs
deleted file mode 120000
index a8c5f5dd7287..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/macOS/MyClass.cs
+++ /dev/null
@@ -1 +0,0 @@
-../MyClass.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/macOS/MyClass.cs b/tests/dotnet/BindingWithDefaultCompileInclude/macOS/MyClass.cs
new file mode 100644
index 000000000000..69de7b469b7c
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/macOS/MyClass.cs
@@ -0,0 +1,9 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+using System;
+namespace MyClassLibrary {
+	public class MyClass {
+		public MyClass ()
+		{
+		}
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/macOS/StructsAndEnums.cs b/tests/dotnet/BindingWithDefaultCompileInclude/macOS/StructsAndEnums.cs
deleted file mode 120000
index 082d90ff1d72..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/macOS/StructsAndEnums.cs
+++ /dev/null
@@ -1 +0,0 @@
-../StructsAndEnums.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/macOS/StructsAndEnums.cs b/tests/dotnet/BindingWithDefaultCompileInclude/macOS/StructsAndEnums.cs
new file mode 100644
index 000000000000..891d49cd9ecb
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/macOS/StructsAndEnums.cs
@@ -0,0 +1,7 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+namespace MyClassLibrary {
+	public struct MyStruct {
+		public int A;
+		public int B;
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/ApiDefinition.cs b/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/ApiDefinition.cs
deleted file mode 120000
index f0f219820ed4..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/ApiDefinition.cs
+++ /dev/null
@@ -1 +0,0 @@
-../ApiDefinition.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/ApiDefinition.cs b/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/ApiDefinition.cs
new file mode 100644
index 000000000000..f3a6430670fa
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/ApiDefinition.cs
@@ -0,0 +1,8 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+using Foundation;
+
+namespace MyApiDefinition {
+	[BaseType (typeof (NSObject))]
+	interface MyNativeClass {
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/MyClass.cs b/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/MyClass.cs
deleted file mode 120000
index a8c5f5dd7287..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/MyClass.cs
+++ /dev/null
@@ -1 +0,0 @@
-../MyClass.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/MyClass.cs b/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/MyClass.cs
new file mode 100644
index 000000000000..69de7b469b7c
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/MyClass.cs
@@ -0,0 +1,9 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+using System;
+namespace MyClassLibrary {
+	public class MyClass {
+		public MyClass ()
+		{
+		}
+	}
+}
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/StructsAndEnums.cs b/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/StructsAndEnums.cs
deleted file mode 120000
index 082d90ff1d72..000000000000
--- a/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/StructsAndEnums.cs
+++ /dev/null
@@ -1 +0,0 @@
-../StructsAndEnums.cs
\ No newline at end of file
diff --git a/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/StructsAndEnums.cs b/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/StructsAndEnums.cs
new file mode 100644
index 000000000000..891d49cd9ecb
--- /dev/null
+++ b/tests/dotnet/BindingWithDefaultCompileInclude/tvOS/StructsAndEnums.cs
@@ -0,0 +1,7 @@
+/* If this file is modified, remember to copy the changes the corresponding file for all the other platforms */
+namespace MyClassLibrary {
+	public struct MyStruct {
+		public int A;
+		public int B;
+	}
+}

From 64d6c2a220fcf69d681b95752326be208fc2c514 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 30 Aug 2023 11:37:09 +0200
Subject: [PATCH 10/19] [tools] Improve/fix Windows support in
 TryUpdateDirectory.

---
 tools/common/FileCopier.cs | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/tools/common/FileCopier.cs b/tools/common/FileCopier.cs
index 1b4ab8205c3d..64194247f9f3 100644
--- a/tools/common/FileCopier.cs
+++ b/tools/common/FileCopier.cs
@@ -149,23 +149,33 @@ static bool TryUpdateDirectoryWindows (string source, string target, out int err
 
 			var rv = true;
 			var attr = File.GetAttributes (source);
-			var dir = new DirectoryInfo (source);
-			foreach (var sourceFile in dir.GetFiles ()) {
-				var sourcePath = Path.Combine (source, sourceFile.Name);
-				var targetPath = Path.Combine (target, sourceFile.Name);
-				if (!IsUptodate (sourcePath, targetPath)) {
-					sourceFile.CopyTo (targetPath, true);
-					Log (1, "Copied {0} to {1}", sourcePath, targetPath);
-				} else {
-					Log (3, "Target '{0}' is up-to-date", targetPath);
+			if (attr.HasFlag (FileAttributes.Directory)) {
+				var dir = new DirectoryInfo (source);
+				foreach (var sourceFile in dir.GetFiles ()) {
+					var sourcePath = Path.Combine (source, sourceFile.Name);
+					var targetPath = Path.Combine (target, sourceFile.Name);
+					CopyIfNeeded (sourcePath, targetPath);
 				}
-			}
-			foreach (var subdir in dir.GetDirectories ()) {
-				rv &= TryUpdateDirectoryWindows (Path.Combine (source, subdir.Name), Path.Combine (target, subdir.Name), out errno);
+				foreach (var subdir in dir.GetDirectories ()) {
+					rv &= TryUpdateDirectoryWindows (Path.Combine (source, subdir.Name), Path.Combine (target, subdir.Name), out errno);
+				}
+			} else {
+				var targetPath = Path.Combine (target, Path.GetFileName (source));
+				CopyIfNeeded (source, targetPath);
 			}
 			return rv;
 		}
 
+		static void CopyIfNeeded (string source, string target)
+		{
+			if (IsUptodate (source, target)) {
+				Log (3, "Target '{0}' is up-to-date", target);
+			} else {
+				File.Copy (source, target, true);
+				Log (1, "Copied {0} to {1}", source, target);
+			}
+		}
+
 		static bool TryUpdateDirectoryMacOS (string source, string target, out int errno)
 		{
 			Directory.CreateDirectory (target);

From 2ecc7bcf9fd900df54f1d6d5c2140c7b2279ef0e Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 30 Aug 2023 15:03:30 +0200
Subject: [PATCH 11/19] [msbuild] Create binding resource packages on Windows.

---
 msbuild/Xamarin.Shared/Xamarin.Shared.targets | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
index cf7ee4b2e2ae..d309eb83f3c0 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -151,8 +151,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			<_FileNativeReference Include="@(NativeReference)" Condition="'%(Extension)' != '.framework' And '%(Extension)' != '.xcframework' And '%(Extension)' != '.zip'" />
 		</ItemGroup>
 		<ResolveNativeReferences
-			SessionId="$(BuildSessionId)"
-			Condition="('$(IsMacEnabled)' == 'true' Or '$(IsHotRestartBuild)' == 'true') And '$(IsBindingProject)' != 'true'"
+			Condition="'$(IsBindingProject)' != 'true'"
 			Architectures="$(TargetArchitectures)"
 			FrameworksDirectory="$(_AppFrameworksRelativePath)"
 			IntermediateOutputPath="$(DeviceSpecificIntermediateOutputPath)"
@@ -191,7 +190,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		</PropertyGroup>
 
 		<CreateBindingResourcePackage
-			SessionId="$(BuildSessionId)"
 			NativeReferences="@(NativeReference)"
 			BindingResourcePath="$(BindingResourcePath)"
 			Compress="$(CompressBindingResourcePackage)"
@@ -200,12 +198,10 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		</CreateBindingResourcePackage>
 
 		<MakeDir
-			SessionId="$(BuildSessionId)"
 			Directories="$([System.IO.Path]::GetDirectoryName($(BindingResourcePath)))"
 		/>
 
 		<Touch
-			SessionId="$(BuildSessionId)"
 			AlwaysCreate="true"
 			Files="$(BindingResourcePath).stamp"
 			>

From 44fd7549890239d4533d8a768dc274d7b74910c9 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 30 Aug 2023 15:11:53 +0200
Subject: [PATCH 12/19] [msbuild] Do more stuff from Windows.

---
 msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
index 6d467ab74dbc..59e2bd5a9969 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
@@ -93,11 +93,9 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 	</Target>
 
 	<Target Name="_CompressNativeFrameworkResources" Inputs="@(_NativeFrameworkResource)" Outputs="%(_NativeFrameworkResource.ZipFile)" DependsOnTargets="_CollectNativeFrameworkResources">
-		<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="%(_NativeFrameworkResource.ZipFile)" />
+		<Delete Files="%(_NativeFrameworkResource.ZipFile)" />
 
 		<Zip
-			SessionId="$(BuildSessionId)"
-			Condition="'$(IsMacEnabled)' == 'true'"
 			ZipPath="$(ZipPath)"
 			Recursive="true"
 			Symlinks="true"
@@ -116,8 +114,6 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 
 	<Target Name="_PrepareNativeReferences" Condition="'$(DesignTimeBuild)' != 'true'" DependsOnTargets="_SanitizeNativeReferences">
 		<PrepareNativeReferences
-			Condition="'$(IsMacEnabled)' == 'true'"
-			SessionId="$(BuildSessionId)"
 			IntermediateOutputPath="$(IntermediateOutputPath)"
 			NativeReferences="@(NativeReference)"
 		>

From d2d857d7725c80fc76af24617c86a56b1b70cc29 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 31 Aug 2023 07:51:34 +0200
Subject: [PATCH 13/19] [dotnet] Compute SdkIsSimulator from the
 RuntimeIdentifier.

---
 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 badf92982b65..71c022b14afa 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.props
+++ b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -203,4 +203,10 @@
 		-->
 		<CustomNativeMain Condition="'$(OutputType)' == 'Exe'">true</CustomNativeMain>
 	</PropertyGroup>
+
+	<!-- Compute _SdkIsSimulator from the RuntimeIdentifier -->
+	<PropertyGroup>
+		<_SdkIsSimulator Condition="'$(RuntimeIdentifier)' != '' And '$(_SdkIsSimulator)' == ''">$(RuntimeIdentifier.Contains('simulator'))</_SdkIsSimulator>
+		<_SdkIsSimulator Condition="'$(RuntimeIdentifiers)' != '' And '$(_SdkIsSimulator)' == ''">$(RuntimeIdentifiers.Contains('simulator'))</_SdkIsSimulator>
+	</PropertyGroup>
 </Project>

From d816ab5136661fce47ab88a7960c31bce543a0a6 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 31 Aug 2023 07:51:46 +0200
Subject: [PATCH 14/19] [tests] Improve logic to find assemblies in binlogs.

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

diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
index af64f28b3532..875d8cc97641 100644
--- a/tests/dotnet/UnitTests/ProjectTest.cs
+++ b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -310,6 +310,8 @@ public void BuildInterdependentBindingProjects (string platform)
 						return false;
 					if (!v.Contains ($"{assemblyName}.app", StringComparison.Ordinal))
 						return false;
+					if (!File.Exists (v))
+						return false;
 					return true;
 				});
 			Assert.That (assemblies, Is.Not.Empty, "Assemblies");

From f97744afd15091288521185a674444b964586a1b Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 13 Sep 2023 18:50:18 +0200
Subject: [PATCH 15/19] [msbuild] Implement creating binding resource package
 using built-in API for use on Windows.

---
 msbuild/Xamarin.MacDev.Tasks/Decompress.cs    | 130 ++++++++++++++++++
 .../Tasks/CreateBindingResourcePackage.cs     |  19 +--
 2 files changed, 135 insertions(+), 14 deletions(-)

diff --git a/msbuild/Xamarin.MacDev.Tasks/Decompress.cs b/msbuild/Xamarin.MacDev.Tasks/Decompress.cs
index 4f2f8d5c0636..d11bfb0af74c 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Decompress.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Decompress.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.IO.Compression;
+using System.Linq;
 using System.Reflection;
 using System.Threading;
 
@@ -12,6 +13,7 @@
 using Xamarin.Bundler;
 using Xamarin.Localization.MSBuild;
 using Xamarin.MacDev.Tasks;
+using Xamarin.Utils;
 
 #nullable enable
 
@@ -222,6 +224,134 @@ static bool TryDecompressUsingSystemIOCompression (TaskLoggingHelper log, string
 			return rv;
 		}
 
+		/// <summary>
+		/// Compresses the specified resources (may be either files or directories) into a zip file.
+		///
+		/// Fails if:
+		/// * The resources is or contains a symlink and we're executing on Windows.
+		/// * The resources isn't found inside the zip file.
+		/// </summary>
+		/// <param name="log"></param>
+		/// <param name="zip">The zip to create</param>
+		/// <param name="resources">The files or directories to compress.</param>
+		/// <returns></returns>
+		public static bool TryCompress (TaskLoggingHelper log, string zip, IEnumerable<string> resources, bool overwrite, string workingDirectory, bool maxCompression = false)
+		{
+			// We use 'zip' to compress on !Windows, and System.IO.Compression to extract on Windows.
+			// This is because System.IO.Compression doesn't handle symlinks correctly, so we can only use
+			// it on Windows. It's also possible to set the XAMARIN_USE_SYSTEM_IO_COMPRESSION=1 environment
+			// variable to force using System.IO.Compression on !Windows, which is particularly useful when
+			// testing the System.IO.Compression implementation locally (with the caveat that if the resources
+			// to compress has symlinks, it may not work).
+
+			if (overwrite) {
+				if (File.Exists (zip)) {
+					log.LogMessage (MessageImportance.Low, "Replacing zip file {0} with {1}", zip, string.Join (", ", resources));
+					File.Delete (zip);
+				} else {
+					log.LogMessage (MessageImportance.Low, "Creating zip file {0} with {1}", zip, string.Join (", ", resources));
+				}
+			} else {
+				if (File.Exists (zip)) {
+					log.LogMessage (MessageImportance.Low, "Updating zip file {0} with {1}", zip, string.Join (", ", resources));
+				} else {
+					log.LogMessage (MessageImportance.Low, "Creating new zip file {0} with {1}", zip, string.Join (", ", resources));
+				}
+			}
+
+			var zipdir = Path.GetDirectoryName (zip);
+			if (!string.IsNullOrEmpty (zipdir))
+				Directory.CreateDirectory (zipdir);
+
+			bool rv;
+			if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
+				rv = TryCompressUsingSystemIOCompression (log, zip, resources, workingDirectory, maxCompression);
+			} else if (!string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("XAMARIN_USE_SYSTEM_IO_COMPRESSION"))) {
+				rv = TryCompressUsingSystemIOCompression (log, zip, resources, workingDirectory, maxCompression);
+			} else {
+				rv = TryCompressUsingZip (log, zip, resources, workingDirectory, maxCompression);
+			}
+
+			return rv;
+		}
+
+		// Will add to an existing zip file (not replace)
+		static bool TryCompressUsingZip (TaskLoggingHelper log, string zip, IEnumerable<string> resources, string workingDirectory, bool maxCompression)
+		{
+			var zipArguments = new List<string> ();
+			if (maxCompression)
+				zipArguments.Add ("-9");
+			zipArguments.Add ("-r");
+			zipArguments.Add ("-y");
+			zipArguments.Add (zip);
+
+			foreach (var resource in resources) {
+				var fullPath = Path.GetFullPath (resource);
+				var relativePath = PathUtils.AbsoluteToRelative (workingDirectory, fullPath);
+				zipArguments.Add (relativePath);
+			}
+			var rv = XamarinTask.ExecuteAsync (log, "zip", zipArguments, workingDirectory: workingDirectory).Result;
+			log.LogMessage (MessageImportance.Low, "Updated {0} with {1}: {2}", zip, string.Join (", ", resources), rv.ExitCode == 0);
+			return rv.ExitCode == 0;
+		}
+
+#if NET
+		const CompressionLevel SmallestCompressionLevel = CompressionLevel.SmallestSize;
+#else
+		const CompressionLevel SmallestCompressionLevel = CompressionLevel.Optimal;
+#endif
+
+		// Will add to an existing zip file (not replace)
+		static bool TryCompressUsingSystemIOCompression (TaskLoggingHelper log, string zip, IEnumerable<string> resources, string workingDirectory, bool maxCompression)
+		{
+			var rv = true;
+
+			workingDirectory = Path.GetFullPath (workingDirectory);
+
+			var resourcePaths = resources.Select ((v) => Path.Combine (workingDirectory, v)).ToList ();
+			foreach (var resource in resourcePaths) {
+				if (!resource.StartsWith (workingDirectory, StringComparison.Ordinal))
+					throw new InvalidOperationException ($"The resource to compress '{resource}' must be inside the working directory '{workingDirectory}'");
+			}
+
+			using var archive = ZipFile.Open (zip, File.Exists (zip) ? ZipArchiveMode.Update : ZipArchiveMode.Create);
+
+			var rootDirLength = workingDirectory.Length;
+			foreach (var resource in resourcePaths) {
+				if (Directory.Exists (resource)) {
+					var entries = Directory.GetFileSystemEntries (resource, "*", SearchOption.AllDirectories);
+					var entriesWithZipName = entries.Select (v => new { Path = v, ZipName = v.Substring (rootDirLength) });
+					foreach (var entry in entriesWithZipName) {
+						if (Directory.Exists (entry.Path)) {
+							if (entries.Where (v => v.StartsWith (entry.Path, StringComparison.Ordinal)).Count () == 1) {
+								// this is a directory with no files inside, we need to create an entry with a trailing directory separator.
+								archive.CreateEntry (entry.ZipName + zipDirectorySeparator);
+							}
+						} else {
+							WriteFileToZip (log, archive, entry.Path, entry.ZipName, maxCompression);
+						}
+					}
+				} else if (File.Exists (resource)) {
+					var zipName = resource.Substring (rootDirLength);
+					WriteFileToZip (log, archive, resource, zipName, maxCompression);
+				} else {
+					throw new FileNotFoundException (resource);
+				}
+				log.LogMessage (MessageImportance.Low, "Updated {0} with {1}", zip, resource);
+			}
+
+			return rv;
+		}
+
+		static void WriteFileToZip (TaskLoggingHelper log, ZipArchive archive, string path, string zipName, bool maxCompression)
+		{
+			var zipEntry = archive.CreateEntry (zipName, maxCompression ? SmallestCompressionLevel : CompressionLevel.Optimal);
+			using var fs = File.OpenRead (path);
+			using var zipStream = zipEntry.Open ();
+			fs.CopyTo (zipStream);
+			log.LogMessage (MessageImportance.Low, $"Compressed {path} into the zip file as {zipName}");
+		}
+
 		static int GetExternalAttributes (ZipArchiveEntry self)
 		{
 			// The ZipArchiveEntry.ExternalAttributes property is available in .NET 4.7.2 (which we need to target for builds on Windows) and .NET 5+, but not netstandard2.0 (which is the latest netstandard .NET 4.7.2 supports).
diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateBindingResourcePackage.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateBindingResourcePackage.cs
index bdd15da8d671..4de4df49ff23 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateBindingResourcePackage.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/CreateBindingResourcePackage.cs
@@ -90,19 +90,10 @@ public override bool Execute ()
 				filesToZip.Add (manifestPath);
 
 				foreach (var nativeRef in filesToZip) {
-					var zipArguments = new List<string> ();
-					zipArguments.Add ("-9");
-					zipArguments.Add ("-r");
-					zipArguments.Add ("-y");
-					zipArguments.Add (zipFile);
-
-					var fullPath = Path.GetFullPath (nativeRef);
-					var workingDirectory = Path.GetDirectoryName (fullPath);
-					zipArguments.Add (Path.GetFileName (fullPath));
-					ExecuteAsync ("zip", zipArguments, workingDirectory: workingDirectory).Wait ();
-
-					packagedFiles.Add (zipFile);
+					var workingDirectory = Path.GetDirectoryName (nativeRef);
+					CompressionHelper.TryCompress (Log, zipFile, new string [] { nativeRef }, false, workingDirectory, true);
 				}
+				packagedFiles.Add (zipFile);
 			} else {
 				var bindingResourcePath = BindingResourcePath;
 				Log.LogMessage (MSBStrings.M0121, bindingResourcePath);
@@ -127,12 +118,12 @@ public override bool Execute ()
 			return !Log.HasLoggedErrors;
 		}
 
-		static bool ContainsSymlinks (ITaskItem [] items)
+		bool ContainsSymlinks (ITaskItem [] items)
 		{
 			foreach (var item in items) {
 				if (PathUtils.IsSymlinkOrContainsSymlinks (item.ItemSpec)) {
 					if (Environment.OSVersion.Platform == PlatformID.Win32NT)
-						Log.LogError (MSBStrings.E7120_TEMP /* Can't process the native reference '{0}' on this platform because it is or contains a symlink. */, item.ItemSpec);
+						Log.LogError (MSBStrings.E7120_TEMP /* Can't process the native reference '{0}' on this platform because it is or contains a symlink. */, item?.ItemSpec);
 					return true;
 				}
 			}

From a2f61a263dd1acd1ed95853f21fa8e96671ac41a Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Thu, 14 Sep 2023 12:29:49 +0200
Subject: [PATCH 16/19] [msbuild] Make the Zip task work on Windows by using
 our own compression logic.

---
 msbuild/Xamarin.MacDev.Tasks/Tasks/Zip.cs     | 53 ++++---------------
 .../Xamarin.Shared.ObjCBinding.targets        |  3 --
 .../Xamarin.Shared/Xamarin.iOS.Common.targets |  3 --
 .../Xamarin.iOS.Common.After.targets          | 21 ++++++--
 4 files changed, 29 insertions(+), 51 deletions(-)

diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/Zip.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/Zip.cs
index e8396be02c84..82a8be125b47 100644
--- a/msbuild/Xamarin.MacDev.Tasks/Tasks/Zip.cs
+++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/Zip.cs
@@ -15,21 +15,15 @@
 
 namespace Xamarin.MacDev.Tasks {
 	public class Zip : XamarinTask, ICancelableTask {
-		CancellationTokenSource? cancellationTokenSource;
-
 		#region Inputs
 
 		[Output]
 		[Required]
 		public ITaskItem? OutputFile { get; set; }
 
-		public bool Recursive { get; set; }
-
 		[Required]
 		public ITaskItem [] Sources { get; set; } = Array.Empty<ITaskItem> ();
 
-		public bool Symlinks { get; set; }
-
 		[Required]
 		public ITaskItem? WorkingDirectory { get; set; }
 
@@ -37,41 +31,11 @@ public class Zip : XamarinTask, ICancelableTask {
 
 		#endregion
 
-		static string GetExecutable (List<string> arguments, string toolName, string toolPathOverride)
-		{
-			if (string.IsNullOrEmpty (toolPathOverride)) {
-				arguments.Insert (0, toolName);
-				return "xcrun";
-			}
-			return toolPathOverride;
-		}
-
 		string GetWorkingDirectory ()
 		{
 			return WorkingDirectory!.GetMetadata ("FullPath");
 		}
 
-		List<string> GenerateCommandLineCommands ()
-		{
-			var args = new List<string> ();
-
-			if (Recursive)
-				args.Add ("-r");
-
-			if (Symlinks)
-				args.Add ("-y");
-
-			args.Add (OutputFile!.GetMetadata ("FullPath"));
-
-			var root = GetWorkingDirectory ();
-			for (int i = 0; i < Sources.Length; i++) {
-				var relative = PathUtils.AbsoluteToRelative (root, Sources [i].GetMetadata ("FullPath"));
-				args.Add (relative);
-			}
-
-			return args;
-		}
-
 		public override bool Execute ()
 		{
 			if (ShouldExecuteRemotely ()) {
@@ -85,10 +49,17 @@ public override bool Execute ()
 				return rv;
 			}
 
-			var args = GenerateCommandLineCommands ();
-			var executable = GetExecutable (args, "zip", ZipPath);
-			cancellationTokenSource = new CancellationTokenSource ();
-			ExecuteAsync (Log, executable, args, workingDirectory: GetWorkingDirectory (), cancellationToken: cancellationTokenSource.Token).Wait ();
+			var zip = OutputFile!.GetMetadata ("FullPath");
+			var workingDirectory = GetWorkingDirectory ();
+			var sources = new List<string> ();
+			for (int i = 0; i < Sources.Length; i++) {
+				var relative = PathUtils.AbsoluteToRelative (workingDirectory, Sources [i].GetMetadata ("FullPath"));
+				sources.Add (relative);
+			}
+
+			if (!CompressionHelper.TryCompress (this.Log, zip, sources, false, workingDirectory, false))
+				return false;
+
 			return !Log.HasLoggedErrors;
 		}
 
@@ -96,8 +67,6 @@ public void Cancel ()
 		{
 			if (ShouldExecuteRemotely ()) {
 				BuildConnection.CancelAsync (BuildEngine4).Wait ();
-			} else {
-				cancellationTokenSource?.Cancel ();
 			}
 		}
 
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
index 59e2bd5a9969..3d0caa776265 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.ObjCBinding.targets
@@ -96,9 +96,6 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 		<Delete Files="%(_NativeFrameworkResource.ZipFile)" />
 
 		<Zip
-			ZipPath="$(ZipPath)"
-			Recursive="true"
-			Symlinks="true"
 			Sources="%(_NativeFrameworkResource.FrameworkPath)"
 			OutputFile="%(_NativeFrameworkResource.ZipFile)"
 			WorkingDirectory="%(_NativeFrameworkResource.FrameworkPath)" >
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets
index 7ba921434237..5ec3d36e840b 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets
@@ -478,9 +478,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<Zip
 			SessionId="$(BuildSessionId)"
 			Condition="'$(IsMacEnabled)' == 'true'"
-			ZipPath="$(ZipPath)"
-			Recursive="true"
-			Symlinks="true"
 			Sources="@(_IpaPackageSource)"
 			OutputFile="$(IpaPackagePath)"
 			WorkingDirectory="$(DeviceSpecificIntermediateOutputPath)ipa"
diff --git a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets
index d9e963f75caa..d4af043ab651 100644
--- a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.iOS.Common.After.targets
@@ -73,7 +73,12 @@ Copyright (C) 2011-2013 Xamarin. All rights reserved.
 		<!-- Creates AppBundle dir on the output path -->
 		<MakeDir Condition="'$(MtouchTargetsEnabled)' And '$(IsMacEnabled)' == 'true'" SessionId="$(BuildSessionId)" Directories="$(DeviceSpecificOutputPath)AppBundle" />
 		<!--Zip AppBundle-->
-		<Zip SessionId="$(BuildSessionId)" Condition="'$(MtouchTargetsEnabled)' And '$(IsMacEnabled)' == 'true'" ZipPath="$(ZipPath)" Recursive="true" Sources="$(DeviceSpecificOutputPath)$(_AppBundleName)$(AppBundleExtension)" OutputFile="$(DeviceSpecificOutputPath)AppBundle\$(_AppBundleName).zip" WorkingDirectory="$(DeviceSpecificOutputPath)AppBundle" />
+		<Zip
+			SessionId="$(BuildSessionId)"
+			Condition="'$(MtouchTargetsEnabled)' And '$(IsMacEnabled)' == 'true'"
+			Sources="$(DeviceSpecificOutputPath)$(_AppBundleName)$(AppBundleExtension)"
+			OutputFile="$(DeviceSpecificOutputPath)AppBundle\$(_AppBundleName).zip"
+			WorkingDirectory="$(DeviceSpecificOutputPath)AppBundle" />
 		<!--Copy Zip from Mac-->
 		<Message Text="$(DeviceSpecificOutputPath)AppBundle\$(_AppBundleName).zip" />
 		<CopyFileFromBuildServer Condition="'$(MtouchTargetsEnabled)' And '$(IsMacEnabled)' == 'true'" SessionId="$(BuildSessionId)" File="$(DeviceSpecificOutputPath)AppBundle\$(_AppBundleName).zip" />
@@ -109,7 +114,12 @@ Copyright (C) 2011-2013 Xamarin. All rights reserved.
 		</PropertyGroup>
 		<MakeDir SessionId="$(BuildSessionId)" Directories="$(_ArchiveZipWorkingDirOnMac)" />
 		<CopyArchiveFiles ArchivePath="$(ArchiveDir)" SessionId="$(BuildSessionId)" AppName="$(BuildAppName)" TargetPath="$(_ArchiveZipWorkingDirOnMac)" />
-		<Zip SessionId="$(BuildSessionId)" Condition="'$(MtouchTargetsEnabled)'" ZipPath="$(ZipPath)" Recursive="true" Symlinks="true" Sources="$(ArchiveDir)" OutputFile="$(_ArchiveZipFileNameOnMac)" WorkingDirectory="$([System.IO.Path]::GetDirectoryName($(ArchiveDir)))" />
+		<Zip
+			SessionId="$(BuildSessionId)"
+			Condition="'$(MtouchTargetsEnabled)'"
+			Sources="$(ArchiveDir)"
+			OutputFile="$(_ArchiveZipFileNameOnMac)"
+			WorkingDirectory="$([System.IO.Path]::GetDirectoryName($(ArchiveDir)))" />
 		<CreateArchiveDirectory ArchiveBasePath="$(ArchiveBasePath)">
 			<Output TaskParameter="ArchiveRootDir" PropertyName="ArchiveRootDirOnWin" />
 		</CreateArchiveDirectory>
@@ -166,7 +176,12 @@ Copyright (C) 2011-2013 Xamarin. All rights reserved.
 			</_DSYMDir>
 		</ItemGroup>
 		<!--Zip Dsym folders-->
-		<Zip SessionId="$(BuildSessionId)" Condition="'$(MtouchTargetsEnabled)' And '$(IsMacEnabled)' == 'true' And '@(_DSYMDir)' != ''" ZipPath="$(ZipPath)" Recursive="true" Symlinks="true" Sources="@(_DSYMDir)" OutputFile="$(DeviceSpecificOutputPath)%(_DSYMDir.DsymFileName).zip" WorkingDirectory="$(DeviceSpecificOutputPath)" />
+		<Zip
+			SessionId="$(BuildSessionId)"
+			Condition="'$(MtouchTargetsEnabled)' And '$(IsMacEnabled)' == 'true' And '@(_DSYMDir)' != ''"
+			Sources="@(_DSYMDir)"
+			OutputFile="$(DeviceSpecificOutputPath)%(_DSYMDir.DsymFileName).zip"
+			WorkingDirectory="$(DeviceSpecificOutputPath)" />
 		<CopyFileFromBuildServer Condition="'$(MtouchTargetsEnabled)' And '$(IsMacEnabled)' == 'true' And '@(_DSYMDir)' != ''" SessionId="$(BuildSessionId)" File="$(DeviceSpecificOutputPath)%(_DSYMDir.DsymFileName).zip" />
 		<Unzip Condition="Exists('$(DeviceSpecificOutputPath)%(_DSYMDir.DsymFileName).zip')" ZipFilePath="$(DeviceSpecificOutputPath)%(_DSYMDir.DsymFileName).zip" ExtractionPath="$(DeviceSpecificOutputPath)" />
 		<Delete Condition="'$(MtouchTargetsEnabled)' And '$(IsMacEnabled)' == 'true' And Exists('$(DeviceSpecificOutputPath)%(_DSYMDir.DsymFileName).zip')" SessionId="$(BuildSessionId)" Files="$(DeviceSpecificOutputPath)%(_DSYMDir.DsymFileName).zip" />

From 5cac984d7c7d34ec54a012ef91698b1b504eaaf6 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 15 Sep 2023 11:47:04 +0200
Subject: [PATCH 17/19] [tests] Improve debug output.

---
 tests/dotnet/UnitTests/ProjectTest.cs | 43 ++++++++-------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
index 875d8cc97641..5ae33ca447ad 100644
--- a/tests/dotnet/UnitTests/ProjectTest.cs
+++ b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -290,30 +290,7 @@ public void BuildInterdependentBindingProjects (string platform)
 			var result = DotNet.AssertBuild (project_path, verbosity);
 			var lines = BinLog.PrintToLines (result.BinLogPath);
 			// Find the resulting binding assembly from the build log
-			var assemblies = lines.
-				Select (v => v.Trim ()).
-				Where (v => {
-					if (v.Length < 10)
-						return false;
-					if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
-						if (v [1] != ':') {
-							return false;
-						}
-					} else {
-						if (v [0] != '/') {
-							return false;
-						}
-					}
-					if (!v.EndsWith ($"{assemblyName}.dll", StringComparison.Ordinal))
-						return false;
-					if (!(v.Contains ("/bin/", StringComparison.Ordinal) || v.Contains ("\\bin\\", StringComparison.Ordinal)))
-						return false;
-					if (!v.Contains ($"{assemblyName}.app", StringComparison.Ordinal))
-						return false;
-					if (!File.Exists (v))
-						return false;
-					return true;
-				});
+			var assemblies = FilterToAssembly (lines, assemblyName, true);
 			Assert.That (assemblies, Is.Not.Empty, "Assemblies");
 			// Make sure there's no other assembly confusing our logic
 			assemblies = assemblies.Distinct ();
@@ -1334,17 +1311,17 @@ void AssertAppContents (ApplePlatform platform, string app_directory)
 			Assert.That (libxamarin, Has.Length.LessThanOrEqualTo (1), $"No more than one libxamarin should be present, but found {libxamarin.Length}:\n\t{string.Join ("\n\t", libxamarin)}");
 		}
 
-		IEnumerable<string> FilterToAssembly (IEnumerable<string> lines, string assemblyName)
+		IEnumerable<string> FilterToAssembly (IEnumerable<string> lines, string assemblyName, bool doAppCheckInsteadOfRefCheck = false)
 		{
-			var rv = FilterToAssembly2 (lines, assemblyName, false);
+			var rv = FilterToAssembly2 (lines, assemblyName, false, doAppCheckInsteadOfRefCheck);
 			if (!rv.Any ()) {
 				Console.WriteLine ($"Could not find any matching lines of {lines.Count ()} lines matching {assemblyName}");
-				rv = FilterToAssembly2 (lines, assemblyName, true);
+				rv = FilterToAssembly2 (lines, assemblyName, true, doAppCheckInsteadOfRefCheck);
 			}
 			return rv;
 		}
 
-		IEnumerable<string> FilterToAssembly2 (IEnumerable<string> lines, string assemblyName, bool log)
+		IEnumerable<string> FilterToAssembly2 (IEnumerable<string> lines, string assemblyName, bool log, bool doAppCheckInsteadOfRefCheck = false)
 		{
 			return lines.
 				Select (v => v.Trim ()).
@@ -1376,11 +1353,17 @@ IEnumerable<string> FilterToAssembly2 (IEnumerable<string> lines, string assembl
 						if (log)
 							Console.WriteLine ($"    4: {v}");
 						return false;
-					if (!(v.Contains ("/bin/", StringComparison.Ordinal) || v.Contains ("\\bin\\", StringComparison.Ordinal))) {
+					}
+					if (!doAppCheckInsteadOfRefCheck && v.Contains (Path.DirectorySeparatorChar + "ref" + Path.DirectorySeparatorChar, StringComparison.Ordinal)) {
 						if (log)
-							Console.WriteLine ($"    5: {v}");
+							Console.WriteLine ($"    5a: {v}");
 						return false; // Skip reference assemblies
 					}
+					if (doAppCheckInsteadOfRefCheck && !v.Contains ($"{assemblyName}.app", StringComparison.Ordinal)) {
+						if (log)
+							Console.WriteLine ($"    5b: {v}");
+						return false;
+					}
 					if (!File.Exists (v)) {
 						if (log)
 							Console.WriteLine ($"    6: {v}");

From 6b7953cfd987d9739d429ad46a6187afb3b1c1fe Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 15 Sep 2023 12:05:57 +0200
Subject: [PATCH 18/19] [tools] Fix managed update directory.

---
 tools/common/FileCopier.cs | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/tools/common/FileCopier.cs b/tools/common/FileCopier.cs
index 64194247f9f3..f4299e05187a 100644
--- a/tools/common/FileCopier.cs
+++ b/tools/common/FileCopier.cs
@@ -134,16 +134,32 @@ static void UpdateDirectory (string source, string target)
 				ReportError (1022, Errors.MT1022, source, target, err, strerror (err));
 		}
 
+		static bool? use_managed_copying;
+		static bool UseManagedCopying {
+			get {
+				if (!use_managed_copying.HasValue) {
+					if (!string.IsNullOrEmpty (Environment.GetEnvironmentVariable ("XAMARIN_USE_MANAGED_UPDATE_DIRECTORY"))) {
+						use_managed_copying = true;
+					} else if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
+						use_managed_copying = true;
+					} else {
+						use_managed_copying = false;
+					}
+				}
+				return use_managed_copying.Value;
+			}
+		}
+
 		static bool TryUpdateDirectory (string source, string target, out int errno)
 		{
-			var windows = Environment.OSVersion.Platform == PlatformID.Win32NT;
-			if (windows)
+			if (UseManagedCopying)
 				return TryUpdateDirectoryWindows (source, target, out errno);
 			return TryUpdateDirectoryMacOS (source, target, out errno);
 		}
 
 		static bool TryUpdateDirectoryWindows (string source, string target, out int errno)
 		{
+			Log (1, $"TryUpdateDirectoryWindows ({source}, {target})");
 			errno = 0;
 			Directory.CreateDirectory (target);
 
@@ -152,12 +168,12 @@ static bool TryUpdateDirectoryWindows (string source, string target, out int err
 			if (attr.HasFlag (FileAttributes.Directory)) {
 				var dir = new DirectoryInfo (source);
 				foreach (var sourceFile in dir.GetFiles ()) {
-					var sourcePath = Path.Combine (source, sourceFile.Name);
-					var targetPath = Path.Combine (target, sourceFile.Name);
+					var sourcePath = sourceFile.FullName;
+					var targetPath = Path.Combine (target, Path.GetFileName (source), sourceFile.Name);
 					CopyIfNeeded (sourcePath, targetPath);
 				}
 				foreach (var subdir in dir.GetDirectories ()) {
-					rv &= TryUpdateDirectoryWindows (Path.Combine (source, subdir.Name), Path.Combine (target, subdir.Name), out errno);
+					rv &= TryUpdateDirectoryWindows (Path.Combine (source, subdir.Name), Path.Combine (target, Path.GetFileName (source)), out errno);
 				}
 			} else {
 				var targetPath = Path.Combine (target, Path.GetFileName (source));
@@ -171,6 +187,7 @@ static void CopyIfNeeded (string source, string target)
 			if (IsUptodate (source, target)) {
 				Log (3, "Target '{0}' is up-to-date", target);
 			} else {
+				Directory.CreateDirectory (Path.GetDirectoryName (target)!);
 				File.Copy (source, target, true);
 				Log (1, "Copied {0} to {1}", source, target);
 			}

From 13623b6015fb8d6f9bd609f724ee3ed0cd7738ce Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Tue, 31 Dec 2024 09:27:36 +0100
Subject: [PATCH 19/19] Don't need this.

---
 tests/Makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/Makefile b/tests/Makefile
index d840914d7387..c6efacc6fde5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -200,7 +200,6 @@ package-test-libraries.zip:
 	$(Q_GEN) rm -f "$@" "$@.tmp"
 	$(Q_GEN) cd $(TOP) && zip -9r --symlinks $(abspath $@).tmp ./tests/test-libraries
 	$(Q_GEN) cd $(TOP) && find tests -regex 'tests/test-libraries/custom-type-assembly/.libs/.*dll' -exec zip -9r --symlinks $(abspath $@).tmp {} +
-	$(Q_GEN) cd $(TOP) && git ls-files -o -- 'tests/*/Info-*plist' | zip -9r --symlinks $(abspath $@).tmp -@
 	$(Q_GEN) cd $(TOP) && git ls-files -o -- 'tests/bindings-test/*.generated.cs' | zip -9r --symlinks $(abspath $@).tmp -@
 	$(Q) mv "$@".tmp "$@"