Add support Maccatalyst for MAUI

microsoft · Feb 21, 2024 · 284cbcf · 284cbcf
1 parent 43de906
commit 284cbcf
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 12 deletions.
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Apple/Microsoft.AppCenter.Apple.csproj b/SDK/AppCenter/Microsoft.AppCenter.Apple/Microsoft.AppCenter.Apple.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-ios;net6.0-macos</TargetFrameworks>
+    <TargetFrameworks>net6.0-ios;net6.0-macos;net6.0-maccatalyst</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <NoBindingEmbedding>false</NoBindingEmbedding>
   </PropertyGroup>
@@ -10,7 +10,7 @@
     <MtouchLink>SdkOnly</MtouchLink>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.EndsWith('-macos'))">
+  <PropertyGroup Condition="$(TargetFramework.EndsWith('-macos')) Or $(TargetFramework.EndsWith('-maccatalyst'))">
     <LinkMode>SdkOnly</LinkMode>
     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
   </PropertyGroup>
@@ -38,4 +38,12 @@
       <Frameworks>CoreTelephony Security SystemConfiguration</Frameworks>
     </NativeReference>
   </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.EndsWith('-maccatalyst'))">
+    <NativeReference Include="..\..\..\externals\apple\maccatalyst\AppCenter.a">
+      <Kind>Static</Kind>
+      <ForceLoad>True</ForceLoad>
+      <LinkerFlags>-lsqlite3</LinkerFlags>
+      <Frameworks>CoreTelephony Security SystemConfiguration</Frameworks>
+    </NativeReference>
+  </ItemGroup>
 </Project>
diff --git a/SDK/AppCenter/Microsoft.AppCenter.Apple/global.json b/SDK/AppCenter/Microsoft.AppCenter.Apple/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "6.0.402"
+  }
+}
diff --git a/...rAnalytics/Microsoft.AppCenter.Analytics.Apple/Microsoft.AppCenter.Analytics.Apple.csproj b/...rAnalytics/Microsoft.AppCenter.Analytics.Apple/Microsoft.AppCenter.Analytics.Apple.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-ios;net6.0-macos</TargetFrameworks>
+    <TargetFrameworks>net6.0-ios;net6.0-macos;net6.0-maccatalyst</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <NoBindingEmbedding>false</NoBindingEmbedding>
   </PropertyGroup>
@@ -10,7 +10,7 @@
     <MtouchLink>SdkOnly</MtouchLink>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.EndsWith('-macos'))">
+  <PropertyGroup Condition="$(TargetFramework.EndsWith('-macos')) Or $(TargetFramework.EndsWith('-maccatalyst'))">
     <LinkMode>SdkOnly</LinkMode>
     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
   </PropertyGroup>
@@ -34,6 +34,13 @@
       <Frameworks>IOKit</Frameworks>
     </NativeReference>
   </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.EndsWith('-maccatalyst'))">
+    <NativeReference Include="..\..\..\externals\apple\maccatalyst\AppCenterAnalytics.a">
+      <Kind>Static</Kind>
+      <ForceLoad>True</ForceLoad>
+      <Frameworks>IOKit</Frameworks>
+    </NativeReference>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\AppCenter\Microsoft.AppCenter.Apple\Microsoft.AppCenter.Apple.csproj" />
   </ItemGroup>

diff --git a/...pCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.csproj b/...pCenterCrashes/Microsoft.AppCenter.Crashes.Apple/Microsoft.AppCenter.Crashes.Apple.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0-ios;net6.0-macos</TargetFrameworks>
+    <TargetFrameworks>net6.0-ios;net6.0-macos;net6.0-maccatalyst</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <NoBindingEmbedding>false</NoBindingEmbedding>
   </PropertyGroup>
@@ -10,7 +10,7 @@
     <MtouchLink>SdkOnly</MtouchLink>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
   </PropertyGroup>
-  <PropertyGroup Condition="$(TargetFramework.EndsWith('-macos'))">
+  <PropertyGroup Condition="$(TargetFramework.EndsWith('-macos')) Or $(TargetFramework.EndsWith('-maccatalyst'))">
     <LinkMode>SdkOnly</LinkMode>
     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
   </PropertyGroup>
@@ -38,6 +38,14 @@
       <IsCxx>True</IsCxx>
     </NativeReference>
   </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.EndsWith('-maccatalyst'))">
+    <NativeReference Include="..\..\..\externals\apple\maccatalyst\AppCenterCrashes.a">
+      <Kind>Static</Kind>
+      <ForceLoad>True</ForceLoad>
+      <LinkerFlags>-lc++</LinkerFlags>
+      <IsCxx>True</IsCxx>
+    </NativeReference>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\AppCenter\Microsoft.AppCenter.Apple\Microsoft.AppCenter.Apple.csproj" />
   </ItemGroup>

diff --git a/SDK/Directory.Build.props b/SDK/Directory.Build.props
@@ -4,7 +4,7 @@
     <Copyright>Microsoft Corp. All rights reserved.</Copyright>
     <Company>Microsoft Corporation</Company>
     <!-- Pin C# version. C# 8 features might have issues on Mono runtime. -->
-    <LangVersion>7.0</LangVersion>
+    <LangVersion>8.0</LangVersion>
     <!-- Current version. -->
     <Version>5.0.4-SNAPSHOT</Version>
     <FileVersion>5.0.4.0</FileVersion>

diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "6.0.402"
+  }
+}
diff --git a/nuget/MacAppCenter.nuspec b/nuget/MacAppCenter.nuspec
@@ -30,6 +30,8 @@
       </group>
       <group targetFramework="net6.0-macos10.10">
       </group>
+      <group targetFramework="net6.0-maccatalyst10.10">
+      </group>
     </dependencies>
   </metadata>
   <files>
@@ -56,6 +58,8 @@
     <file src="$macos_dir$/Microsoft.AppCenter.xml" target="lib/Xamarin.Mac20" />
     <file src="$macos_net6_dir$/Microsoft.AppCenter.dll" target="lib/net6.0-macos10.10" />
     <file src="$macos_net6_dir$/Microsoft.AppCenter.xml" target="lib/net6.0-macos10.10" />
+    <file src="$maccatalyst_net6_dir$/Microsoft.AppCenter.dll" target="lib/net6.0-maccatalyst10.10" />
+    <file src="$maccatalyst_net6_dir$/Microsoft.AppCenter.xml" target="lib/net6.0-maccatalyst10.10" />
 
   </files>
 </package>
diff --git a/nuget/MacAppCenterAnalytics.nuspec b/nuget/MacAppCenterAnalytics.nuspec
@@ -42,6 +42,8 @@
     <file src="$macos_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/Xamarin.Mac20" />
     <file src="$macos_net6_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net6.0-macos10.10" />
     <file src="$macos_net6_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net6.0-macos10.10" />
+    <file src="$maccatalyst_net6_dir$/Microsoft.AppCenter.Analytics.dll" target="lib/net6.0-maccatalyst10.10" />
+    <file src="$maccatalyst_net6_dir$/Microsoft.AppCenter.Analytics.xml" target="lib/net6.0-maccatalyst10.10" />
 
   </files>
 </package>
diff --git a/nuget/MacAppCenterCrashes.nuspec b/nuget/MacAppCenterCrashes.nuspec
@@ -42,6 +42,8 @@
     <file src="$macos_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/Xamarin.Mac20" />
     <file src="$macos_net6_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net6.0-macos10.10" />
     <file src="$macos_net6_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net6.0-macos10.10" />
+    <file src="$maccatalyst_net6_dir$/Microsoft.AppCenter.Crashes.dll" target="lib/net6.0-maccatalyst10.10" />
+    <file src="$maccatalyst_net6_dir$/Microsoft.AppCenter.Crashes.xml" target="lib/net6.0-maccatalyst10.10" />
 
   </files>
 </package>
diff --git a/scripts/configuration/ac-build-config.xml b/scripts/configuration/ac-build-config.xml
@@ -11,22 +11,27 @@
         <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/bin/Release/xamarin.ios/Microsoft.AppCenter.Crashes.dll"/>
         <assembly path="SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/bin/Release/xamarin.ios/Microsoft.AppCenter.Distribute.dll"/>
     </group>
+    <group id="macos" buildGroup="mac">
+        <assembly path="SDK/AppCenter/Microsoft.AppCenter.Apple/bin/Release/xamarin.mac/Microsoft.AppCenter.dll"/>
+        <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Apple/bin/Release/xamarin.mac/Microsoft.AppCenter.Analytics.dll"/>
+        <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/bin/Release/xamarin.mac/Microsoft.AppCenter.Crashes.dll"/>
+    </group>
     <group id="ios_net6" buildGroup="mac">
         <assembly path="SDK/AppCenter/Microsoft.AppCenter.Apple/bin/Release/net6.0-ios/Microsoft.AppCenter.dll"/>
         <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Apple/bin/Release/net6.0-ios/Microsoft.AppCenter.Analytics.dll"/>
         <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/bin/Release/net6.0-ios/Microsoft.AppCenter.Crashes.dll"/>
         <assembly path="SDK/AppCenterDistribute/Microsoft.AppCenter.Distribute.Apple/bin/Release/net6.0-ios/Microsoft.AppCenter.Distribute.dll"/>
     </group>
-    <group id="macos" buildGroup="mac">
-        <assembly path="SDK/AppCenter/Microsoft.AppCenter.Apple/bin/Release/xamarin.mac/Microsoft.AppCenter.dll"/>
-        <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Apple/bin/Release/xamarin.mac/Microsoft.AppCenter.Analytics.dll"/>
-        <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/bin/Release/xamarin.mac/Microsoft.AppCenter.Crashes.dll"/>
-    </group>
     <group id="macos_net6" buildGroup="mac">
         <assembly path="SDK/AppCenter/Microsoft.AppCenter.Apple/bin/Release/net6.0-macos/Microsoft.AppCenter.dll"/>
         <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Apple/bin/Release/net6.0-macos/Microsoft.AppCenter.Analytics.dll"/>
         <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/bin/Release/net6.0-macos/Microsoft.AppCenter.Crashes.dll"/>
     </group>
+    <group id="maccatalyst_net6" buildGroup="mac">
+        <assembly path="SDK/AppCenter/Microsoft.AppCenter.Apple/bin/Release/net6.0-maccatalyst/Microsoft.AppCenter.dll"/>
+        <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Apple/bin/Release/net6.0-maccatalyst/Microsoft.AppCenter.Analytics.dll"/>
+        <assembly path="SDK/AppCenterCrashes/Microsoft.AppCenter.Crashes.Apple/bin/Release/net6.0-maccatalyst/Microsoft.AppCenter.Crashes.dll"/>
+    </group>
     <group id="android" buildGroup="mac">
         <assembly path="SDK/AppCenter/Microsoft.AppCenter.Android/bin/Release/monoandroid10.0/Microsoft.AppCenter.dll"/>
         <assembly path="SDK/AppCenterAnalytics/Microsoft.AppCenter.Analytics.Android/bin/Release/monoandroid10.0/Microsoft.AppCenter.Analytics.dll"/>