From 59cc0b9caaab4b98fe1c70fd73bf007e8e9fde7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Su=C3=A1rez=20Ruiz?= Date: Sun, 27 Mar 2022 17:56:51 +0200 Subject: [PATCH] Updated .NET MAUI Triggers sample --- Triggers/.NET MAUI/Triggers.sln | 26 +++---- Triggers/.NET MAUI/Triggers/App.xaml | 7 ++ Triggers/.NET MAUI/Triggers/App.xaml.cs | 11 +++ .../Triggers/Directory.Build.targets | 21 ------ .../Triggers/{Triggers => }/MainPage.xaml | 11 +-- Triggers/.NET MAUI/Triggers/MainPage.xaml.cs | 9 +++ Triggers/.NET MAUI/Triggers/MauiProgram.cs | 17 +++++ .../Android/AndroidManifest.xml | 2 +- .../Platforms/Android/MainActivity.cs | 10 +++ .../Platforms/Android/MainApplication.cs | 15 ++++ .../Android/Resources/values/colors.xml | 0 .../Platforms/MacCatalyst/AppDelegate.cs | 9 +++ .../MacCatalyst/Info.plist | 4 -- .../Triggers/Platforms/MacCatalyst/Program.cs | 15 ++++ .../Triggers/Platforms/Windows/App.xaml | 8 +++ .../Triggers/Platforms/Windows/App.xaml.cs | 24 +++++++ .../Platforms/Windows/Package.appxmanifest | 33 +++++++++ .../Windows/app.manifest | 0 .../Triggers/Platforms/iOS/AppDelegate.cs | 9 +++ .../{Triggers => Platforms}/iOS/Info.plist | 2 - .../Triggers/Platforms/iOS/Program.cs | 15 ++++ .../Triggers/Properties/launchSettings.json | 8 +++ .../Resources/Fonts/OpenSans-Regular.ttf | Bin 96932 -> 107136 bytes .../Resources/Images/dotnet_bot.svg | 0 .../Triggers/Resources/Raw/AboutAssets.txt | 14 ++++ .../{Triggers => }/Resources/appicon.svg | 0 .../{Triggers => }/Resources/appiconfg.svg | 0 .../Properties/launchSettings.json | 7 -- .../Triggers.WinUI/Triggers.WinUI.csproj | 64 ------------------ .../Triggers/Triggers.WinUI/Windows/App.xaml | 15 ---- .../Triggers.WinUI/Windows/App.xaml.cs | 34 ---------- .../Windows/Package.appxmanifest | 58 ---------------- Triggers/.NET MAUI/Triggers/Triggers.csproj | 63 +++++++++++++++++ .../Triggers/Android/AndroidEnvironment.txt | 1 - .../Triggers/Triggers/Android/MainActivity.cs | 11 --- .../Triggers/Android/MainApplication.cs | 16 ----- .../Android/Resources/values/styles.xml | 16 ----- Triggers/.NET MAUI/Triggers/Triggers/App.xaml | 6 -- .../.NET MAUI/Triggers/Triggers/App.xaml.cs | 22 ------ .../Triggers/MacCatalyst/AppDelegate.cs | 10 --- .../Triggers/MacCatalyst/Entitlements.plist | 6 -- .../Triggers/Triggers/MacCatalyst/Program.cs | 15 ---- .../Triggers/Triggers/MainPage.xaml.cs | 12 ---- .../.NET MAUI/Triggers/Triggers/Startup.cs | 19 ------ .../Triggers/Triggers/Triggers.csproj | 53 --------------- .../Triggers/Triggers/iOS/AppDelegate.cs | 10 --- .../Triggers/Triggers/iOS/Entitlements.plist | 6 -- .../Triggers/Triggers/iOS/Program.cs | 15 ---- .../Triggers/iOS/Resources/LaunchScreen.xib | 43 ------------ 49 files changed, 283 insertions(+), 489 deletions(-) create mode 100644 Triggers/.NET MAUI/Triggers/App.xaml create mode 100644 Triggers/.NET MAUI/Triggers/App.xaml.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Directory.Build.targets rename Triggers/.NET MAUI/Triggers/{Triggers => }/MainPage.xaml (85%) create mode 100644 Triggers/.NET MAUI/Triggers/MainPage.xaml.cs create mode 100644 Triggers/.NET MAUI/Triggers/MauiProgram.cs rename Triggers/.NET MAUI/Triggers/{Triggers => Platforms}/Android/AndroidManifest.xml (95%) create mode 100644 Triggers/.NET MAUI/Triggers/Platforms/Android/MainActivity.cs create mode 100644 Triggers/.NET MAUI/Triggers/Platforms/Android/MainApplication.cs rename Triggers/.NET MAUI/Triggers/{Triggers => Platforms}/Android/Resources/values/colors.xml (100%) create mode 100644 Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/AppDelegate.cs rename Triggers/.NET MAUI/Triggers/{Triggers => Platforms}/MacCatalyst/Info.plist (87%) create mode 100644 Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/Program.cs create mode 100644 Triggers/.NET MAUI/Triggers/Platforms/Windows/App.xaml create mode 100644 Triggers/.NET MAUI/Triggers/Platforms/Windows/App.xaml.cs create mode 100644 Triggers/.NET MAUI/Triggers/Platforms/Windows/Package.appxmanifest rename Triggers/.NET MAUI/Triggers/{Triggers.WinUI => Platforms}/Windows/app.manifest (100%) create mode 100644 Triggers/.NET MAUI/Triggers/Platforms/iOS/AppDelegate.cs rename Triggers/.NET MAUI/Triggers/{Triggers => Platforms}/iOS/Info.plist (94%) create mode 100644 Triggers/.NET MAUI/Triggers/Platforms/iOS/Program.cs create mode 100644 Triggers/.NET MAUI/Triggers/Properties/launchSettings.json rename Triggers/.NET MAUI/Triggers/{Triggers => }/Resources/Fonts/OpenSans-Regular.ttf (90%) rename Triggers/.NET MAUI/Triggers/{Triggers => }/Resources/Images/dotnet_bot.svg (100%) create mode 100644 Triggers/.NET MAUI/Triggers/Resources/Raw/AboutAssets.txt rename Triggers/.NET MAUI/Triggers/{Triggers => }/Resources/appicon.svg (100%) rename Triggers/.NET MAUI/Triggers/{Triggers => }/Resources/appiconfg.svg (100%) delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers.WinUI/Properties/launchSettings.json delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers.WinUI/Triggers.WinUI.csproj delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/App.xaml delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/App.xaml.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/Package.appxmanifest create mode 100644 Triggers/.NET MAUI/Triggers/Triggers.csproj delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/Android/AndroidEnvironment.txt delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/Android/MainActivity.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/Android/MainApplication.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/Android/Resources/values/styles.xml delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/App.xaml delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/App.xaml.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/MacCatalyst/AppDelegate.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/MacCatalyst/Entitlements.plist delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/MacCatalyst/Program.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/MainPage.xaml.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/Startup.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/Triggers.csproj delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/iOS/AppDelegate.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/iOS/Entitlements.plist delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/iOS/Program.cs delete mode 100644 Triggers/.NET MAUI/Triggers/Triggers/iOS/Resources/LaunchScreen.xib diff --git a/Triggers/.NET MAUI/Triggers.sln b/Triggers/.NET MAUI/Triggers.sln index 6249fe8..4c5944b 100644 --- a/Triggers/.NET MAUI/Triggers.sln +++ b/Triggers/.NET MAUI/Triggers.sln @@ -1,11 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31220.234 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31611.283 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Triggers", "Triggers\Triggers\Triggers.csproj", "{928579F0-DDC1-47EC-A023-21A8788C037A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Triggers.WinUI", "Triggers\Triggers.WinUI\Triggers.WinUI.csproj", "{7BCF8FB8-E000-464A-8318-2667F89F9A7E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Triggers", "Triggers\Triggers.csproj", "{26290A55-3E0E-48EA-A8EB-CD76DA956C9A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -13,18 +11,12 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {928579F0-DDC1-47EC-A023-21A8788C037A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {928579F0-DDC1-47EC-A023-21A8788C037A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {928579F0-DDC1-47EC-A023-21A8788C037A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {928579F0-DDC1-47EC-A023-21A8788C037A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {928579F0-DDC1-47EC-A023-21A8788C037A}.Release|Any CPU.Build.0 = Release|Any CPU - {928579F0-DDC1-47EC-A023-21A8788C037A}.Release|Any CPU.Deploy.0 = Release|Any CPU - {7BCF8FB8-E000-464A-8318-2667F89F9A7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BCF8FB8-E000-464A-8318-2667F89F9A7E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BCF8FB8-E000-464A-8318-2667F89F9A7E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {7BCF8FB8-E000-464A-8318-2667F89F9A7E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BCF8FB8-E000-464A-8318-2667F89F9A7E}.Release|Any CPU.Build.0 = Release|Any CPU - {7BCF8FB8-E000-464A-8318-2667F89F9A7E}.Release|Any CPU.Deploy.0 = Release|Any CPU + {26290A55-3E0E-48EA-A8EB-CD76DA956C9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26290A55-3E0E-48EA-A8EB-CD76DA956C9A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {26290A55-3E0E-48EA-A8EB-CD76DA956C9A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {26290A55-3E0E-48EA-A8EB-CD76DA956C9A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {26290A55-3E0E-48EA-A8EB-CD76DA956C9A}.Release|Any CPU.Build.0 = Release|Any CPU + {26290A55-3E0E-48EA-A8EB-CD76DA956C9A}.Release|Any CPU.Deploy.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Triggers/.NET MAUI/Triggers/App.xaml b/Triggers/.NET MAUI/Triggers/App.xaml new file mode 100644 index 0000000..de4818a --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/App.xaml @@ -0,0 +1,7 @@ + + + diff --git a/Triggers/.NET MAUI/Triggers/App.xaml.cs b/Triggers/.NET MAUI/Triggers/App.xaml.cs new file mode 100644 index 0000000..93a5483 --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/App.xaml.cs @@ -0,0 +1,11 @@ +namespace Triggers; + +public partial class App : Application +{ + public App() + { + InitializeComponent(); + + MainPage = new MainPage(); + } +} \ No newline at end of file diff --git a/Triggers/.NET MAUI/Triggers/Directory.Build.targets b/Triggers/.NET MAUI/Triggers/Directory.Build.targets deleted file mode 100644 index fa64a89..0000000 --- a/Triggers/.NET MAUI/Triggers/Directory.Build.targets +++ /dev/null @@ -1,21 +0,0 @@ - - - - - <_KeepLaunchProfiles>true - - - - - - - - - - - - - - - - diff --git a/Triggers/.NET MAUI/Triggers/Triggers/MainPage.xaml b/Triggers/.NET MAUI/Triggers/MainPage.xaml similarity index 85% rename from Triggers/.NET MAUI/Triggers/Triggers/MainPage.xaml rename to Triggers/.NET MAUI/Triggers/MainPage.xaml index f42578c..3537da8 100644 --- a/Triggers/.NET MAUI/Triggers/Triggers/MainPage.xaml +++ b/Triggers/.NET MAUI/Triggers/MainPage.xaml @@ -1,4 +1,5 @@ - + - + - + \ No newline at end of file diff --git a/Triggers/.NET MAUI/Triggers/MainPage.xaml.cs b/Triggers/.NET MAUI/Triggers/MainPage.xaml.cs new file mode 100644 index 0000000..84ecb09 --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/MainPage.xaml.cs @@ -0,0 +1,9 @@ +namespace Triggers; + +public partial class MainPage : ContentPage +{ + public MainPage() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/Triggers/.NET MAUI/Triggers/MauiProgram.cs b/Triggers/.NET MAUI/Triggers/MauiProgram.cs new file mode 100644 index 0000000..6c483fe --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/MauiProgram.cs @@ -0,0 +1,17 @@ +namespace Triggers; + +public static class MauiProgram +{ + public static MauiApp CreateMauiApp() + { + var builder = MauiApp.CreateBuilder(); + builder + .UseMauiApp() + .ConfigureFonts(fonts => + { + fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); + }); + + return builder.Build(); + } +} diff --git a/Triggers/.NET MAUI/Triggers/Triggers/Android/AndroidManifest.xml b/Triggers/.NET MAUI/Triggers/Platforms/Android/AndroidManifest.xml similarity index 95% rename from Triggers/.NET MAUI/Triggers/Triggers/Android/AndroidManifest.xml rename to Triggers/.NET MAUI/Triggers/Platforms/Android/AndroidManifest.xml index 85bd4d5..7570ff6 100644 --- a/Triggers/.NET MAUI/Triggers/Triggers/Android/AndroidManifest.xml +++ b/Triggers/.NET MAUI/Triggers/Platforms/Android/AndroidManifest.xml @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Triggers/.NET MAUI/Triggers/Platforms/Android/MainActivity.cs b/Triggers/.NET MAUI/Triggers/Platforms/Android/MainActivity.cs new file mode 100644 index 0000000..8458e90 --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Platforms/Android/MainActivity.cs @@ -0,0 +1,10 @@ +using Android.App; +using Android.Content.PM; +using Android.OS; + +namespace Triggers; + +[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)] +public class MainActivity : MauiAppCompatActivity +{ +} diff --git a/Triggers/.NET MAUI/Triggers/Platforms/Android/MainApplication.cs b/Triggers/.NET MAUI/Triggers/Platforms/Android/MainApplication.cs new file mode 100644 index 0000000..2b80ba4 --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Platforms/Android/MainApplication.cs @@ -0,0 +1,15 @@ +using Android.App; +using Android.Runtime; + +namespace Triggers; + +[Application] +public class MainApplication : MauiApplication +{ + public MainApplication(IntPtr handle, JniHandleOwnership ownership) + : base(handle, ownership) + { + } + + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); +} diff --git a/Triggers/.NET MAUI/Triggers/Triggers/Android/Resources/values/colors.xml b/Triggers/.NET MAUI/Triggers/Platforms/Android/Resources/values/colors.xml similarity index 100% rename from Triggers/.NET MAUI/Triggers/Triggers/Android/Resources/values/colors.xml rename to Triggers/.NET MAUI/Triggers/Platforms/Android/Resources/values/colors.xml diff --git a/Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/AppDelegate.cs b/Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/AppDelegate.cs new file mode 100644 index 0000000..4596cf3 --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/AppDelegate.cs @@ -0,0 +1,9 @@ +using Foundation; + +namespace Triggers; + +[Register("AppDelegate")] +public class AppDelegate : MauiUIApplicationDelegate +{ + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); +} diff --git a/Triggers/.NET MAUI/Triggers/Triggers/MacCatalyst/Info.plist b/Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/Info.plist similarity index 87% rename from Triggers/.NET MAUI/Triggers/Triggers/MacCatalyst/Info.plist rename to Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/Info.plist index c70cb4a..c96dd0a 100644 --- a/Triggers/.NET MAUI/Triggers/Triggers/MacCatalyst/Info.plist +++ b/Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/Info.plist @@ -2,15 +2,11 @@ - LSMinimumSystemVersion - 10.15 UIDeviceFamily 1 2 - XSAppIconAssets - Assets.xcassets/appicon.appiconset UIRequiredDeviceCapabilities arm64 diff --git a/Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/Program.cs b/Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/Program.cs new file mode 100644 index 0000000..1430ed5 --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Platforms/MacCatalyst/Program.cs @@ -0,0 +1,15 @@ +using ObjCRuntime; +using UIKit; + +namespace Triggers; + +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/Triggers/.NET MAUI/Triggers/Platforms/Windows/App.xaml b/Triggers/.NET MAUI/Triggers/Platforms/Windows/App.xaml new file mode 100644 index 0000000..a804624 --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Platforms/Windows/App.xaml @@ -0,0 +1,8 @@ + + + diff --git a/Triggers/.NET MAUI/Triggers/Platforms/Windows/App.xaml.cs b/Triggers/.NET MAUI/Triggers/Platforms/Windows/App.xaml.cs new file mode 100644 index 0000000..234faad --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Platforms/Windows/App.xaml.cs @@ -0,0 +1,24 @@ +using Microsoft.UI.Xaml; + +// To learn more about WinUI, the WinUI project structure, +// and more about our project templates, see: http://aka.ms/winui-project-info. + +namespace Triggers.WinUI; + +/// +/// Provides application-specific behavior to supplement the default Application class. +/// +public partial class App : MauiWinUIApplication +{ + /// + /// Initializes the singleton application object. This is the first line of authored code + /// executed, and as such is the logical equivalent of main() or WinMain(). + /// + public App() + { + this.InitializeComponent(); + } + + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); +} + diff --git a/Triggers/.NET MAUI/Triggers/Platforms/Windows/Package.appxmanifest b/Triggers/.NET MAUI/Triggers/Platforms/Windows/Package.appxmanifest new file mode 100644 index 0000000..0cb469c --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Platforms/Windows/Package.appxmanifest @@ -0,0 +1,33 @@ + + + + + + + User Name + + + + + + + + + + + + + + + + + + + + + + diff --git a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/app.manifest b/Triggers/.NET MAUI/Triggers/Platforms/Windows/app.manifest similarity index 100% rename from Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/app.manifest rename to Triggers/.NET MAUI/Triggers/Platforms/Windows/app.manifest diff --git a/Triggers/.NET MAUI/Triggers/Platforms/iOS/AppDelegate.cs b/Triggers/.NET MAUI/Triggers/Platforms/iOS/AppDelegate.cs new file mode 100644 index 0000000..4596cf3 --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Platforms/iOS/AppDelegate.cs @@ -0,0 +1,9 @@ +using Foundation; + +namespace Triggers; + +[Register("AppDelegate")] +public class AppDelegate : MauiUIApplicationDelegate +{ + protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp(); +} diff --git a/Triggers/.NET MAUI/Triggers/Triggers/iOS/Info.plist b/Triggers/.NET MAUI/Triggers/Platforms/iOS/Info.plist similarity index 94% rename from Triggers/.NET MAUI/Triggers/Triggers/iOS/Info.plist rename to Triggers/.NET MAUI/Triggers/Platforms/iOS/Info.plist index ed2ffb6..0004a4f 100644 --- a/Triggers/.NET MAUI/Triggers/Triggers/iOS/Info.plist +++ b/Triggers/.NET MAUI/Triggers/Platforms/iOS/Info.plist @@ -4,8 +4,6 @@ LSRequiresIPhoneOS - MinimumOSVersion - 10.3.4 UIDeviceFamily 1 diff --git a/Triggers/.NET MAUI/Triggers/Platforms/iOS/Program.cs b/Triggers/.NET MAUI/Triggers/Platforms/iOS/Program.cs new file mode 100644 index 0000000..1430ed5 --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Platforms/iOS/Program.cs @@ -0,0 +1,15 @@ +using ObjCRuntime; +using UIKit; + +namespace Triggers; + +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/Triggers/.NET MAUI/Triggers/Properties/launchSettings.json b/Triggers/.NET MAUI/Triggers/Properties/launchSettings.json new file mode 100644 index 0000000..edf8aad --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "Windows Machine": { + "commandName": "MsixPackage", + "nativeDebugging": false + } + } +} \ No newline at end of file diff --git a/Triggers/.NET MAUI/Triggers/Triggers/Resources/Fonts/OpenSans-Regular.ttf b/Triggers/.NET MAUI/Triggers/Resources/Fonts/OpenSans-Regular.ttf similarity index 90% rename from Triggers/.NET MAUI/Triggers/Triggers/Resources/Fonts/OpenSans-Regular.ttf rename to Triggers/.NET MAUI/Triggers/Resources/Fonts/OpenSans-Regular.ttf index 29bfd35a2bfdd92b6e8b4ec2970f4d1eebf49357..df0182716ff2b377d6c2e98221301c1e0d665c83 100644 GIT binary patch delta 10594 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 + +These files will be deployed with you package and will be accessible using Essentials: + + async Task LoadMauiAsset() + { + using var stream = await FileSystem.OpenAppPackageFileAsync("AboutAssets.txt"); + using var reader = new StreamReader(stream); + + var contents = reader.ReadToEnd(); + } diff --git a/Triggers/.NET MAUI/Triggers/Triggers/Resources/appicon.svg b/Triggers/.NET MAUI/Triggers/Resources/appicon.svg similarity index 100% rename from Triggers/.NET MAUI/Triggers/Triggers/Resources/appicon.svg rename to Triggers/.NET MAUI/Triggers/Resources/appicon.svg diff --git a/Triggers/.NET MAUI/Triggers/Triggers/Resources/appiconfg.svg b/Triggers/.NET MAUI/Triggers/Resources/appiconfg.svg similarity index 100% rename from Triggers/.NET MAUI/Triggers/Triggers/Resources/appiconfg.svg rename to Triggers/.NET MAUI/Triggers/Resources/appiconfg.svg diff --git a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Properties/launchSettings.json b/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Properties/launchSettings.json deleted file mode 100644 index 0cc4400..0000000 --- a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Properties/launchSettings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "profiles": { - "Triggers.WinUI": { - "commandName": "AppContainer" - } - } -} \ No newline at end of file diff --git a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Triggers.WinUI.csproj b/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Triggers.WinUI.csproj deleted file mode 100644 index ace60e9..0000000 --- a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Triggers.WinUI.csproj +++ /dev/null @@ -1,64 +0,0 @@ - - - - net6.0-windows10.0.19041 - WinExe - 10.0.17763.0 - true - Triggers - - - true - MSIX - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/App.xaml b/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/App.xaml deleted file mode 100644 index 58e1a98..0000000 --- a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/App.xaml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - diff --git a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/App.xaml.cs b/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/App.xaml.cs deleted file mode 100644 index ad36f38..0000000 --- a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/App.xaml.cs +++ /dev/null @@ -1,34 +0,0 @@ -using Microsoft.Maui; -using Microsoft.UI.Xaml; -using Windows.ApplicationModel; - -// To learn more about WinUI, the WinUI project structure, -// and more about our project templates, see: http://aka.ms/winui-project-info. - -namespace Triggers.WinUI -{ - /// - /// Provides application-specific behavior to supplement the default Application class. - /// - public partial class App : MiddleApp - { - /// - /// Initializes the singleton application object. This is the first line of authored code - /// executed, and as such is the logical equivalent of main() or WinMain(). - /// - public App() - { - this.InitializeComponent(); - } - - protected override void OnLaunched(LaunchActivatedEventArgs args) - { - base.OnLaunched(args); - - Microsoft.Maui.Essentials.Platform.OnLaunched(args); - } - } - public class MiddleApp : MauiWinUIApplication - { - } -} diff --git a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/Package.appxmanifest b/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/Package.appxmanifest deleted file mode 100644 index f1b9c0e..0000000 --- a/Triggers/.NET MAUI/Triggers/Triggers.WinUI/Windows/Package.appxmanifest +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - Triggers - Microsoft - Assets\appiconStoreLogo.png - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Triggers/.NET MAUI/Triggers/Triggers.csproj b/Triggers/.NET MAUI/Triggers/Triggers.csproj new file mode 100644 index 0000000..4cd1cd7 --- /dev/null +++ b/Triggers/.NET MAUI/Triggers/Triggers.csproj @@ -0,0 +1,63 @@ + + + + net6.0-android;net6.0-ios;net6.0-maccatalyst + $(TargetFrameworks);net6.0-windows10.0.19041 + Exe + Triggers + true + true + enable + true + + + Triggers + + + com.companyname.triggers + 35CEA039-99E7-405E-B588-49C17890ED25 + + + 1.0 + 1 + + + True + + 14.2 + 14.0 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + WinExe + win10-x64 + + + diff --git a/Triggers/.NET MAUI/Triggers/Triggers/Android/AndroidEnvironment.txt b/Triggers/.NET MAUI/Triggers/Triggers/Android/AndroidEnvironment.txt deleted file mode 100644 index 2cdf769..0000000 --- a/Triggers/.NET MAUI/Triggers/Triggers/Android/AndroidEnvironment.txt +++ /dev/null @@ -1 +0,0 @@ -DOTNET_MODIFIABLE_ASSEMBLIES=Debug \ No newline at end of file diff --git a/Triggers/.NET MAUI/Triggers/Triggers/Android/MainActivity.cs b/Triggers/.NET MAUI/Triggers/Triggers/Android/MainActivity.cs deleted file mode 100644 index a91af8d..0000000 --- a/Triggers/.NET MAUI/Triggers/Triggers/Android/MainActivity.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Android.App; -using Android.Content.PM; -using Microsoft.Maui; - -namespace Triggers -{ - [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)] - public class MainActivity : MauiAppCompatActivity - { - } -} \ No newline at end of file diff --git a/Triggers/.NET MAUI/Triggers/Triggers/Android/MainApplication.cs b/Triggers/.NET MAUI/Triggers/Triggers/Android/MainApplication.cs deleted file mode 100644 index 537c7ba..0000000 --- a/Triggers/.NET MAUI/Triggers/Triggers/Android/MainApplication.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using Android.App; -using Android.Runtime; -using Microsoft.Maui; - -namespace Triggers -{ - [Application] - public class MainApplication : MauiApplication - { - public MainApplication(IntPtr handle, JniHandleOwnership ownership) - : base(handle, ownership) - { - } - } -} \ No newline at end of file diff --git a/Triggers/.NET MAUI/Triggers/Triggers/Android/Resources/values/styles.xml b/Triggers/.NET MAUI/Triggers/Triggers/Android/Resources/values/styles.xml deleted file mode 100644 index b749b60..0000000 --- a/Triggers/.NET MAUI/Triggers/Triggers/Android/Resources/values/styles.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - -