diff --git a/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MainPage.xaml.cs b/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MainPage.xaml.cs index 4f302b166..be7671391 100644 --- a/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MainPage.xaml.cs +++ b/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MainPage.xaml.cs @@ -36,7 +36,7 @@ public MainPage() ExecutionProviderOptions.Items.Add(nameof(ExecutionProviders.NNAPI)); } - if (DeviceInfo.Platform == DevicePlatform.iOS) + if (DeviceInfo.Platform == DevicePlatform.iOS || DeviceInfo.Platform == DevicePlatform.MacCatalyst) { ExecutionProviderOptions.Items.Add(nameof(ExecutionProviders.CoreML)); } diff --git a/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MauiProgram.cs b/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MauiProgram.cs index 5c4a90106..7c03246f0 100644 --- a/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MauiProgram.cs +++ b/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MauiProgram.cs @@ -1,6 +1,8 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using Microsoft.Extensions.Logging; + namespace MauiVisionSample; public static class MauiProgram @@ -15,7 +17,9 @@ public static MauiApp CreateMauiApp() fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold"); }); - - return builder.Build(); +#if DEBUG + builder.Logging.AddDebug(); +#endif + return builder.Build(); } } diff --git a/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MauiVisionSample.csproj b/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MauiVisionSample.csproj index 21871baed..8abffd7c8 100644 --- a/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MauiVisionSample.csproj +++ b/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/MauiVisionSample.csproj @@ -1,8 +1,18 @@ - net6.0-android;net6.0-ios - $(TargetFrameworks);net6.0-windows10.0.19041.0 + net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + + + + + Exe MauiVisionSample true @@ -21,22 +31,13 @@ 1 14.2 + 14.0 21.0 10.0.17763.0 10.0.17763.0 en - - - - <_LinkerFrameworks Include="CoreML" /> - - - @@ -55,8 +56,12 @@ - - + + + + + + + + + com.apple.security.app-sandbox + + + com.apple.security.network.client + + + + diff --git a/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/Platforms/MacCatalyst/Info.plist b/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/Platforms/MacCatalyst/Info.plist new file mode 100644 index 000000000..f24aacc0d --- /dev/null +++ b/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/Platforms/MacCatalyst/Info.plist @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + UIDeviceFamily + + 2 + + UIRequiredDeviceCapabilities + + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/appicon.appiconset + + diff --git a/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/Platforms/MacCatalyst/Program.cs b/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/Platforms/MacCatalyst/Program.cs new file mode 100644 index 000000000..d019d470c --- /dev/null +++ b/mobile/examples/Maui/MauiVisionSample/MauiVisionSample/Platforms/MacCatalyst/Program.cs @@ -0,0 +1,16 @@ +using ObjCRuntime; +using UIKit; + +namespace MauiVisionSample; + +public class Program +{ + // This is the main entry point of the application. + static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(AppDelegate)); + } +} + diff --git a/mobile/examples/super_resolution/MAUI/MauiSuperResolution/MauiSuperResolution.csproj b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/MauiSuperResolution.csproj index f19507893..772cf538d 100644 --- a/mobile/examples/super_resolution/MAUI/MauiSuperResolution/MauiSuperResolution.csproj +++ b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/MauiSuperResolution.csproj @@ -1,8 +1,14 @@  - net6.0-android;net6.0-ios - $(TargetFrameworks);net6.0-windows10.0.19041.0 + net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 + + Exe MauiSuperResolution true @@ -47,9 +53,9 @@ - - - + + + diff --git a/mobile/examples/super_resolution/MAUI/MauiSuperResolution/MauiSuperResolution.sln b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/MauiSuperResolution.sln new file mode 100644 index 000000000..79c2add04 --- /dev/null +++ b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/MauiSuperResolution.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.002.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiSuperResolution", "MauiSuperResolution.csproj", "{3F127A17-FDF2-4D33-9FFD-FE13EB0012FC}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3F127A17-FDF2-4D33-9FFD-FE13EB0012FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F127A17-FDF2-4D33-9FFD-FE13EB0012FC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F127A17-FDF2-4D33-9FFD-FE13EB0012FC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F127A17-FDF2-4D33-9FFD-FE13EB0012FC}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {2D5BD6D8-EC60-4EDF-A626-5FA51E9130F7} + EndGlobalSection +EndGlobal diff --git a/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/AppDelegate.cs b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/AppDelegate.cs new file mode 100644 index 000000000..b0c8b5713 --- /dev/null +++ b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/AppDelegate.cs @@ -0,0 +1,10 @@ +using Foundation; + +namespace MauiSuperResolution; + +[Register("AppDelegate")] +public class AppDelegate : MauiUIApplicationDelegate +{ + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); +} + diff --git a/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Entitlements.plist b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Entitlements.plist new file mode 100644 index 000000000..8e87c0cb0 --- /dev/null +++ b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Entitlements.plist @@ -0,0 +1,14 @@ + + + + + + + com.apple.security.app-sandbox + + + com.apple.security.network.client + + + + diff --git a/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Info.plist b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Info.plist new file mode 100644 index 000000000..f24aacc0d --- /dev/null +++ b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Info.plist @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + UIDeviceFamily + + 2 + + UIRequiredDeviceCapabilities + + arm64 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + XSAppIconAssets + Assets.xcassets/appicon.appiconset + + diff --git a/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Program.cs b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Program.cs new file mode 100644 index 000000000..d0308cfa4 --- /dev/null +++ b/mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Program.cs @@ -0,0 +1,16 @@ +using ObjCRuntime; +using UIKit; + +namespace MauiSuperResolution; + +public class Program +{ + // This is the main entry point of the application. + static void Main(string[] args) + { + // if you want to use a different Application Delegate class from "AppDelegate" + // you can specify it here. + UIApplication.Main(args, null, typeof(AppDelegate)); + } +} +