mono · mattleibow · Jun 15, 2023 · Mar 23, 2023 · Mar 23, 2023 · Mar 23, 2023
diff --git a/native/ios/build.cake b/native/ios/build.cake
@@ -12,8 +12,8 @@ DirectoryPath OUTPUT_VARIANT_PATH = OUTPUT_PATH.Combine(VARIANT);
 string GetDeploymentTarget(string arch)
 {
     switch (VARIANT) {
-        case "maccatalyst": return "13.0";
-        default: return "8.0";
+        case "maccatalyst": return "13.1";
+        default: return "11.0";
     }
 }
 
@@ -23,9 +23,7 @@ Task("libSkiaSharp")
     .Does(() =>
 {
     if (VARIANT == "ios") {
-        Build("iphonesimulator", "i386", "x86");
         Build("iphonesimulator", "x86_64", "x64");
-        Build("iphoneos", "armv7", "arm");
         Build("iphoneos", "arm64", "arm64");
 
         CreateFatFramework(OUTPUT_VARIANT_PATH.Combine("libSkiaSharp"));
@@ -72,9 +70,7 @@ Task("libHarfBuzzSharp")
     .Does(() =>
 {
     if (VARIANT == "ios") {
-        Build("iphonesimulator", "i386");
         Build("iphonesimulator", "x86_64");
-        Build("iphoneos", "armv7");
         Build("iphoneos", "arm64");
 
         CreateFatFramework(OUTPUT_VARIANT_PATH.Combine("libHarfBuzzSharp"));

diff --git a/native/macos/build.cake b/native/macos/build.cake
@@ -8,7 +8,7 @@ string GetDeploymentTarget(string arch)
 {
     switch (arch.ToLower()) {
         case "arm64": return "11.0";
-        default: return "10.8";
+        default: return "10.9";
     }
 }
 

diff --git a/samples/Basic/Uno/SkiaSharpSample.iOS/Info.plist b/samples/Basic/Uno/SkiaSharpSample.iOS/Info.plist
@@ -23,7 +23,6 @@
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-		<string>armv7</string>
 		<string>arm64</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>

diff --git a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
@@ -31,6 +31,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LinkMode>Full</LinkMode>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj
@@ -22,7 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
   </PropertyGroup>
@@ -33,7 +33,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
@@ -45,7 +45,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -56,7 +56,7 @@
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>

diff --git a/samples/Basic/iOS/SkiaSharpSample/Info.plist b/samples/Basic/iOS/SkiaSharpSample/Info.plist
@@ -25,7 +25,7 @@
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-		<string>armv7</string>
+		<string>arm64</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>

diff --git a/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/iOS/SkiaSharpSample/SkiaSharpSample.csproj
@@ -23,7 +23,7 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
   </PropertyGroup>
@@ -34,7 +34,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -44,7 +44,7 @@
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>true</MtouchDebug>
@@ -57,7 +57,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchLink>SdkOnly</MtouchLink>
   </PropertyGroup>

diff --git a/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mobile/iOS/Info.plist b/samples/Gallery/Uno.WinUI/SkiaSharpSample.Mobile/iOS/Info.plist
@@ -23,7 +23,6 @@
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-	  <string>armv7</string>
 	  <string>arm64</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>

diff --git a/samples/Gallery/Uno/SkiaSharpSample.iOS/Info.plist b/samples/Gallery/Uno/SkiaSharpSample.iOS/Info.plist
@@ -23,7 +23,6 @@
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
-		<string>armv7</string>
 		<string>arm64</string>
 	</array>
 	<key>UISupportedInterfaceOrientations</key>

diff --git a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
@@ -31,6 +31,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <LinkMode>Full</LinkMode>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj b/samples/Gallery/Xamarin.Forms/iOS/iOS.csproj
@@ -22,7 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
     <MtouchProfiling>False</MtouchProfiling>
@@ -42,7 +42,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <MtouchLink>Full</MtouchLink>
-    <MtouchArch>i386, x86_64</MtouchArch>
+    <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <MtouchDebug>False</MtouchDebug>
     <MtouchProfiling>False</MtouchProfiling>
@@ -65,7 +65,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <CodesignKey>iPhone Developer</CodesignKey>
     <MtouchDebug>True</MtouchDebug>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
@@ -87,7 +87,7 @@
     <OutputPath>bin\iPhone\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <MtouchArch>ARMv7, ARM64</MtouchArch>
+    <MtouchArch>ARM64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <CodesignKey>iPhone Developer</CodesignKey>
     <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>

diff --git a/scripts/azure-pipelines-complete-internal.yml b/scripts/azure-pipelines-complete-internal.yml
@@ -24,7 +24,7 @@ parameters:
     default:
       pool:
         name: Azure Pipelines
-        vmImage: macos-11
+        vmImage: macos-12
   - name: VM_IMAGE_LINUX
     type: object
     default:

diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml
@@ -30,7 +30,7 @@ parameters:
     default:
       pool:
         name: Azure Pipelines
-        vmImage: macos-11
+        vmImage: macos-12
   - name: VM_IMAGE_LINUX
     type: object
     default:

diff --git a/scripts/azure-pipelines-tests.yml b/scripts/azure-pipelines-tests.yml
@@ -20,7 +20,7 @@ parameters:
     default:
       pool:
         name: Azure Pipelines
-        vmImage: macos-11
+        vmImage: macos-12
   - name: VM_IMAGE_LINUX
     type: object
     default:

diff --git a/scripts/azure-pipelines-variables.yml b/scripts/azure-pipelines-variables.yml
@@ -13,7 +13,7 @@ variables:
   MANAGED_LINUX_PACKAGES: ttf-ancient-fonts ninja-build
   MONO_VERSION_MACOS: '6_12_24'
   MONO_VERSION_LINUX: 'stable-focal/snapshots/6.12.0.182'
-  XCODE_VERSION: 13.2.1
+  XCODE_VERSION: 14.2
   VISUAL_STUDIO_VERSION: ''
   DOTNET_VERSION_PREVIEW: '7.0.302'
   DOTNET_WORKLOAD_SOURCE: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.86.json'

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
@@ -30,7 +30,7 @@ parameters:
     default:
       pool:
         name: Azure Pipelines
-        vmImage: macos-11
+        vmImage: macos-12
   - name: VM_IMAGE_LINUX
     type: object
     default: