[msbuild] Implement support for Mac Catalyst

2020-11-23 14:46:11 +01:00 · 2020-11-23 14:46:11 +01:00 · e9f0b1f8e6
--- a/msbuild/Makefile
+++ b/msbuild/Makefile
@ -78,6 +78,36 @@ MSBUILD_SYMLINKS += symlinks-ios
 MSBUILD_TASK_ASSEMBLIES += $(IOS_TASK_ASSEMBLIES)
 endif

+##
+## MacCatalyst definitions
+##
+
+MACCATALYST_TARGETS =                                                \
+	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst.*.props)   \
+	$(wildcard Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst.*.targets) \
+
+MACCATALYST_DIRECTORIES = \
+	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.MacCatalyst/v1.0/RedistList \
+	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst                                                       \
+
+MACCATALYST_SYMLINKS = \
+	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.MacCatalyst/v1.0/RedistList/FrameworkList.xml                          \
+	$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/MacCatalyst                                                                       \
+
+MACCATALYST_PRODUCTS += \
+	$(MACCATALYST_SYMLINKS) \
+	$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/FrameworkList.xml                                            \
+	$(foreach target,$(MACCATALYST_TARGETS),$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/$(notdir $(target))) \
+
+all-maccatalyst: $(MACCATALYST_PRODUCTS)
+symlinks-maccatalyst: $(MACCATALYST_SYMLINKS)
+
+ifdef INCLUDE_MACCATALYST
+MSBUILD_PRODUCTS += all-maccatalyst
+MSBUILD_DIRECTORIES += $(MACCATALYST_DIRECTORIES)
+MSBUILD_SYMLINKS += symlinks-maccatalyst
+endif
+
 ##
 ## XW definitions
 ##
@ -236,6 +266,22 @@ $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.iOS.Tasks/bin/$(CON
 $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS/%: Xamarin.Localization.MSBuild/bin/$(CONFIG)/$(TARGETFRAMEWORK)/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/iOS
 	$(Q) install -m 644 $< $@

+##
+## MacCatalyst
+##
+
+$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.MacCatalyst/v1.0/RedistList/FrameworkList.xml: | $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks/Xamarin.MacCatalyst/v1.0/RedistList
+	$(Q) ln -fs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/MacCatalyst/$(notdir $@) $@
+
+$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin/MacCatalyst: | $(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild/Xamarin
+	$(Q) ln -Fhs $(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/msbuild/MacCatalyst $@
+
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/FrameworkList.xml: Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst-FrameworkList.xml.in Makefile | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst
+	$(Q) sed 's@%TargetFrameworkDirectory%@$(IOS_TARGETDIR)/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/lib/mono/Xamarin.MacCatalyst@' $< > $@
+
+$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst/%: Xamarin.iOS.Tasks.Core/% | $(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/msbuild/MacCatalyst
+	$(Q) install -m 644 $< $@
+
 ##
 ## XW
 ##
--- a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/XamarinTask.cs
+++ b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/XamarinTask.cs
@ -28,6 +28,7 @@ namespace Xamarin.MacDev.Tasks {
 				case ApplePlatform.iOS:
 				case ApplePlatform.TVOS:
 				case ApplePlatform.WatchOS:
+				case ApplePlatform.MacCatalyst:
 					return "Xamarin.iOS";
 				case ApplePlatform.MacOSX:
 					return "Xamarin.Mac";
@ -70,6 +71,8 @@ namespace Xamarin.MacDev.Tasks {
 					return "watchOS";
 				case ApplePlatform.MacOSX:
 					return "macOS";
+				case ApplePlatform.MacCatalyst:
+					return "MacCatalyst";
 				default:
 					throw new InvalidOperationException ($"Invalid platform: {Platform}");
 				}
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.props
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.props
@ -86,12 +86,14 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 		</When>
 	</Choose>
 	<PropertyGroup Condition="'$(_XamarinBclPath)' == ''">
-		<_XamarinBclPath Condition="'$(_PlatformName)' == 'iOS'">$(_XamarinSdkRoot)/lib/mono/Xamarin.iOS/</_XamarinBclPath>
+		<_XamarinBclPath Condition="'$(_PlatformName)' == 'iOS' And '$(_IsMacCatalyst)' == 'true'">$(_XamarinSdkRoot)/lib/mono/Xamarin.MacCatalyst/</_XamarinBclPath>
+		<_XamarinBclPath Condition="'$(_PlatformName)' == 'iOS' And '$(_IsMacCatalyst)' != 'true'">$(_XamarinSdkRoot)/lib/mono/Xamarin.iOS/</_XamarinBclPath>
 		<_XamarinBclPath Condition="'$(_PlatformName)' == 'tvOS'">$(_XamarinSdkRoot)/lib/mono/Xamarin.TVOS/</_XamarinBclPath>
 		<_XamarinBclPath Condition="'$(_PlatformName)' == 'watchOS'">$(_XamarinSdkRoot)/lib/mono/Xamarin.WatchOS/</_XamarinBclPath>
 	</PropertyGroup>
 	<PropertyGroup>
-		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'iOS'">Xamarin.iOS.dll</_XamarinPlatformAssemblyName>
+		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'iOS' And '$(_IsMacCatalyst)' == 'true'">Xamarin.MacCatalyst.dll</_XamarinPlatformAssemblyName>
+		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'iOS' And '$(_IsMacCatalyst)' != 'true'">Xamarin.iOS.dll</_XamarinPlatformAssemblyName>
 		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'tvOS'">Xamarin.TVOS.dll</_XamarinPlatformAssemblyName>
 		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'watchOS'">Xamarin.WatchOS.dll</_XamarinPlatformAssemblyName>
 		<_XamarinPlatformAssemblyName Condition="'$(_PlatformName)' == 'macOS'">Xamarin.Mac.dll</_XamarinPlatformAssemblyName>
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst-FrameworkList.xml.in
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst-FrameworkList.xml.in
@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FileList Name="Xamarin.MacCatalyst" TargetFrameworkDirectory="%TargetFrameworkDirectory%">
+  <File AssemblyName="FSharp.Core" Version="3.98.4.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="I18N.CJK" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="I18N.MidEast" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="I18N.Other" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="I18N.Rare" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="I18N.West" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="I18N" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="Microsoft.CSharp" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="Mono.CSharp" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="Mono.Data.Sqlite" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="Mono.Data.Tds" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="Mono.Security" Version="2.0.5.0" PublicKeyToken="0738eb9f132ed756" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="MonoTouch.Dialog-1" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="MonoTouch.NUnitLite" Version="1.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="OpenTK-1.0" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ComponentModel.Composition" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ComponentModel.DataAnnotations" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Core" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Data.Services.Client" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Data.DataSetExtensions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Data" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.Compression.FileSystem" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.Compression" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IdentityModel" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Json" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.Http.WinHttpHandler" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.Http" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Numerics.Vectors" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Numerics" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Reflection.Context" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.Serialization" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ServiceModel.Internals" Version="0.0.0.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ServiceModel.Web" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ServiceModel" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Transactions" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Web.Services" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Windows" Version="2.0.5.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml.Linq" Version="2.0.5.0" PublicKeyToken="31bf3856ad364e35" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml.Serialization" Version="2.0.5.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="Xamarin.MacCatalyst" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="Xamarin.iOS" Version="0.0.0.0" PublicKeyToken="84e04ff9cfb79065" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="mscorlib" Version="2.0.5.0" PublicKeyToken="7cec85d7bea7798e" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="Microsoft.Win32.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="Microsoft.Win32.Registry.AccessControl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="Microsoft.Win32.Registry" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.AppContext" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Buffers" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Collections.Concurrent" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Collections.NonGeneric" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Collections.Specialized" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Collections" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ComponentModel.Annotations" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ComponentModel.EventBasedAsync" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ComponentModel.Primitives" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ComponentModel.TypeConverter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ComponentModel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Console" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Data.Common" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Data.SqlClient" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Diagnostics.Contracts" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Diagnostics.Debug" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Diagnostics.FileVersionInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Diagnostics.Process" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Diagnostics.StackTrace" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Diagnostics.TextWriterTraceListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Diagnostics.Tools" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Diagnostics.TraceEvent" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Diagnostics.TraceSource" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Diagnostics.Tracing" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Drawing.Common" Version="4.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Drawing.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Dynamic.Runtime" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Globalization.Calendars" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Globalization.Extensions" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Globalization" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.Compression.ZipFile" Version="4.0.1.0" PublicKeyToken="b77a5c561934e089" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.FileSystem.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.FileSystem.DriveInfo" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.FileSystem.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.FileSystem.Watcher" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.FileSystem" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.IsolatedStorage" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.MemoryMappedFiles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.Pipes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO.UnmanagedMemoryStream" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.IO" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Linq.Expressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Linq.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Linq.Queryable" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Linq" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Memory" Version="4.0.99.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.AuthenticationManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.Cache" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.HttpListener" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.Mail" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.NameResolution" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.NetworkInformation" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.Ping" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.Primitives" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.Requests" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.Security" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.ServicePoint" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.Sockets" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.Utilities" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.WebHeaderCollection" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.WebSockets.Client" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Net.WebSockets" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ObjectModel" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Reflection.DispatchProxy" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Reflection.Emit.ILGeneration" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Reflection.Emit.Lightweight" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Reflection.Emit" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Reflection.Extensions" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Reflection.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Reflection.TypeExtensions" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Reflection" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Resources.Reader" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Resources.ReaderWriter" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Resources.ResourceManager" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Resources.Writer" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.CompilerServices.VisualC" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.Extensions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.Handles" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.InteropServices.WindowsRuntime" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.InteropServices" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.Loader" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.Numerics" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.Serialization.Formatters" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.Serialization.Json" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.Serialization.Primitives" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime.Serialization.Xml" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Runtime" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.AccessControl" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Claims" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Algorithms" Version="4.3.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Cng" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Csp" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.DeriveBytes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Encoding" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Encryption.Aes" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Encryption.ECDiffieHellman" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Encryption.ECDsa" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Encryption" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Hashing.Algorithms" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Hashing" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.OpenSsl" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Pkcs" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.ProtectedData" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.RSA" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.RandomNumberGenerator" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Cryptography.X509Certificates" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Principal.Windows" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.Principal" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Security.SecureString" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ServiceModel.Duplex" Version="4.0.3.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ServiceModel.Http" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ServiceModel.NetTcp" Version="4.1.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ServiceModel.Primitives" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ServiceModel.Security" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ServiceProcess.ServiceController" Version="4.2.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Text.Encoding.CodePages" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Text.Encoding.Extensions" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Text.Encoding" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Text.RegularExpressions" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Threading.AccessControl" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Threading.Overlapped" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Threading.Tasks.Extensions" Version="4.2.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Threading.Tasks.Parallel" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Threading.Tasks" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Threading.Thread" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Threading.ThreadPool" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Threading.Timer" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Threading" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.ValueTuple" Version="4.0.3.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml.ReaderWriter" Version="4.1.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml.XDocument" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml.XPath.XDocument" Version="4.1.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml.XPath.XmlDocument" Version="4.0.2.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml.XPath" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml.XmlDocument" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml.XmlSerializer" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Xml.Xsl.Primitives" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="netstandard" Version="2.1.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
+</FileList>
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst.CSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst.CSharp.targets
@ -0,0 +1,32 @@
+<!--
+***********************************************************************************************
+Xamarin.MacCatalyst.CSharp.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+  created a backup copy.  Incorrect changes to this file will make it
+  impossible to load or build your projects from the command-line or the IDE.
+
+This file imports the version- and platform-specific targets for the project importing
+this file. This file also defines targets to produce an error if the specified targets
+file does not exist, but the project is built anyway (command-line or IDE build).
+
+Copyright (C) 2015-2016 Xamarin. All rights reserved.
+***********************************************************************************************
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
+			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
+
+	<PropertyGroup>
+		<!-- Version/fx properties -->
+		<TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">Xamarin.MacCatalyst</TargetFrameworkIdentifier>
+		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v1.0</TargetFrameworkVersion>
+	</PropertyGroup>
+
+	<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" Condition="'$(_UsingXamarinSdk)' != 'true'" />
+
+	<Import Project="Xamarin.MacCatalyst.Common.targets" />
+
+	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
+			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
+</Project>
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst.Common.targets
@ -0,0 +1,29 @@
+<!--
+***********************************************************************************************
+Xamarin.MacCatalyst.Common.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+  created a backup copy.  Incorrect changes to this file will make it
+  impossible to load or build your projects from the command-line or the IDE.
+
+This file imports the version- and platform-specific targets for the project importing
+this file. This file also defines targets to produce an error if the specified targets
+file does not exist, but the project is built anyway (command-line or IDE build).
+
+Copyright (C) 2015-2016 Xamarin. All rights reserved.
+***********************************************************************************************
+-->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
+			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
+
+	<PropertyGroup>
+		<AssetTargetFallback>xamarinios10;$(AssetTargetFallback)</AssetTargetFallback>
+	</PropertyGroup>
+
+	<Import Project="$(MSBuildThisFileDirectory)..\iOS\Xamarin.iOS.Common.targets" />
+
+	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
+			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
+
+</Project>
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst.FSharp.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.MacCatalyst.FSharp.targets
@ -0,0 +1,41 @@
+<!--
+***********************************************************************************************
+Xamarin.MacCatalyst.FSharp.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+  created a backup copy.  Incorrect changes to this file will make it
+  impossible to load or build your projects from the command-line or the IDE.
+
+This file imports the version- and platform-specific targets for the project importing
+this file. This file also defines targets to produce an error if the specified targets
+file does not exist, but the project is built anyway (command-line or IDE build).
+
+Copyright (C) 2015-2016 Xamarin. All rights reserved.
+***********************************************************************************************
+-->
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
+			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
+
+	<PropertyGroup>
+		<!-- Version/fx properties -->
+		<TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">Xamarin.MacCatalyst</TargetFrameworkIdentifier>
+		<TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v1.0</TargetFrameworkVersion>
+	</PropertyGroup>
+
+	<!-- xbuild searches multiple MSBuildExtensionsPath32, but only in the Import element so we can't determine this with a variable -->
+	<Import
+		Condition="'$(Language)' != 'F#' And Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')"
+		Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets" />
+	<Import
+		Condition="'$(Language)' != 'F#' And Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets')"
+		Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\4.0\Framework\v4.0\Microsoft.FSharp.Targets" />
+	<Import
+		Condition="'$(Language)' != 'F#' And Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets')"
+		Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.FSharp.Targets" />
+
+	<Import Project="Xamarin.MacCatalyst.Common.targets" />
+
+	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
+			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
+</Project>
--- a/tools/common/Driver.cs
+++ b/tools/common/Driver.cs
@ -773,6 +773,8 @@ namespace Xamarin.Bundler {
 				return Path.Combine (GetFrameworkLibDirectory (app), "mono", "Xamarin.WatchOS");
 			case ApplePlatform.TVOS:
 				return Path.Combine (GetFrameworkLibDirectory (app), "mono", "Xamarin.TVOS");
+			case ApplePlatform.MacCatalyst:
+				return Path.Combine (GetFrameworkLibDirectory (app), "mono", "Xamarin.MacCatalyst");
 			case ApplePlatform.MacOSX:
 #if MMP
 				if (IsUnifiedMobile)
--- a/tools/mtouch/mtouch.cs
+++ b/tools/mtouch/mtouch.cs
@ -156,6 +156,7 @@ namespace Xamarin.Bundler
 			case ApplePlatform.iOS:
 			case ApplePlatform.TVOS:
 			case ApplePlatform.WatchOS:
+			case ApplePlatform.MacCatalyst:
 				return Path.Combine (GetPlatformFrameworkDirectory (app), "..", "..", "64bits", app.PlatformName);
 			default:
 				throw ErrorHelper.CreateError (71, Errors.MX0071, app.Platform, "Xamarin.iOS");