From 8151755a09b25d82a49d21a0c6d2155bd01ca486 Mon Sep 17 00:00:00 2001
From: Plaintextnerds <tim@plaintextnerds.com>
Date: Tue, 6 Aug 2024 01:12:26 +0100
Subject: [PATCH] Fix the Mac Catalyst Build

---
 OpenOTDR/OpenOTDR-MacIOS.csproj               |  6 ++++++
 OpenOTDR/OpenOTDR.csproj                      | 10 ++++++++--
 OpenOTDR/Pages/ProjectOverviewPage.xaml.cs    |  8 +++++---
 .../Platforms/MacCatalyst/Entitlements.plist  | 20 +++++++++----------
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/OpenOTDR/OpenOTDR-MacIOS.csproj b/OpenOTDR/OpenOTDR-MacIOS.csproj
index 879aeed..d6ec592 100644
--- a/OpenOTDR/OpenOTDR-MacIOS.csproj
+++ b/OpenOTDR/OpenOTDR-MacIOS.csproj
@@ -41,6 +41,12 @@
 	  <ApplicationId>com.baldrai.openotdr</ApplicationId>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
+		<MtouchInterpreter>all</MtouchInterpreter>
+		<PublishAot>false</PublishAot>
+		<UseInterpreter>True</UseInterpreter>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<!-- App Icon -->
 		<MauiIcon Include="Resources\AppIcon\appicon.svg" />
diff --git a/OpenOTDR/OpenOTDR.csproj b/OpenOTDR/OpenOTDR.csproj
index 7c8c318..a681464 100644
--- a/OpenOTDR/OpenOTDR.csproj
+++ b/OpenOTDR/OpenOTDR.csproj
@@ -92,14 +92,20 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="App.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
+	  <MauiXaml Update="AppShell.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Pages\ProjectTracePage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Pages\ProjectOverviewPage.xaml">
-	    <Generator></Generator>
+	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Pages\ProjectsPage.xaml">
-	    <Generator></Generator>
+	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
 	  <MauiXaml Update="Resources\Styles\ControlTemplates.xaml">
 	    <Generator>MSBuild:Compile</Generator>
diff --git a/OpenOTDR/Pages/ProjectOverviewPage.xaml.cs b/OpenOTDR/Pages/ProjectOverviewPage.xaml.cs
index 0d425dd..5ae7a3d 100644
--- a/OpenOTDR/Pages/ProjectOverviewPage.xaml.cs
+++ b/OpenOTDR/Pages/ProjectOverviewPage.xaml.cs
@@ -1,7 +1,7 @@
-using fio = Microsoft.VisualBasic.FileIO;
+using Microsoft.EntityFrameworkCore;
+using fio = Microsoft.VisualBasic.FileIO;
 using OpenOTDR.Models;
 using OpenOTDR.Services;
-using Microsoft.EntityFrameworkCore;
 
 namespace OpenOTDR.Pages;
 
@@ -57,7 +57,8 @@ private async void OnFileAdd(object sender, EventArgs eventArgs)
             {
                 { DevicePlatform.Android, new[] { "application/octet-stream", "application/kml" } }, // MIME type
                 { DevicePlatform.WinUI, new[] { ".sor", ".sod", "kml" } }, // file extension
-                { DevicePlatform.macOS, new[] { "sor", "sod", "kml" } } // UTType values
+                { DevicePlatform.MacCatalyst, new[] { "public.data" } },
+                { DevicePlatform.macOS, new[] { "public.data" } } // UTType values
             });
 
         PickOptions options = new()
@@ -101,6 +102,7 @@ private async void OnFileAdd(object sender, EventArgs eventArgs)
         }
         catch (Exception ex)
         {
+            
             // The user canceled or something went wrong
         }
     }
diff --git a/OpenOTDR/Platforms/MacCatalyst/Entitlements.plist b/OpenOTDR/Platforms/MacCatalyst/Entitlements.plist
index de4adc9..38da9a9 100644
--- a/OpenOTDR/Platforms/MacCatalyst/Entitlements.plist
+++ b/OpenOTDR/Platforms/MacCatalyst/Entitlements.plist
@@ -1,14 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-    <!-- See https://aka.ms/maui-publish-app-store#add-entitlements for more information about adding entitlements.-->
-    <dict>
-        <!-- App Sandbox must be enabled to distribute a MacCatalyst app through the Mac App Store. -->
-        <key>com.apple.security.app-sandbox</key>
-        <true/>
-        <!-- When App Sandbox is enabled, this value is required to open outgoing network connections. -->
-        <key>com.apple.security.network.client</key>
-        <true/>
-    </dict>
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+</dict>
 </plist>
-