From f51ddd45bd4b1badbf2c0bd57397d5a3688f088f Mon Sep 17 00:00:00 2001 From: Dan Siegel Date: Sat, 24 Feb 2024 12:24:29 -0600 Subject: [PATCH] chore: Uno 5.1 update --- .vscode/extensions.json | 3 +- .vscode/launch.json | 5 +- .vscode/tasks.json | 8 +- Directory.Packages.props | 61 +++++---- e2e/Uno/Directory.Build.props | 71 ++-------- e2e/Uno/HelloWorld-vsmac.slnf | 12 -- e2e/Uno/HelloWorld.Base/AppHead.xaml | 17 --- e2e/Uno/HelloWorld.Base/AppHead.xaml.cs | 13 -- .../HelloWorld.Mobile/Android/Main.Android.cs | 38 +++--- .../Android/MainActivity.Android.cs | 10 +- .../Resources/drawable-xhdpi/splashscreen.png | Bin 7700 -> 0 bytes .../Resources/drawable/splash_screen.xml | 12 -- .../Android/Resources/values/Styles.xml | 11 +- .../HelloWorld.Mobile.csproj | 34 +++-- .../HelloWorld.Mobile/MacCatalyst/Info.plist | 5 +- .../MacCatalyst/LaunchScreen.storyboard | 52 -------- .../MacCatalyst/Main.maccatalyst.cs | 14 +- .../MacCatalyst/Resources/Default-568h@2x.png | Bin 2215 -> 0 bytes .../MacCatalyst/Resources/SplashScreen@2x.png | Bin 36520 -> 0 bytes .../MacCatalyst/Resources/SplashScreen@3x.png | Bin 59332 -> 0 bytes e2e/Uno/HelloWorld.Mobile/iOS/Info.plist | 10 +- .../iOS/LaunchScreen.storyboard | 52 -------- e2e/Uno/HelloWorld.Mobile/iOS/Main.iOS.cs | 14 +- .../iOS/Resources/Default-568h@2x.png | Bin 2215 -> 0 bytes .../iOS/Resources/SplashScreen.png | Bin 14776 -> 0 bytes .../iOS/Resources/SplashScreen@2x.png | Bin 36520 -> 0 bytes .../iOS/Resources/SplashScreen@3x.png | Bin 59332 -> 0 bytes e2e/Uno/HelloWorld.Shared/AppHead.xaml | 17 +++ e2e/Uno/HelloWorld.Shared/AppHead.xaml.cs | 17 +++ .../HelloWorld.Shared.csproj} | 2 +- .../Icons/appconfig.svg | 0 .../Icons/iconapp.svg | 0 .../Splash/splash_screen.svg | 0 .../base.props | 0 .../HelloWorld.Skia.Gtk.csproj | 20 ++- .../HelloWorld.Skia.Gtk/Package.appxmanifest | 43 ++++++ e2e/Uno/HelloWorld.Skia.Gtk/Program.cs | 1 + e2e/Uno/HelloWorld.Skia.Gtk/app.manifest | 74 ++++++++++- .../HelloWorld.Skia.Linux.FrameBuffer.csproj | 2 +- .../Program.cs | 3 +- .../HelloWorld.Skia.WPF.csproj | 2 +- .../HelloWorld.Wasm/Assets/SplashScreen.png | Bin 49447 -> 0 bytes .../HelloWorld.Wasm/HelloWorld.Wasm.csproj | 43 +++--- e2e/Uno/HelloWorld.Wasm/LinkerConfig.xml | 17 ++- e2e/Uno/HelloWorld.Wasm/Program.cs | 12 +- .../Properties/launchSettings.json | 2 +- e2e/Uno/HelloWorld.Wasm/WasmCSS/Fonts.css | 2 +- .../WasmScripts/AppManifest.js | 4 - .../{manifest.json => manifest.webmanifest} | 2 +- .../HelloWorld.Windows.csproj | 50 ++++--- .../Images/SplashScreen.png | Bin 7037 -> 0 bytes .../Images/SplashScreen.scale-100.png | Bin 4325 -> 0 bytes .../Images/SplashScreen.scale-125.png | Bin 5749 -> 0 bytes .../Images/SplashScreen.scale-150.png | Bin 7287 -> 0 bytes .../Images/SplashScreen.scale-200.png | Bin 11193 -> 0 bytes .../Images/SplashScreen.scale-400.png | Bin 32085 -> 0 bytes .../HelloWorld.Windows/Package.appxmanifest | 8 +- .../PublishProfiles/win-arm64.pubxml | 34 ++--- .../Properties/PublishProfiles/win-x64.pubxml | 32 ++--- .../Properties/PublishProfiles/win-x86.pubxml | 32 ++--- .../Properties/launchsettings.json | 12 +- .../Resources.lang-en-us.resw | 123 ++++++++++++++++++ e2e/Uno/HelloWorld.Windows/app.manifest | 10 ++ e2e/Uno/HelloWorld.sln | 4 +- e2e/Uno/HelloWorld/AppResources.xaml | 26 ++-- e2e/Uno/HelloWorld/Assets/SharedAssets.md | 32 +++-- e2e/Uno/HelloWorld/GlobalUsings.cs | 10 +- e2e/Uno/HelloWorld/HelloWorld.csproj | 65 +++------ .../Styles/MaterialFontsOverride.xaml | 8 -- e2e/Uno/ModuleA/ModuleA.csproj | 43 +----- e2e/Uno/solution-config.props.sample | 30 +++++ global.json | 4 +- .../Prism.DryIoc.Uno.WinUI.csproj | 7 +- .../Prism.Uno.WinUI.Markup.csproj | 2 +- src/Uno/Prism.Uno/Prism.Uno.WinUI.csproj | 16 +-- 75 files changed, 637 insertions(+), 616 deletions(-) delete mode 100644 e2e/Uno/HelloWorld-vsmac.slnf delete mode 100644 e2e/Uno/HelloWorld.Base/AppHead.xaml delete mode 100644 e2e/Uno/HelloWorld.Base/AppHead.xaml.cs delete mode 100644 e2e/Uno/HelloWorld.Mobile/Android/Resources/drawable-xhdpi/splashscreen.png delete mode 100644 e2e/Uno/HelloWorld.Mobile/Android/Resources/drawable/splash_screen.xml delete mode 100644 e2e/Uno/HelloWorld.Mobile/MacCatalyst/LaunchScreen.storyboard delete mode 100644 e2e/Uno/HelloWorld.Mobile/MacCatalyst/Resources/Default-568h@2x.png delete mode 100644 e2e/Uno/HelloWorld.Mobile/MacCatalyst/Resources/SplashScreen@2x.png delete mode 100644 e2e/Uno/HelloWorld.Mobile/MacCatalyst/Resources/SplashScreen@3x.png delete mode 100644 e2e/Uno/HelloWorld.Mobile/iOS/LaunchScreen.storyboard delete mode 100644 e2e/Uno/HelloWorld.Mobile/iOS/Resources/Default-568h@2x.png delete mode 100644 e2e/Uno/HelloWorld.Mobile/iOS/Resources/SplashScreen.png delete mode 100644 e2e/Uno/HelloWorld.Mobile/iOS/Resources/SplashScreen@2x.png delete mode 100644 e2e/Uno/HelloWorld.Mobile/iOS/Resources/SplashScreen@3x.png create mode 100644 e2e/Uno/HelloWorld.Shared/AppHead.xaml create mode 100644 e2e/Uno/HelloWorld.Shared/AppHead.xaml.cs rename e2e/Uno/{HelloWorld.Base/HelloWorld.Base.csproj => HelloWorld.Shared/HelloWorld.Shared.csproj} (89%) rename e2e/Uno/{HelloWorld.Base => HelloWorld.Shared}/Icons/appconfig.svg (100%) rename e2e/Uno/{HelloWorld.Base => HelloWorld.Shared}/Icons/iconapp.svg (100%) rename e2e/Uno/{HelloWorld.Base => HelloWorld.Shared}/Splash/splash_screen.svg (100%) rename e2e/Uno/{HelloWorld.Base => HelloWorld.Shared}/base.props (100%) create mode 100644 e2e/Uno/HelloWorld.Skia.Gtk/Package.appxmanifest delete mode 100644 e2e/Uno/HelloWorld.Wasm/Assets/SplashScreen.png rename e2e/Uno/HelloWorld.Wasm/{manifest.json => manifest.webmanifest} (99%) delete mode 100644 e2e/Uno/HelloWorld.Windows/Images/SplashScreen.png delete mode 100644 e2e/Uno/HelloWorld.Windows/Images/SplashScreen.scale-100.png delete mode 100644 e2e/Uno/HelloWorld.Windows/Images/SplashScreen.scale-125.png delete mode 100644 e2e/Uno/HelloWorld.Windows/Images/SplashScreen.scale-150.png delete mode 100644 e2e/Uno/HelloWorld.Windows/Images/SplashScreen.scale-200.png delete mode 100644 e2e/Uno/HelloWorld.Windows/Images/SplashScreen.scale-400.png create mode 100644 e2e/Uno/HelloWorld.Windows/Resources.lang-en-us.resw delete mode 100644 e2e/Uno/HelloWorld/Styles/MaterialFontsOverride.xaml create mode 100644 e2e/Uno/solution-config.props.sample diff --git a/.vscode/extensions.json b/.vscode/extensions.json index c77f737759..23a50c9eac 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -4,6 +4,7 @@ "ms-vscode.powershell", "editorconfig.editorconfig", "shd101wyy.markdown-preview-enhanced", - "streetsidesoftware.code-spell-checker" + "streetsidesoftware.code-spell-checker", + "unoplatform.vscode" ] } diff --git a/.vscode/launch.json b/.vscode/launch.json index 25171d3c83..aeafd2add9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,13 +18,14 @@ "name": "Debug (Chrome, WebAssembly)", "type": "chrome", "request": "launch", - "url": "http://localhost:5000", + "url": "http://localhost:5001", "webRoot": "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm", "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", "timeout": 30000, "server": { "runtimeExecutable": "dotnet", "program": "run", + "args": ["--no-build"], "outputCapture": "std", "timeout": 30000, "cwd": "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm" @@ -39,7 +40,7 @@ "request": "launch", "preLaunchTask": "build-skia-gtk", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk/bin/Debug/net7.0/HelloWorld.Skia.Gtk.dll", + "program": "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk/bin/Debug/net8.0/HelloWorld.Skia.Gtk.dll", "args": [], "env": { "DOTNET_MODIFIABLE_ASSEMBLIES": "debug" diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 98e75c9546..85be9e2b39 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/HelloWorld.Wasm/HelloWorld.Wasm.csproj", + "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm/HelloWorld.Wasm.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -19,7 +19,7 @@ "type": "process", "args": [ "publish", - "${workspaceFolder}/HelloWorld.Wasm/HelloWorld.Wasm.csproj", + "${workspaceFolder}/e2e/Uno/HelloWorld.Wasm/HelloWorld.Wasm.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -31,7 +31,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj", + "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], @@ -43,7 +43,7 @@ "type": "process", "args": [ "publish", - "${workspaceFolder}/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj", + "${workspaceFolder}/e2e/Uno/HelloWorld.Skia.Gtk/HelloWorld.Skia.Gtk.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], diff --git a/Directory.Packages.props b/Directory.Packages.props index 5b32222d5a..d5f281e5d5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,13 +1,11 @@ - - - + + + - - @@ -16,38 +14,45 @@ - + - - - - - - - - - + + + + + + + + + + + + - + - - - - + + + - - + + - - - - + + + + - + @@ -82,4 +87,4 @@ - \ No newline at end of file + diff --git a/e2e/Uno/Directory.Build.props b/e2e/Uno/Directory.Build.props index 03a051974a..a0276367b3 100644 --- a/e2e/Uno/Directory.Build.props +++ b/e2e/Uno/Directory.Build.props @@ -1,65 +1,20 @@ - + - 11 + net8.0 enable enable - - portable - True - true - - True - $(NoWarn);Uno0001;CS1998;CA1416;NU1507 - - en - - false - false - false - false - false - true - $(NoWarn);NU5104;NU5100;NU5118;NU5123;NU1603;CS1701;CS1702;XA0101;MSB3277;CS8785;CS8669;CS1998 true + true - net8.0 - + + $(NoWarn);NU1507;NETSDK1201;PRI257 - - - - true - 21.0 - - - - - true - 14.2 - iossimulator-x64 - - - - - true - 10.14 - osx-x64 - - - - - true - 14.0 - maccatalyst-x64 - - - - - true - true - 10.0.18362.0 - 10.0.18362.0 - - - + + false + diff --git a/e2e/Uno/HelloWorld-vsmac.slnf b/e2e/Uno/HelloWorld-vsmac.slnf deleted file mode 100644 index 39e2355452..0000000000 --- a/e2e/Uno/HelloWorld-vsmac.slnf +++ /dev/null @@ -1,12 +0,0 @@ -{ - "solution": { - "path": "HelloWorld.sln", - "projects": [ - "HelloWorld.Mobile\\HelloWorld.Mobile.csproj", - "HelloWorld.Skia.Gtk\\HelloWorld.Skia.Gtk.csproj", - "HelloWorld.Wasm\\HelloWorld.Wasm.csproj",, - "HelloWorld.Base\\HelloWorld.Base.csproj", - "HelloWorld\\HelloWorld.csproj" - ] - } -} diff --git a/e2e/Uno/HelloWorld.Base/AppHead.xaml b/e2e/Uno/HelloWorld.Base/AppHead.xaml deleted file mode 100644 index 43852f853f..0000000000 --- a/e2e/Uno/HelloWorld.Base/AppHead.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - diff --git a/e2e/Uno/HelloWorld.Base/AppHead.xaml.cs b/e2e/Uno/HelloWorld.Base/AppHead.xaml.cs deleted file mode 100644 index 478800e074..0000000000 --- a/e2e/Uno/HelloWorld.Base/AppHead.xaml.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace HelloWorld; - -public sealed partial class AppHead : App -{ - /// - /// 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 AppHead() - { - this.InitializeComponent(); - } -} diff --git a/e2e/Uno/HelloWorld.Mobile/Android/Main.Android.cs b/e2e/Uno/HelloWorld.Mobile/Android/Main.Android.cs index 6cb59bf1ff..ee70fdd4d4 100644 --- a/e2e/Uno/HelloWorld.Mobile/Android/Main.Android.cs +++ b/e2e/Uno/HelloWorld.Mobile/Android/Main.Android.cs @@ -14,30 +14,30 @@ namespace HelloWorld.Droid; [global::Android.App.ApplicationAttribute( - Label = "@string/ApplicationName", - Icon = "@mipmap/iconapp", - LargeHeap = true, - HardwareAccelerated = true, - Theme = "@style/AppTheme" + Label = "@string/ApplicationName", + Icon = "@mipmap/icon", + LargeHeap = true, + HardwareAccelerated = true, + Theme = "@style/AppTheme" )] public class Application : Microsoft.UI.Xaml.NativeApplication { - public Application(IntPtr javaReference, JniHandleOwnership transfer) - : base(() => new AppHead(), javaReference, transfer) - { - ConfigureUniversalImageLoader(); - } + public Application(IntPtr javaReference, JniHandleOwnership transfer) + : base(() => new AppHead(), javaReference, transfer) + { + ConfigureUniversalImageLoader(); + } - private static void ConfigureUniversalImageLoader() - { - // Create global configuration and initialize ImageLoader with this config - ImageLoaderConfiguration config = new ImageLoaderConfiguration - .Builder(Context) - .Build(); + private static void ConfigureUniversalImageLoader() + { + // Create global configuration and initialize ImageLoader with this config + ImageLoaderConfiguration config = new ImageLoaderConfiguration + .Builder(Context) + .Build(); - ImageLoader.Instance.Init(config); + ImageLoader.Instance.Init(config); - ImageSource.DefaultImageLoader = ImageLoader.Instance.LoadImageAsync; - } + ImageSource.DefaultImageLoader = ImageLoader.Instance.LoadImageAsync; + } } diff --git a/e2e/Uno/HelloWorld.Mobile/Android/MainActivity.Android.cs b/e2e/Uno/HelloWorld.Mobile/Android/MainActivity.Android.cs index 0e3bead6cc..878fdc2608 100644 --- a/e2e/Uno/HelloWorld.Mobile/Android/MainActivity.Android.cs +++ b/e2e/Uno/HelloWorld.Mobile/Android/MainActivity.Android.cs @@ -1,15 +1,15 @@ using Android.App; -using Android.Widget; -using Android.OS; using Android.Content.PM; +using Android.OS; using Android.Views; +using Android.Widget; namespace HelloWorld.Droid; [Activity( - MainLauncher = true, - ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges, - WindowSoftInputMode = SoftInput.AdjustNothing | SoftInput.StateHidden + MainLauncher = true, + ConfigurationChanges = global::Uno.UI.ActivityHelper.AllConfigChanges, + WindowSoftInputMode = SoftInput.AdjustNothing | SoftInput.StateHidden )] public class MainActivity : Microsoft.UI.Xaml.ApplicationActivity { diff --git a/e2e/Uno/HelloWorld.Mobile/Android/Resources/drawable-xhdpi/splashscreen.png b/e2e/Uno/HelloWorld.Mobile/Android/Resources/drawable-xhdpi/splashscreen.png deleted file mode 100644 index 023e7f1feda78d5100569825acedfd213a0d84e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7700 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 diff --git a/e2e/Uno/HelloWorld.Mobile/Android/Resources/drawable/splash_screen.xml b/e2e/Uno/HelloWorld.Mobile/Android/Resources/drawable/splash_screen.xml deleted file mode 100644 index cf6a923553..0000000000 --- a/e2e/Uno/HelloWorld.Mobile/Android/Resources/drawable/splash_screen.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/e2e/Uno/HelloWorld.Mobile/Android/Resources/values/Styles.xml b/e2e/Uno/HelloWorld.Mobile/Android/Resources/values/Styles.xml index fd16cd77f7..c02bd06f71 100644 --- a/e2e/Uno/HelloWorld.Mobile/Android/Resources/values/Styles.xml +++ b/e2e/Uno/HelloWorld.Mobile/Android/Resources/values/Styles.xml @@ -1,6 +1,6 @@ -