Skip to content

A Swiss Army knife for developers.

Added macos build and reduced size of macOS `.app` package

Etienne Baudoux89b992ebf9fa
diff --git a/init.sh b/init.sh
index 9971a652a..00fb945d5 100644
--- a/init.sh
+++ b/init.sh
@@ -6,12 +6,16 @@ set -eo pipefail
SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
SCRIPT_DIR="${SCRIPT_DIR}/"
+# Required to build macOS app. See https://stackoverflow.com/questions/55320965/resource-fork-finder-information-or-similar-detritus-not-allowed-error-when
+xattr -cr ./src/
+
# Install .NET
. "./tools/Install-DotNet.sh" "$SCRIPT_DIR"
# Install .NET workloads
echo "Installing .NET workloads"
sudo dotnet workload install maccatalyst
+sudo dotnet workload install macos
# Restore NuGet solution dependencies
echo "Restoring all dependencies"
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj
index c56dc777a..ff07e6f4a 100644
--- a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj
+++ b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/DevToys.MacOS.csproj
@@ -1,13 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetMacCatalyst)</TargetFrameworks>
- <!-- <SingleProject>true</SingleProject> -->
- <OutputType>Exe</OutputType> <!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 --> <!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> --> <!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) --> <!-- Disabled because of https://github.com/dotnet/runtime/issues/68808 --> <!--<UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != 'net6.0-maccatalyst' and '$(TargetFramework)' != 'net6.0-macos'">True</UseInterpreter>-->
+ <!-- Disabled because of https://github.com/xamarin/xamarin-macios/issues/16401-->
+ <!-- <TargetFrameworks>$(TargetFrameworks);net6.0-macos</TargetFrameworks> -->
+ <SingleProject>true</SingleProject>
+ <OutputType>Exe</OutputType>
+ <!-- Debugger workaround https://github.com/dotnet/maui-samples/blob/8aa6b8780b12e97b157514c3bdc54bb4a13001cd/HelloMacCatalyst/HelloMacCatalyst.csproj#L7 -->
+ <!-- <MtouchExtraArgs Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">$(MtouchExtraArgs) -setenv:MONO_THREADS_SUSPEND=preemptive</MtouchExtraArgs> -->
+ <!-- Required for C# Hot Reload, except for macOS which uses CoreCLR (not Mono) -->
+ <UseInterpreter Condition="'$(Configuration)' == 'Debug' and '$(TargetFramework)' != '$(NetMacCatalyst)' and '$(TargetFramework)' != 'net6.0-macos'">True</UseInterpreter>
<IsUnoHead>true</IsUnoHead>
- <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
- <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers>
+ <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == '$(NetMacCatalyst)'">14.0</SupportedOSPlatformVersion>
+ <SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-macos'">10.14</SupportedOSPlatformVersion>
<ApplicationId>com.etiennebaudoux.devtoys</ApplicationId>
</PropertyGroup>
+ <PropertyGroup Condition="'$(RuntimeIdentifier)'==''">
+ <!-- Default values for command line builds -->
+ <RuntimeIdentifier Condition="'$(TargetFramework)' == '$(NetMacCatalyst)'">maccatalyst-x64</RuntimeIdentifier>
+ <RuntimeIdentifier Condition="'$(TargetFramework)' == 'net6.0-macos'">osx-x64</RuntimeIdentifier>
+ </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<CreatePackage>false</CreatePackage>
<DefineConstants>DEBUG;TRACE;__MAC__</DefineConstants>
@@ -17,46 +28,40 @@
<DefineConstants>TRACE;__MAC__</DefineConstants>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Uno.WinUI" />
- <PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'" />
- <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" />
- <PackageReference Include="Uno.WinUI.Lottie" />
- <PackageReference Include="Uno.Extensions.Logging.OSLog" />
- </ItemGroup>
- <PropertyGroup>
- <!-- Configure the GC -->
- <MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
- <!-- Required for unknown crash as of .NET 6 Mobile Preview 13 -->
- <MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
- <!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
- <MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
- <!-- Full globalization is required for Uno -->
- <InvariantGlobalization>false</InvariantGlobalization>
- </PropertyGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\DevToys.Api\DevToys.Api.csproj" />
- <ProjectReference Include="..\..\..\..\DevToys.Core\DevToys.Core.csproj" />
- <ProjectReference Include="..\..\..\..\DevToys.MonacoEditor\DevToys.MonacoEditor.csproj" />
- <ProjectReference Include="..\..\..\..\DevToys.UI.Framework\DevToys.UI.Framework.csproj" />
- <ProjectReference Include="..\..\..\..\DevToys.UI\DevToys.UI.csproj" />
+ <PackageReference Include="Uno.WinUI"/>
+ <PackageReference Include="Uno.WinUI.RemoteControl" Condition="'$(Configuration)'=='Debug'"/>
+ <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging"/>
+ <PackageReference Include="Microsoft.Extensions.Logging.Console"/>
+ <PackageReference Include="Uno.WinUI.Lottie"/>
</ItemGroup>
+ <Choose>
+ <When Condition="'$(TargetFramework)' == '$(NetMacCatalyst)'">
+ <PropertyGroup>
+ <!-- Configure the GC -->
+ <MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
+ <!-- Required for unknown crash as of .NET 6 Mobile Preview 13 -->
+ <MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
+ <!-- https://github.com/xamarin/xamarin-macios/issues/14812 -->
+ <MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
+ <!-- Full globalization is required for Uno -->
+ <InvariantGlobalization>false</InvariantGlobalization>
+ </PropertyGroup>
+ <ItemGroup>
+ <PackageReference Include="Uno.Extensions.Logging.OSLog"/>
+ </ItemGroup>
+ </When>
+ <When Condition="'$(TargetFramework)' == 'net6.0-macos'">
+ <PropertyGroup>
+ <TrimMode Condition="'$(Configuration)'=='Release'">link</TrimMode>
+ </PropertyGroup>
+ </When>
+ </Choose>
<ItemGroup>
- <ImageAsset Update="MacOS\Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png">
- <Link>MacOS\Assets.xcassets\AppIcon.appiconset\AppIcon-512%402x.png</Link>
- </ImageAsset>
- <ImageAsset Update="MacOS\Assets.xcassets\AppIcon.appiconset\AppIcon-32%402x.png">
- <Link>MacOS\Assets.xcassets\AppIcon.appiconset\AppIcon-32%402x.png</Link>
- </ImageAsset>
- <ImageAsset Update="MacOS\Assets.xcassets\AppIcon.appiconset\AppIcon-16%402x.png">
- <Link>MacOS\Assets.xcassets\AppIcon.appiconset\AppIcon-16%402x.png</Link>
- </ImageAsset>
- <ImageAsset Update="MacOS\Assets.xcassets\AppIcon.appiconset\AppIcon-256%402x.png">
- <Link>MacOS\Assets.xcassets\AppIcon.appiconset\AppIcon-256%402x.png</Link>
- </ImageAsset>
- <ImageAsset Update="MacOS\Assets.xcassets\AppIcon.appiconset\AppIcon-128%402x.png">
- <Link>MacOS\Assets.xcassets\AppIcon.appiconset\AppIcon-128%402x.png</Link>
- </ImageAsset>
+ <ProjectReference Include="..\..\..\..\DevToys.Api\DevToys.Api.csproj"/>
+ <ProjectReference Include="..\..\..\..\DevToys.Core\DevToys.Core.csproj"/>
+ <ProjectReference Include="..\..\..\..\DevToys.MonacoEditor\DevToys.MonacoEditor.csproj"/>
+ <ProjectReference Include="..\..\..\..\DevToys.UI.Framework\DevToys.UI.Framework.csproj"/>
+ <ProjectReference Include="..\..\..\..\DevToys.UI\DevToys.UI.csproj"/>
</ItemGroup>
- <Import Project="..\..\..\..\DevToys.UI.EntryPoint\DevToys.UI.EntryPoint.projitems" Label="Shared" Condition="Exists('..\..\..\..\DevToys.UI.EntryPoint\DevToys.UI.EntryPoint.projitems')" />
+ <Import Project="..\..\..\..\DevToys.UI.EntryPoint\DevToys.UI.EntryPoint.projitems" Label="Shared" Condition="Exists('..\..\..\..\DevToys.UI.EntryPoint\DevToys.UI.EntryPoint.projitems')"/>
</Project>
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png
new file mode 100644
index 000000000..5757c31d2
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected] b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected]
new file mode 100644
index 000000000..d0fb35728
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected] differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png
new file mode 100644
index 000000000..17d637b23
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected] b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected]
new file mode 100644
index 000000000..cf3a6e3ef
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected] differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png
new file mode 100644
index 000000000..dcaaf7fad
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected] b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected]
new file mode 100644
index 000000000..4810d2d0b
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected] differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png
new file mode 100644
index 000000000..c02a2268a
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected] b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected]
new file mode 100644
index 000000000..d257b83aa
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected] differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png
new file mode 100644
index 000000000..a90995087
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected] b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected]
new file mode 100644
index 000000000..da4b8a992
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/[email protected] differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..1fcd6827c
--- /dev/null
+++ b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,241 @@
+{
+ "images": [
+ {
+ "idiom": "iphone",
+ "scale": "2x",
+ "size": "20x20"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "3x",
+ "size": "20x20"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "2x",
+ "size": "29x29"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "3x",
+ "size": "29x29"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "2x",
+ "size": "40x40"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "3x",
+ "size": "40x40"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "2x",
+ "size": "60x60"
+ },
+ {
+ "idiom": "iphone",
+ "scale": "3x",
+ "size": "60x60"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "1x",
+ "size": "20x20"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "2x",
+ "size": "20x20"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "1x",
+ "size": "29x29"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "2x",
+ "size": "29x29"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "1x",
+ "size": "40x40"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "2x",
+ "size": "40x40"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "1x",
+ "size": "76x76"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "2x",
+ "size": "76x76"
+ },
+ {
+ "idiom": "ipad",
+ "scale": "2x",
+ "size": "83.5x83.5"
+ },
+ {
+ "idiom": "ios-marketing",
+ "scale": "1x",
+ "size": "1024x1024"
+ },
+ {
+ "idiom": "car",
+ "scale": "2x",
+ "size": "60x60"
+ },
+ {
+ "idiom": "car",
+ "scale": "3x",
+ "size": "60x60"
+ },
+ {
+ "idiom": "watch",
+ "role": "notificationCenter",
+ "scale": "2x",
+ "size": "24x24",
+ "subtype": "38mm"
+ },
+ {
+ "idiom": "watch",
+ "role": "notificationCenter",
+ "scale": "2x",
+ "size": "27.5x27.5",
+ "subtype": "42mm"
+ },
+ {
+ "idiom": "watch",
+ "role": "companionSettings",
+ "scale": "2x",
+ "size": "29x29"
+ },
+ {
+ "idiom": "watch",
+ "role": "companionSettings",
+ "scale": "3x",
+ "size": "29x29"
+ },
+ {
+ "idiom": "watch",
+ "role": "appLauncher",
+ "scale": "2x",
+ "size": "40x40",
+ "subtype": "38mm"
+ },
+ {
+ "idiom": "watch",
+ "role": "appLauncher",
+ "scale": "2x",
+ "size": "44x44",
+ "subtype": "40mm"
+ },
+ {
+ "idiom": "watch",
+ "role": "appLauncher",
+ "scale": "2x",
+ "size": "50x50",
+ "subtype": "44mm"
+ },
+ {
+ "idiom": "watch",
+ "role": "quickLook",
+ "scale": "2x",
+ "size": "86x86",
+ "subtype": "38mm"
+ },
+ {
+ "idiom": "watch",
+ "role": "quickLook",
+ "scale": "2x",
+ "size": "98x98",
+ "subtype": "42mm"
+ },
+ {
+ "idiom": "watch",
+ "role": "quickLook",
+ "scale": "2x",
+ "size": "108x108",
+ "subtype": "44mm"
+ },
+ {
+ "idiom": "watch-marketing",
+ "scale": "1x",
+ "size": "1024x1024"
+ },
+ {
+ "filename": "AppIcon-16.png",
+ "idiom": "mac",
+ "scale": "1x",
+ "size": "16x16"
+ },
+ {
+ "filename": "[email protected]",
+ "idiom": "mac",
+ "scale": "2x",
+ "size": "16x16"
+ },
+ {
+ "filename": "AppIcon-32.png",
+ "idiom": "mac",
+ "scale": "1x",
+ "size": "32x32"
+ },
+ {
+ "filename": "[email protected]",
+ "idiom": "mac",
+ "scale": "2x",
+ "size": "32x32"
+ },
+ {
+ "filename": "AppIcon-128.png",
+ "idiom": "mac",
+ "scale": "1x",
+ "size": "128x128"
+ },
+ {
+ "filename": "[email protected]",
+ "idiom": "mac",
+ "scale": "2x",
+ "size": "128x128"
+ },
+ {
+ "filename": "AppIcon-256.png",
+ "idiom": "mac",
+ "scale": "1x",
+ "size": "256x256"
+ },
+ {
+ "filename": "[email protected]",
+ "idiom": "mac",
+ "scale": "2x",
+ "size": "256x256"
+ },
+ {
+ "filename": "AppIcon-512.png",
+ "idiom": "mac",
+ "scale": "1x",
+ "size": "512x512"
+ },
+ {
+ "filename": "[email protected]",
+ "idiom": "mac",
+ "scale": "2x",
+ "size": "512x512"
+ }
+ ],
+ "info": {
+ "author": "xcode",
+ "version": 1
+ }
+}
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/Contents.json b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/Contents.json
new file mode 100644
index 000000000..da4a164c9
--- /dev/null
+++ b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "version" : 1,
+ "author" : "xcode"
+ }
+}
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/unologo.imageset/Contents.json b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/unologo.imageset/Contents.json
new file mode 100644
index 000000000..9b481d06d
--- /dev/null
+++ b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/unologo.imageset/Contents.json
@@ -0,0 +1,528 @@
+{
+ "images": [
+ {
+ "idiom": "universal"
+ },
+ {
+ "scale": "1x",
+ "idiom": "universal"
+ },
+ {
+ "filename": "unoplatform.jpg",
+ "scale": "2x",
+ "idiom": "universal"
+ },
+ {
+ "scale": "3x",
+ "idiom": "universal"
+ },
+ {
+ "idiom": "iphone"
+ },
+ {
+ "scale": "1x",
+ "idiom": "iphone"
+ },
+ {
+ "scale": "2x",
+ "idiom": "iphone"
+ },
+ {
+ "subtype": "retina4",
+ "scale": "2x",
+ "idiom": "iphone"
+ },
+ {
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
+ "idiom": "ipad"
+ },
+ {
+ "scale": "1x",
+ "idiom": "ipad"
+ },
+ {
+ "scale": "2x",
+ "idiom": "ipad"
+ },
+ {
+ "idiom": "watch"
+ },
+ {
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "screenWidth": "{130,145}",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "screenWidth": "{146,165}",
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "idiom": "mac"
+ },
+ {
+ "scale": "1x",
+ "idiom": "mac"
+ },
+ {
+ "scale": "2x",
+ "idiom": "mac"
+ },
+ {
+ "idiom": "car"
+ },
+ {
+ "scale": "2x",
+ "idiom": "car"
+ },
+ {
+ "scale": "3x",
+ "idiom": "car"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "idiom": "universal"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "1x",
+ "idiom": "universal"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "universal"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "3x",
+ "idiom": "universal"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "idiom": "iphone"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "1x",
+ "idiom": "iphone"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "iphone"
+ },
+ {
+ "subtype": "retina4",
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "iphone"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "idiom": "ipad"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "1x",
+ "idiom": "ipad"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "ipad"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "idiom": "watch"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "screenWidth": "{130,145}",
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "screenWidth": "{146,165}",
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "idiom": "mac"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "1x",
+ "idiom": "mac"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "mac"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "idiom": "car"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "car"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "scale": "3x",
+ "idiom": "car"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "idiom": "universal"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "1x",
+ "idiom": "universal"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "universal"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "3x",
+ "idiom": "universal"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "idiom": "iphone"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "1x",
+ "idiom": "iphone"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "iphone"
+ },
+ {
+ "subtype": "retina4",
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "iphone"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "3x",
+ "idiom": "iphone"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "idiom": "ipad"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "1x",
+ "idiom": "ipad"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "ipad"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "idiom": "watch"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "screenWidth": "{130,145}",
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "screenWidth": "{146,165}",
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "watch"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "idiom": "mac"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "1x",
+ "idiom": "mac"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "mac"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "idiom": "car"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "2x",
+ "idiom": "car"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "light"
+ }
+ ],
+ "scale": "3x",
+ "idiom": "car"
+ }
+ ],
+ "info": {
+ "version": 1,
+ "author": "xcode"
+ }
+}
\ No newline at end of file
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg
new file mode 100644
index 000000000..da3230e55
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Assets.xcassets/unologo.imageset/unoplatform.jpg differ
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Entitlements.plist b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Entitlements.plist
new file mode 100644
index 000000000..fa00fff6b
--- /dev/null
+++ b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Entitlements.plist
@@ -0,0 +1,7 @@
+<?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">
+<dict>
+</dict>
+</plist>
+
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Info.plist b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Info.plist
new file mode 100644
index 000000000..3e9eb3127
--- /dev/null
+++ b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Info.plist
@@ -0,0 +1,32 @@
+<?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">
+<dict>
+ <key>CFBundleName</key>
+ <string>DevToys</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.etiennebaudoux.devtoys</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.0</string>
+ <key>CFBundleVersion</key>
+ <string>1</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>en</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>LSApplicationCategoryType</key>
+ <string>public.app-category.utilities</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>${AuthorCopyright:HtmlEncode}</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>XSAppIconAssets</key>
+ <string>Assets.xcassets/AppIcons.appiconset</string>
+ <key>ATSApplicationFontsPath</key>
+ <string>Fonts/uno-fluentui-assets.ttf</string>
+</dict>
+</plist>
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Main.cs b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Main.cs
new file mode 100644
index 000000000..bfe887e84
--- /dev/null
+++ b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Main.cs
@@ -0,0 +1,14 @@
+using AppKit;
+
+namespace DevToys.macOS
+{
+ static class MainClass
+ {
+ static void Main(string[] args)
+ {
+ NSApplication.Init();
+ NSApplication.SharedApplication.Delegate = new App();
+ NSApplication.Main(args);
+ }
+ }
+}
diff --git a/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Resources/Fonts/uno-fluentui-assets.ttf b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Resources/Fonts/uno-fluentui-assets.ttf
new file mode 100644
index 000000000..055184054
Binary files /dev/null and b/src/app/dev/platforms/desktop/macos/DevToys.MacOS/macOS/Resources/Fonts/uno-fluentui-assets.ttf differ
diff --git a/src/build/Build.cs b/src/build/Build.cs
index 26ad012cc..1aa0eb3de 100644
--- a/src/build/Build.cs
+++ b/src/build/Build.cs
@@ -153,6 +153,8 @@ class Build : NukeBuild
var configs = new List<DotnetParameters>();
foreach (string targetFramework in project.GetTargetFrameworks())
{
+ // configs.Add(new DotnetParameters(project.Path, "osx-x64", targetFramework, portable: true));
+ // configs.Add(new DotnetParameters(project.Path, "osx-arm64", targetFramework, portable: true));
configs.Add(new DotnetParameters(project.Path, "maccatalyst-arm64", targetFramework, portable: true));
configs.Add(new DotnetParameters(project.Path, "maccatalyst-x64", targetFramework, portable: true));
}