Package updates and .net 7

webprofusion · Dec 23, 2022 · a60ba76 · a60ba76
1 parent fccdb70
commit a60ba76
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 41 deletions.
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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <RootNamespace>Scalex.UI.Windows</RootNamespace>
     <AvaloniaVersion>0.10.12</AvaloniaVersion>
@@ -17,11 +17,11 @@
 	<TrimmableAssembly Include="Avalonia.Themes.Default" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview1" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview3" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview1" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview1" />
-    <PackageReference Include="Avalonia.Skia" Version="11.0.0-preview1" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview3" />
+    <PackageReference Include="Avalonia.Skia" Version="11.0.0-preview3" />
     <PackageReference Include="SkiaSharp" Version="2.88.3" />
     <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.3" />
   </ItemGroup>

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
@@ -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<Scalex.UI.App>()
-            .UseReactiveUI()
+        AppBuilder.Configure<Scalex.UI.App>()
+            .UseBlazor()
             .SetupWithSingleViewLifetime();
+
+        base.OnParametersSet();
     }
 }
diff --git 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
@@ -1,31 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <!--Temporal hack that fixes compilation in VS-->
-    <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net7.0</TargetFramework>
+		<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+		<WasmMainJSPath>main.js</WasmMainJSPath>
+		<OutputType>Exe</OutputType>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
+		<WasmBuildNative>true</WasmBuildNative>
+		<EmccFlags>-sVERBOSE -sERROR_ON_UNDEFINED_SYMBOLS=0</EmccFlags>
+	</PropertyGroup>
 
-  <!-- In debug, make builds faster by reducing optimizations -->
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <WasmNativeStrip>false</WasmNativeStrip>
-    <EmccCompileOptimizationFlag>-O1</EmccCompileOptimizationFlag>
-    <RunAOTCompilation>true</RunAOTCompilation>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <Optimize>true</Optimize>
-    <WasmNativeStrip>true</WasmNativeStrip>
-	<EmccCompileOptimizationFlag>-O3</EmccCompileOptimizationFlag>
-    <EmccLinkOptimizationFlag>-O3</EmccLinkOptimizationFlag>
-    <RunAOTCompilation>false</RunAOTCompilation>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(Configuration)'=='Release'">
+		<RunAOTCompilation>true</RunAOTCompilation>
+		<PublishTrimmed>true</PublishTrimmed>
+		<TrimMode>full</TrimMode>
+		<WasmBuildNative>true</WasmBuildNative>
+		<InvariantGlobalization>true</InvariantGlobalization>
+		<WasmEnableSIMD>true</WasmEnableSIMD>
+		<EmccCompileOptimizationFlag>-O3</EmccCompileOptimizationFlag>
+		<EmccLinkOptimizationFlag>-O3</EmccLinkOptimizationFlag>
+	</PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Skia" Version="11.0.0-preview1" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.10" PrivateAssets="all" />
-    <PackageReference Include="Avalonia.Web.Blazor" Version="11.0.0-preview1" />
+    <PackageReference Include="Avalonia.Skia" Version="11.0.0-preview3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
+    <PackageReference Include="Avalonia.Web.Blazor" Version="11.0.0-preview3" />
     <PackageReference Include="SkiaSharp" Version="2.88.3" />
     <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.3" />
   </ItemGroup>

diff --git 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 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.0-preview1" />    
+    <PackageReference Include="Avalonia" Version="11.0.0-preview3" />    
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview1" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview1" />
-    <PackageReference Include="Avalonia.Skia" Version="11.0.0-preview1" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview1" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview3" />
+    <PackageReference Include="Avalonia.Skia" Version="11.0.0-preview3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview3" />
     <PackageReference Include="SkiaSharp" Version="2.88.3" />
-	<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
+	<PackageReference Include="XamlNameReferenceGenerator" Version="1.4.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Core\Scalex.Core.csproj" />

diff --git a/src/Platforms/Scalex.Avalonia/Wpf/Wpf.csproj b/src/Platforms/Scalex.Avalonia/Wpf/Wpf.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AlphaTab.Windows" Version="1.3.0-alpha.271" />
+    <PackageReference Include="AlphaTab.Windows" Version="1.3.0-alpha.439" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Utils/Scalex.Utils.csproj b/src/Utils/Scalex.Utils.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AlphaTab" Version="1.3.0-alpha.271" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta1" />
+    <PackageReference Include="AlphaTab" Version="1.3.0-alpha.439" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta2" />
   </ItemGroup>
 
 </Project>