-
Notifications
You must be signed in to change notification settings - Fork 401
[mobile] Move to net10 MAUI and add MacCatalyst support #406
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d49ffd7
[mobile]Move to net8 MAUI and add MacCatalyst support
rmarinho e302142
Remove extra line
rmarinho 6b3d4cc
Merge branch 'microsoft:main' into update-maui-sample
rmarinho d558154
Update to net10.0
rmarinho 5f9c044
Move to slnx
rmarinho a5890be
Update RootNamespace MauiVisionSample
rmarinho File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
27 changes: 0 additions & 27 deletions
27
mobile/examples/Maui/MauiVisionSample/MauiVisionSample.sln
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <Solution> | ||
| <Project Path="MauiVisionSample/MauiVisionSample.csproj"> | ||
| <Deploy /> | ||
| </Project> | ||
| </Solution> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
mobile/examples/Maui/MauiVisionSample/MauiVisionSample/Platforms/MacCatalyst/AppDelegate.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| using Foundation; | ||
|
|
||
| namespace MauiVisionSample; | ||
|
|
||
| [Register("AppDelegate")] | ||
| public class AppDelegate : MauiUIApplicationDelegate | ||
| { | ||
| protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); | ||
| } | ||
|
|
14 changes: 14 additions & 0 deletions
14
.../examples/Maui/MauiVisionSample/MauiVisionSample/Platforms/MacCatalyst/Entitlements.plist
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?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> | ||
| </plist> | ||
|
|
38 changes: 38 additions & 0 deletions
38
mobile/examples/Maui/MauiVisionSample/MauiVisionSample/Platforms/MacCatalyst/Info.plist
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <?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> | ||
| <!-- The Mac App Store requires you specify if the app uses encryption. --> | ||
| <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption --> | ||
| <!-- <key>ITSAppUsesNonExemptEncryption</key> --> | ||
| <!-- Please indicate <true/> or <false/> here. --> | ||
|
|
||
| <!-- Specify the category for your app here. --> | ||
| <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype --> | ||
| <!-- <key>LSApplicationCategoryType</key> --> | ||
| <!-- <string>public.app-category.YOUR-CATEGORY-HERE</string> --> | ||
| <key>UIDeviceFamily</key> | ||
| <array> | ||
| <integer>2</integer> | ||
| </array> | ||
| <key>UIRequiredDeviceCapabilities</key> | ||
| <array> | ||
| <string>arm64</string> | ||
| </array> | ||
| <key>UISupportedInterfaceOrientations</key> | ||
| <array> | ||
| <string>UIInterfaceOrientationPortrait</string> | ||
| <string>UIInterfaceOrientationLandscapeLeft</string> | ||
| <string>UIInterfaceOrientationLandscapeRight</string> | ||
| </array> | ||
| <key>UISupportedInterfaceOrientations~ipad</key> | ||
| <array> | ||
| <string>UIInterfaceOrientationPortrait</string> | ||
| <string>UIInterfaceOrientationPortraitUpsideDown</string> | ||
| <string>UIInterfaceOrientationLandscapeLeft</string> | ||
| <string>UIInterfaceOrientationLandscapeRight</string> | ||
| </array> | ||
| <key>XSAppIconAssets</key> | ||
| <string>Assets.xcassets/appicon.appiconset</string> | ||
| </dict> | ||
| </plist> |
16 changes: 16 additions & 0 deletions
16
mobile/examples/Maui/MauiVisionSample/MauiVisionSample/Platforms/MacCatalyst/Program.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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)); | ||
| } | ||
| } | ||
|
|
27 changes: 0 additions & 27 deletions
27
mobile/examples/super_resolution/MAUI/MauiSuperResolution.sln
This file was deleted.
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
mobile/examples/super_resolution/MAUI/MauiSuperResolution.slnx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <Solution> | ||
| <Project Path="MauiSuperResolution/MauiSuperResolution.csproj"> | ||
| <Deploy /> | ||
| </Project> | ||
| </Solution> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
...e/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/AppDelegate.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| using Foundation; | ||
|
|
||
| namespace MauiSuperResolution; | ||
|
|
||
| [Register("AppDelegate")] | ||
| public class AppDelegate : MauiUIApplicationDelegate | ||
| { | ||
| protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); | ||
| } | ||
|
|
14 changes: 14 additions & 0 deletions
14
...amples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Entitlements.plist
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?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> | ||
| </plist> | ||
|
|
38 changes: 38 additions & 0 deletions
38
mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Info.plist
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| <?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> | ||
| <!-- The Mac App Store requires you specify if the app uses encryption. --> | ||
| <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/itsappusesnonexemptencryption --> | ||
| <!-- <key>ITSAppUsesNonExemptEncryption</key> --> | ||
| <!-- Please indicate <true/> or <false/> here. --> | ||
|
|
||
| <!-- Specify the category for your app here. --> | ||
| <!-- Please consult https://developer.apple.com/documentation/bundleresources/information_property_list/lsapplicationcategorytype --> | ||
| <!-- <key>LSApplicationCategoryType</key> --> | ||
| <!-- <string>public.app-category.YOUR-CATEGORY-HERE</string> --> | ||
| <key>UIDeviceFamily</key> | ||
| <array> | ||
| <integer>2</integer> | ||
| </array> | ||
| <key>UIRequiredDeviceCapabilities</key> | ||
| <array> | ||
| <string>arm64</string> | ||
| </array> | ||
| <key>UISupportedInterfaceOrientations</key> | ||
| <array> | ||
| <string>UIInterfaceOrientationPortrait</string> | ||
| <string>UIInterfaceOrientationLandscapeLeft</string> | ||
| <string>UIInterfaceOrientationLandscapeRight</string> | ||
| </array> | ||
| <key>UISupportedInterfaceOrientations~ipad</key> | ||
| <array> | ||
| <string>UIInterfaceOrientationPortrait</string> | ||
| <string>UIInterfaceOrientationPortraitUpsideDown</string> | ||
| <string>UIInterfaceOrientationLandscapeLeft</string> | ||
| <string>UIInterfaceOrientationLandscapeRight</string> | ||
| </array> | ||
| <key>XSAppIconAssets</key> | ||
| <string>Assets.xcassets/appicon.appiconset</string> | ||
| </dict> | ||
| </plist> |
16 changes: 16 additions & 0 deletions
16
mobile/examples/super_resolution/MAUI/MauiSuperResolution/Platforms/MacCatalyst/Program.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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)); | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.