Skip to content

Commit c77c948

Browse files
authored
Merge pull request #527 from unoplatform/dev/jela/53-update
Update to 5.3
2 parents 1e6f258 + d1e0d14 commit c77c948

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

build/canary-updater.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
steps:
33

4-
- task: nventiveCanaryUpdater@5
4+
- task: unoplatformCanaryUpdater@1
55
displayName: 'Canary Update'
66
condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/dev')
77
inputs:
88
solution: src/Uno.Playground.sln
99
branchToMerge: master
1010
summaryFile: '$(Build.ArtifactStagingDirectory)/Canary.md'
1111
resultFile: '$(Build.ArtifactStagingDirectory)/result.json'
12-
nugetUpdaterVersion: 2.3.0-alpha.46
13-
packageAuthor: 'nventive,unoplatform,uno platform'
12+
nugetUpdaterVersion: 1.1.0
13+
packageAuthor: 'unoplatform,uno platform'

src/Uno.Playground.Shared/App.xaml.cs

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ public App()
3838
{
3939
InitializeLogging();
4040

41+
global::Uno.UI.FeatureConfiguration.Font.DefaultTextFontFamily = "ms-appx:///Uno.Fonts.OpenSans/Fonts/OpenSans.ttf";
42+
4143
this.InitializeComponent();
4244
this.Suspending += OnSuspending;
4345
}

src/Uno.Playground.WASM/Uno.Playground.WASM.csproj

+19-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -64,7 +64,7 @@
6464
<Content Include="Assets\*.*" />
6565
</ItemGroup>
6666

67-
<!--
67+
<!--
6868
<ItemGroup>
6969
<WasmShellMonoEnvironment Include="MONO_GC_PARAMS" Value="soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep" />
7070
<WasmShellMonoEnvironment Include="MONO_LOG_LEVEL" Value="debug" />
@@ -92,28 +92,30 @@
9292
</PackageReference>
9393
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
9494
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
95-
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.6.0" />
96-
<PackageReference Include="Uno.Monaco.Editor" Version="2.0.0-dev.50" />
95+
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.8.0-dev.1" />
96+
<PackageReference Include="Uno.Monaco.Editor" Version="2.0.0-dev.60" />
9797

9898
<PackageReference Include="Uno.CommunityToolkit.WinUI.DeveloperTools" Version="7.1.200" />
9999
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
100100
<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200" />
101101

102-
<PackageReference Include="Uno.Toolkit.WinUI" Version="5.1.3" />
103-
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="5.1.3" />
104-
105-
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.1.31" />
106-
<PackageReference Include="Uno.WinUI.Lottie" Version="5.1.31" />
107-
<PackageReference Include="Uno.Core.Extensions" Version="4.0.1" />
108-
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
109-
<PackageReference Include="Uno.Core" Version="4.0.1" />
110-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.1.31" Condition="'$(Configuration)'=='Debug'" />
111-
<PackageReference Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.1.31" />
112-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.31" />
113-
<PackageReference Include="Uno.Wasm.Bootstrap" Version="8.0.8" />
114-
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.8" />
102+
<PackageReference Include="Uno.Toolkit.WinUI" Version="6.2.0-dev.6" />
103+
<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="6.2.0-dev.6" />
104+
105+
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.3.90" />
106+
<PackageReference Include="Uno.WinUI.Lottie" Version="5.3.90" />
107+
<PackageReference Include="Uno.Core.Extensions" Version="4.1.1" />
108+
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.1.1" />
109+
<PackageReference Include="Uno.Core" Version="4.1.1" />
110+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.3.90" Condition="'$(Configuration)'=='Debug'" />
111+
<PackageReference Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.3.90" />
112+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.3.90" />
113+
<PackageReference Include="Uno.Wasm.Bootstrap" Version="9.0.0-dev.96" />
114+
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.96" />
115115
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
116116
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
117+
118+
<PackageReference Include="Uno.Fonts.OpenSans" Version="2.4.0" />
117119
</ItemGroup>
118120

119121
<ItemGroup>

0 commit comments

Comments
 (0)