Skip to content

Commit a60ba76

Browse files
webprofusion-chriscwebprofusion-chrisc
committed
Package updates and .net 7
1 parent fccdb70 commit a60ba76

File tree

7 files changed

+42
-41
lines changed

7 files changed

+42
-41
lines changed

‎src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Desktop/Scalex.UI.Desktop.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<RootNamespace>Scalex.UI.Windows</RootNamespace>
77
<AvaloniaVersion>0.10.12</AvaloniaVersion>
@@ -17,11 +17,11 @@
1717
<TrimmableAssembly Include="Avalonia.Themes.Default" />
1818
</ItemGroup>
1919
<ItemGroup>
20-
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview1" />
20+
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview3" />
2121
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
2222
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview1" />
23-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview1" />
24-
<PackageReference Include="Avalonia.Skia" Version="11.0.0-preview1" />
23+
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview3" />
24+
<PackageReference Include="Avalonia.Skia" Version="11.0.0-preview3" />
2525
<PackageReference Include="SkiaSharp" Version="2.88.3" />
2626
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.3" />
2727
</ItemGroup>

‎src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/App.razor.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Avalonia.ReactiveUI;
1+
using Avalonia;
22
using Avalonia.Web.Blazor;
33

44
namespace Scalex.UI.Web;
@@ -7,10 +7,10 @@ public partial class App
77
{
88
protected override void OnParametersSet()
99
{
10-
base.OnParametersSet();
11-
12-
WebAppBuilder.Configure<Scalex.UI.App>()
13-
.UseReactiveUI()
10+
AppBuilder.Configure<Scalex.UI.App>()
11+
.UseBlazor()
1412
.SetupWithSingleViewLifetime();
13+
14+
base.OnParametersSet();
1515
}
1616
}

‎src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/Program.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Microsoft.Extensions.DependencyInjection;
66
using Scalex.UI.Web;
77

8+
89
public class Program
910
{
1011
public static async Task Main(string[] args)

‎src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI.Web/Scalex.UI.Web.csproj

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
2-
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
4-
<Nullable>enable</Nullable>
5-
<!--Temporal hack that fixes compilation in VS-->
6-
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
7-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFramework>net7.0</TargetFramework>
4+
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
5+
<WasmMainJSPath>main.js</WasmMainJSPath>
6+
<OutputType>Exe</OutputType>
7+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
8+
<MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
9+
<WasmBuildNative>true</WasmBuildNative>
10+
<EmccFlags>-sVERBOSE -sERROR_ON_UNDEFINED_SYMBOLS=0</EmccFlags>
11+
</PropertyGroup>
812

9-
<!-- In debug, make builds faster by reducing optimizations -->
10-
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
11-
<WasmNativeStrip>false</WasmNativeStrip>
12-
<EmccCompileOptimizationFlag>-O1</EmccCompileOptimizationFlag>
13-
<RunAOTCompilation>true</RunAOTCompilation>
14-
</PropertyGroup>
15-
16-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
17-
<Optimize>true</Optimize>
18-
<WasmNativeStrip>true</WasmNativeStrip>
19-
<EmccCompileOptimizationFlag>-O3</EmccCompileOptimizationFlag>
20-
<EmccLinkOptimizationFlag>-O3</EmccLinkOptimizationFlag>
21-
<RunAOTCompilation>false</RunAOTCompilation>
22-
</PropertyGroup>
13+
<PropertyGroup Condition="'$(Configuration)'=='Release'">
14+
<RunAOTCompilation>true</RunAOTCompilation>
15+
<PublishTrimmed>true</PublishTrimmed>
16+
<TrimMode>full</TrimMode>
17+
<WasmBuildNative>true</WasmBuildNative>
18+
<InvariantGlobalization>true</InvariantGlobalization>
19+
<WasmEnableSIMD>true</WasmEnableSIMD>
20+
<EmccCompileOptimizationFlag>-O3</EmccCompileOptimizationFlag>
21+
<EmccLinkOptimizationFlag>-O3</EmccLinkOptimizationFlag>
22+
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Avalonia.Skia" Version="11.0.0-preview1" />
26-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.10" />
27-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.10" PrivateAssets="all" />
28-
<PackageReference Include="Avalonia.Web.Blazor" Version="11.0.0-preview1" />
25+
<PackageReference Include="Avalonia.Skia" Version="11.0.0-preview3" />
26+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
27+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
28+
<PackageReference Include="Avalonia.Web.Blazor" Version="11.0.0-preview3" />
2929
<PackageReference Include="SkiaSharp" Version="2.88.3" />
3030
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.3" />
3131
</ItemGroup>

‎src/Platforms/Scalex.Avalonia/Scalex.Avalonia.UI/Scalex.UI.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Avalonia" Version="11.0.0-preview1" />
17+
<PackageReference Include="Avalonia" Version="11.0.0-preview3" />
1818
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
1919
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview1" />
20-
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview1" />
21-
<PackageReference Include="Avalonia.Skia" Version="11.0.0-preview1" />
22-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview1" />
20+
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview3" />
21+
<PackageReference Include="Avalonia.Skia" Version="11.0.0-preview3" />
22+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview3" />
2323
<PackageReference Include="SkiaSharp" Version="2.88.3" />
24-
<PackageReference Include="XamlNameReferenceGenerator" Version="1.3.4" />
24+
<PackageReference Include="XamlNameReferenceGenerator" Version="1.4.2" />
2525
</ItemGroup>
2626
<ItemGroup>
2727
<ProjectReference Include="..\..\..\Core\Scalex.Core.csproj" />

‎src/Platforms/Scalex.Avalonia/Wpf/Wpf.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="AlphaTab.Windows" Version="1.3.0-alpha.271" />
11+
<PackageReference Include="AlphaTab.Windows" Version="1.3.0-alpha.439" />
1212
</ItemGroup>
1313

1414
</Project>

‎src/Utils/Scalex.Utils.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="AlphaTab" Version="1.3.0-alpha.271" />
9-
<PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta1" />
8+
<PackageReference Include="AlphaTab" Version="1.3.0-alpha.439" />
9+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2-beta2" />
1010
</ItemGroup>
1111

1212
</Project>

0 commit comments

Comments
 (0)