MAUI Add WinUI Unpackaged Launch & rename namespace/appname

XTsat · May 29, 2022 · 7fc28ab · 7fc28ab
1 parent 4823853
commit 7fc28ab
Show file tree

Hide file tree

Showing 23 changed files with 110 additions and 46 deletions.
diff --git a/src/ST.Client.Desktop.Avalonia.App/Properties/app.manifest b/src/ST.Client.Desktop.Avalonia.App/Properties/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-    <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+    <assemblyIdentity version="1.0.0.0" name="WattToolkit.app"/>
     <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
         <security>
             <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/src/ST.Client.Maui.App/App.xaml b/src/ST.Client.Maui.App/App.xaml
@@ -1,8 +1,8 @@
-<?xml version = "1.0" encoding = "UTF-8" ?>
+<?xml version = "1.0" encoding = "UTF-8" ?>
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:ST.Client.Maui.App"
-             x:Class="ST.Client.Maui.App.App">
+             xmlns:local="clr-namespace:System.Application.UI"
+             x:Class="System.Application.UI.App">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

diff --git a/src/ST.Client.Maui.App/App.xaml.cs b/src/ST.Client.Maui.App/App.xaml.cs
@@ -1,6 +1,8 @@
-namespace ST.Client.Maui.App
+using MauiApplication = Microsoft.Maui.Controls.Application;
+
+namespace System.Application.UI
 {
-    public partial class App : Application
+    public partial class App : MauiApplication
     {
         public App()
         {

diff --git a/src/ST.Client.Maui.App/AppShell.xaml b/src/ST.Client.Maui.App/AppShell.xaml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Shell
-    x:Class="ST.Client.Maui.App.AppShell"
+    x:Class="System.Application.UI.AppShell"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:ST.Client.Maui.App"
+    xmlns:local="clr-namespace:System.Application.UI"
     Shell.FlyoutBehavior="Disabled">
 
     <ShellContent

diff --git a/src/ST.Client.Maui.App/AppShell.xaml.cs b/src/ST.Client.Maui.App/AppShell.xaml.cs
@@ -1,4 +1,4 @@
-namespace ST.Client.Maui.App
+namespace System.Application.UI
 {
     public partial class AppShell : Shell
     {

diff --git a/src/ST.Client.Maui.App/MainPage.xaml b/src/ST.Client.Maui.App/MainPage.xaml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="ST.Client.Maui.App.MainPage">
+             x:Class="System.Application.UI.MainPage">
 
     <ScrollView>
         <VerticalStackLayout 

diff --git a/src/ST.Client.Maui.App/MainPage.xaml.cs b/src/ST.Client.Maui.App/MainPage.xaml.cs
@@ -1,4 +1,4 @@
-namespace ST.Client.Maui.App
+namespace System.Application.UI
 {
     public partial class MainPage : ContentPage
     {

diff --git a/src/ST.Client.Maui.App/MauiProgram.cs b/src/ST.Client.Maui.App/MauiProgram.cs
@@ -1,6 +1,6 @@
-namespace ST.Client.Maui.App
+namespace System.Application.UI
 {
-    public static class MauiProgram
+    public static partial class MauiProgram
     {
         public static MauiApp CreateMauiApp()
         {

diff --git a/src/ST.Client.Maui.App/Platforms/Android/MainActivity.cs b/src/ST.Client.Maui.App/Platforms/Android/MainActivity.cs
@@ -2,7 +2,7 @@
 using Android.Content.PM;
 using Android.OS;
 
-namespace ST.Client.Maui.App
+namespace System.Application.UI
 {
     [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
     public class MainActivity : MauiAppCompatActivity

diff --git a/src/ST.Client.Maui.App/Platforms/Android/MainApplication.cs b/src/ST.Client.Maui.App/Platforms/Android/MainApplication.cs
@@ -1,7 +1,7 @@
 using Android.App;
 using Android.Runtime;
 
-namespace ST.Client.Maui.App
+namespace System.Application.UI
 {
     [Application]
     public class MainApplication : MauiApplication

diff --git a/src/ST.Client.Maui.App/Platforms/MacCatalyst/AppDelegate.cs b/src/ST.Client.Maui.App/Platforms/MacCatalyst/AppDelegate.cs
@@ -1,6 +1,6 @@
-using Foundation;
+using Foundation;
 
-namespace ST.Client.Maui.App
+namespace System.Application.UI
 {
     [Register("AppDelegate")]
     public class AppDelegate : MauiUIApplicationDelegate

diff --git a/src/ST.Client.Maui.App/Platforms/MacCatalyst/Program.cs b/src/ST.Client.Maui.App/Platforms/MacCatalyst/Program.cs
@@ -1,7 +1,7 @@
 using ObjCRuntime;
 using UIKit;
 
-namespace ST.Client.Maui.App
+namespace System.Application.UI
 {
     public class Program
     {

diff --git a/src/ST.Client.Maui.App/Platforms/Tizen/Main.cs b/src/ST.Client.Maui.App/Platforms/Tizen/Main.cs
@@ -2,7 +2,7 @@
 using Microsoft.Maui.Hosting;
 using System;
 
-namespace ST.Client.Maui.App
+namespace System.Application.UI
 {
     class Program : MauiApplication
     {

diff --git a/src/ST.Client.Maui.App/Platforms/Tizen/tizen-manifest.xml b/src/ST.Client.Maui.App/Platforms/Tizen/tizen-manifest.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.companyname.ST.Client.Maui.App" version="1.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="net.steampp.app" version="1.0.0" api-version="7" xmlns="http://tizen.org/ns/packages">
   <profile name="common" />
-  <ui-application appid="com.companyname.ST.Client.Maui.App" exec="ST.Client.Maui.App.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
-    <label>ST.Client.Maui.App</label>
+  <ui-application appid="net.steampp.app" exec="Watt Toolkit.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
+    <label>Watt Toolkit</label>
     <icon>appicon.xhigh.png</icon>
     <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
   </ui-application>

diff --git a/src/ST.Client.Maui.App/Platforms/Windows/App.xaml b/src/ST.Client.Maui.App/Platforms/Windows/App.xaml
@@ -1,8 +1,8 @@
-<maui:MauiWinUIApplication
-    x:Class="ST.Client.Maui.App.WinUI.App"
+<maui:MauiWinUIApplication
+    x:Class="System.Application.UI.WinUI.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:maui="using:Microsoft.Maui"
-    xmlns:local="using:ST.Client.Maui.App.WinUI">
+    xmlns:local="using:System.Application.UI.WinUI">
 
 </maui:MauiWinUIApplication>
diff --git a/src/ST.Client.Maui.App/Platforms/Windows/App.xaml.cs b/src/ST.Client.Maui.App/Platforms/Windows/App.xaml.cs
@@ -1,9 +1,9 @@
-using Microsoft.UI.Xaml;
+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 ST.Client.Maui.App.WinUI
+namespace System.Application.UI.WinUI
 {
     /// <summary>
     /// Provides application-specific behavior to supplement the default Application class.

diff --git a/src/ST.Client.Maui.App/Platforms/Windows/MauiProgram.cs b/src/ST.Client.Maui.App/Platforms/Windows/MauiProgram.cs
@@ -0,0 +1,42 @@
+using System.Runtime.InteropServices;
+using WinRT;
+using Microsoft.UI.Dispatching;
+using WinUIApplication = Microsoft.UI.Xaml.Application;
+using WinUIApp = System.Application.UI.WinUI.App;
+
+namespace System.Application.UI
+{
+    public static partial class MauiProgram
+    {
+        static event Action? Exit;
+
+        [DllImport("Microsoft.ui.xaml.dll")]
+        static extern void XamlCheckProcessRequirements();
+
+        [STAThread]
+        static void Main(string[] args)
+        {
+            // 不能以管理员权限启动 程序“.exe”已退出，返回值为 3221226505 (0xc0000409)。
+            try
+            {
+                XamlCheckProcessRequirements();
+            }
+            catch (DllNotFoundException ex)
+            {
+                // 需要安装 Windows App Runtime
+                // <WindowsPackageType>None</WindowsPackageType>
+                throw new ApplicationException("Requires Windows App Runtime to be installed.", ex);
+            }
+            ComWrappersSupport.InitializeComWrappers();
+            WinUIApplication.Start(p =>
+            {
+                var context = new DispatcherQueueSynchronizationContext(DispatcherQueue.GetForCurrentThread());
+                SynchronizationContext.SetSynchronizationContext(context);
+
+                var app = new WinUIApp();
+            });
+
+            Exit?.Invoke();
+        }
+    }
+}
diff --git a/src/ST.Client.Maui.App/Platforms/Windows/app.manifest b/src/ST.Client.Maui.App/Platforms/Windows/app.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="ST.Client.Maui.App.WinUI.app"/>
+  <assemblyIdentity version="1.0.0.0" name="WattToolkit.app"/>
 
   <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>

diff --git a/src/ST.Client.Maui.App/Platforms/iOS/AppDelegate.cs b/src/ST.Client.Maui.App/Platforms/iOS/AppDelegate.cs
@@ -1,6 +1,6 @@
 using Foundation;
 
-namespace ST.Client.Maui.App
+namespace System.Application.UI
 {
     [Register("AppDelegate")]
     public class AppDelegate : MauiUIApplicationDelegate

diff --git a/src/ST.Client.Maui.App/Platforms/iOS/Program.cs b/src/ST.Client.Maui.App/Platforms/iOS/Program.cs
@@ -1,7 +1,7 @@
 using ObjCRuntime;
 using UIKit;
 
-namespace ST.Client.Maui.App
+namespace System.Application.UI
 {
     public class Program
     {

diff --git a/src/ST.Client.Maui.App/Properties/AssemblyInfo.OS.cs b/src/ST.Client.Maui.App/Properties/AssemblyInfo.OS.cs
@@ -0,0 +1,9 @@
+#if ANDROID
+[assembly: System.Runtime.Versioning.SupportedOSPlatform("Android21.0")]
+#elif WINDOWS
+[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows10.0.17763.0")]
+#elif IOS
+[assembly: System.Runtime.Versioning.SupportedOSPlatform("iOS10.0")]
+#elif MACCATALYST
+[assembly: System.Runtime.Versioning.SupportedOSPlatform("maccatalyst13.1")]
+#endif
diff --git a/src/ST.Client.Maui.App/Properties/launchSettings.json b/src/ST.Client.Maui.App/Properties/launchSettings.json
@@ -1,12 +1,10 @@
 {
   "profiles": {
     "Watt Toolkit (Package)": {
-      "commandName": "MsixPackage",
-      "nativeDebugging": false
+      "commandName": "MsixPackage"
     },
     "Watt Toolkit (Unpackaged)": {
-      "commandName": "Project",
-      "nativeDebugging": false
+      "commandName": "Project"
     }
   }
 }
diff --git a/src/ST.Client.Maui.App/ST.Client.Maui.App.csproj b/src/ST.Client.Maui.App/ST.Client.Maui.App.csproj
@@ -6,32 +6,45 @@
     <!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
     <!-- <TargetFrameworks>$(TargetFrameworks);net6.0-tizen</TargetFrameworks> -->
     <OutputType>Exe</OutputType>
-    <RootNamespace>ST.Client.Maui.App</RootNamespace>
+    <AssemblyName>Watt Toolkit</AssemblyName>
+    <RootNamespace>System.Application.UI</RootNamespace>
     <UseMaui>true</UseMaui>
     <SingleProject>true</SingleProject>
     <ImplicitUsings>enable</ImplicitUsings>
 
     <!-- Display name -->
-    <ApplicationTitle>ST.Client.Maui.App</ApplicationTitle>
+    <ApplicationTitle>Watt Toolkit</ApplicationTitle>
 
     <!-- App Identifier -->
-    <ApplicationId>com.companyname.st.client.maui.app</ApplicationId>
+    <ApplicationId>net.steampp.app</ApplicationId>
     <ApplicationIdGuid>81D03C5E-87AB-4FAE-AC12-05192637186E</ApplicationIdGuid>
 
     <!-- Versions -->
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <ApplicationVersion>1</ApplicationVersion>
 
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">14.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
-    <TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
-    <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
-
     <ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
+    <SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
+    <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+    <WindowsPackageType>None</WindowsPackageType>
+    <DefineConstants>DISABLE_XAML_GENERATED_MAIN;$(DefineConstants)</DefineConstants>
+    <StartupObject>System.Application.UI.MauiProgram</StartupObject>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">
+    <SupportedOSPlatformVersion>6.5</SupportedOSPlatformVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <!-- App Icon -->
     <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />