diff --git a/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Desktop/Scalex.UI.Desktop.csproj b/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Desktop/Scalex.UI.Desktop.csproj index 78b81fa..120c10c 100644 --- a/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Desktop/Scalex.UI.Desktop.csproj +++ b/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Desktop/Scalex.UI.Desktop.csproj @@ -1,7 +1,7 @@ WinExe - net6.0 + net7.0 enable Scalex.UI.Windows 0.10.12 @@ -17,11 +17,11 @@ - + - - + + diff --git a/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/App.razor.cs b/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/App.razor.cs index 2c425a9..4b399a2 100644 --- a/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/App.razor.cs +++ b/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/App.razor.cs @@ -1,4 +1,4 @@ -using Avalonia.ReactiveUI; +using Avalonia; using Avalonia.Web.Blazor; namespace Scalex.UI.Web; @@ -7,10 +7,10 @@ public partial class App { protected override void OnParametersSet() { - base.OnParametersSet(); - - WebAppBuilder.Configure() - .UseReactiveUI() + AppBuilder.Configure() + .UseBlazor() .SetupWithSingleViewLifetime(); + + base.OnParametersSet(); } } \ No newline at end of file diff --git a/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/Program.cs b/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/Program.cs index ea99055..6b580fa 100644 --- a/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/Program.cs +++ b/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/Program.cs @@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using Scalex.UI.Web; + public class Program { public static async Task Main(string[] args) diff --git a/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/Scalex.UI.Web.csproj b/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/Scalex.UI.Web.csproj index c4259ee..577835d 100644 --- a/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/Scalex.UI.Web.csproj +++ b/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/Scalex.UI.Web.csproj @@ -1,31 +1,31 @@ - - net6.0 - enable - - true - + + net7.0 + browser-wasm + main.js + Exe + true + true + true + -sVERBOSE -sERROR_ON_UNDEFINED_SYMBOLS=0 + - - - false - -O1 - true - - - - true - true - -O3 - -O3 - false - + + true + true + full + true + true + true + -O3 + -O3 + - - - - + + + + diff --git a/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI/Scalex.UI.csproj b/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI/Scalex.UI.csproj index 08671c4..b627ed8 100644 --- a/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI/Scalex.UI.csproj +++ b/src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI/Scalex.UI.csproj @@ -14,14 +14,14 @@ - + - - - + + + - + diff --git a/src/Platforms/Scalex.Avalonia/Wpf/Wpf.csproj b/src/Platforms/Scalex.Avalonia/Wpf/Wpf.csproj index bf3a898..d86780c 100644 --- a/src/Platforms/Scalex.Avalonia/Wpf/Wpf.csproj +++ b/src/Platforms/Scalex.Avalonia/Wpf/Wpf.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Utils/Scalex.Utils.csproj b/src/Utils/Scalex.Utils.csproj index 3f292e0..4e6b2ea 100644 --- a/src/Utils/Scalex.Utils.csproj +++ b/src/Utils/Scalex.Utils.csproj @@ -5,8 +5,8 @@ - - + +