From d964a2232cc72b43beeb9365ced8527be04ca814 Mon Sep 17 00:00:00 2001
From: Anjo <87346264+AnAndroNerd@users.noreply.github.com>
Date: Wed, 24 Jun 2026 01:01:24 -0700
Subject: [PATCH] 1

---
 .../OpenUtauMobile.MacOS.csproj               | 50 ++-----------------
 OpenUtauMobile.iOS/OpenUtauMobile.iOS.csproj  |  3 +-
 2 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/OpenUtauMobile.MacOS/OpenUtauMobile.MacOS.csproj b/OpenUtauMobile.MacOS/OpenUtauMobile.MacOS.csproj
index 782e990..8a3bbb2 100644
--- a/OpenUtauMobile.MacOS/OpenUtauMobile.MacOS.csproj
+++ b/OpenUtauMobile.MacOS/OpenUtauMobile.MacOS.csproj
@@ -1,23 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0-maccatalyst</TargetFramework>
-        <TargetPlatformVersion>26.0</TargetPlatformVersion>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <DefineConstants>MACOS</DefineConstants>
-        <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
-        <ApplicationId>$(ApplicationId)</ApplicationId>
+        <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
     </PropertyGroup>
 
-	<!-- 苹果配置 -->
-	<PropertyGroup>
-		<!-- 禁用 IL 链接器以避免 DryWetMidi 等库的问题 -->
-		<MtouchLink>None</MtouchLink>
-	</PropertyGroup>
-
     <ItemGroup>
         <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+
         <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
             <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
             <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
@@ -34,37 +27,4 @@
         </None>
     </ItemGroup>
 
-    <!-- OnnxRuntime 没有提供 Mac Catalyst 原生库（只有 osx-x64/osx-arm64），
-         将 macOS dylib 手动引入 Mac Catalyst 构建并传递给链接器 -->
-    <Target Name="IncludeOnnxRuntimeNativeForMacCatalyst" AfterTargets="ResolvePackageAssets" BeforeTargets="_ComputePublishLocation" Condition="'$(RuntimeIdentifier)' == 'maccatalyst-x64' Or '$(RuntimeIdentifier)' == 'maccatalyst-arm64'">
-        <PropertyGroup>
-            <_ORT_NativeRid Condition="'$(RuntimeIdentifier)' == 'maccatalyst-x64'">osx-x64</_ORT_NativeRid>
-            <_ORT_NativeRid Condition="'$(RuntimeIdentifier)' == 'maccatalyst-arm64'">osx-arm64</_ORT_NativeRid>
-            <_ORT_DylibSource>$(NuGetPackageRoot)microsoft.ml.onnxruntime/1.23.2/runtimes/$(_ORT_NativeRid)/native/libonnxruntime.dylib</_ORT_DylibSource>
-            <_ORT_DylibDest>$(IntermediateOutputPath)nativelibraries/Contents/MonoBundle/libonnxruntime.dylib</_ORT_DylibDest>
-        </PropertyGroup>
-
-        <Warning Text="OnnxRuntime dylib not found at $(_ORT_DylibSource) — OnnxRuntime will not work on Mac Catalyst"
-                 Condition="!Exists('$(_ORT_DylibSource)')" />
-
-        <MakeDir Directories="$([System.IO.Path]::GetDirectoryName($(_ORT_DylibDest)))"
-                 Condition="Exists('$(_ORT_DylibSource)')" />
-        <Copy SourceFiles="$(_ORT_DylibSource)" DestinationFiles="$(_ORT_DylibDest)"
-              Condition="Exists('$(_ORT_DylibSource)')" />
-
-        <ItemGroup Condition="Exists('$(_ORT_DylibSource)')">
-            <ResolvedFileToPublish Include="$(_ORT_DylibDest)">
-                <RelativePath>libonnxruntime.dylib</RelativePath>
-                <AssetType>native</AssetType>
-                <NuGetPackageId>Microsoft.ML.OnnxRuntime</NuGetPackageId>
-                <NuGetPackageVersion>1.23.2</NuGetPackageVersion>
-                <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-            </ResolvedFileToPublish>
-        </ItemGroup>
-
-        <PropertyGroup Condition="Exists('$(_ORT_DylibSource)')">
-            <MtouchExtraArgs>$(MtouchExtraArgs) --gcc_flags=-Wl,$(_ORT_DylibDest)</MtouchExtraArgs>
-        </PropertyGroup>
-    </Target>
-</Project>
-
+</Project>
\ No newline at end of file
diff --git a/OpenUtauMobile.iOS/OpenUtauMobile.iOS.csproj b/OpenUtauMobile.iOS/OpenUtauMobile.iOS.csproj
index d257955..1662f3d 100644
--- a/OpenUtauMobile.iOS/OpenUtauMobile.iOS.csproj
+++ b/OpenUtauMobile.iOS/OpenUtauMobile.iOS.csproj
@@ -2,7 +2,7 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFramework>net9.0-ios</TargetFramework>
-        <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion>18.0</SupportedOSPlatformVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
@@ -14,6 +14,7 @@
 
     <ItemGroup>
         <PackageReference Include="Avalonia.iOS" Version="$(AvaloniaVersion)"/>
+        <PackageReference Include="Microsoft.ML.OnnxRuntime.Extensions" Version="0.14.0" />
     </ItemGroup>
 
     <ItemGroup>