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 023e7f1fed..0000000000 Binary files a/e2e/Uno/HelloWorld.Mobile/Android/Resources/drawable-xhdpi/splashscreen.png and /dev/null differ 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 @@ -