Merge pull request #527 from unoplatform/dev/jela/53-update

Update to 5.3
unoplatform · Jul 22, 2024 · c77c948 · c77c948
2 parents 1e6f258 + d1e0d14
commit c77c948
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 20 deletions.
diff --git a/build/canary-updater.yml b/build/canary-updater.yml
@@ -1,13 +1,13 @@
 
 steps:
 
-  - task: nventiveCanaryUpdater@5
+  - task: unoplatformCanaryUpdater@1
     displayName: 'Canary Update'
     condition: startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/dev')
     inputs:
       solution: src/Uno.Playground.sln
       branchToMerge: master
       summaryFile: '$(Build.ArtifactStagingDirectory)/Canary.md'
       resultFile: '$(Build.ArtifactStagingDirectory)/result.json'
-      nugetUpdaterVersion: 2.3.0-alpha.46
-      packageAuthor: 'nventive,unoplatform,uno platform'
+      nugetUpdaterVersion: 1.1.0
+      packageAuthor: 'unoplatform,uno platform'
diff --git a/src/Uno.Playground.Shared/App.xaml.cs b/src/Uno.Playground.Shared/App.xaml.cs
@@ -38,6 +38,8 @@ public App()
 		{
 			InitializeLogging();
 
+			global::Uno.UI.FeatureConfiguration.Font.DefaultTextFontFamily = "ms-appx:///Uno.Fonts.OpenSans/Fonts/OpenSans.ttf";
+
 			this.InitializeComponent();
 			this.Suspending += OnSuspending;
 		}

diff --git a/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj b/src/Uno.Playground.WASM/Uno.Playground.WASM.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
@@ -64,7 +64,7 @@
 	  <Content Include="Assets\*.*" />
 	</ItemGroup>
 
-  <!--
+	<!--
 	<ItemGroup>
 		<WasmShellMonoEnvironment Include="MONO_GC_PARAMS" Value="soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep" />
 		<WasmShellMonoEnvironment Include="MONO_LOG_LEVEL" Value="debug" />
@@ -92,28 +92,30 @@
 		</PackageReference>
 		<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.3" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.6.0" />
-		<PackageReference Include="Uno.Monaco.Editor" Version="2.0.0-dev.50" />
+		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.8.0-dev.1" />
+		<PackageReference Include="Uno.Monaco.Editor" Version="2.0.0-dev.60" />
 
 		<PackageReference Include="Uno.CommunityToolkit.WinUI.DeveloperTools" Version="7.1.200" />
 		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls" Version="7.1.200" />
 		<PackageReference Include="Uno.CommunityToolkit.WinUI.UI.Controls.DataGrid" Version="7.1.200" />
 
-		<PackageReference Include="Uno.Toolkit.WinUI" Version="5.1.3" />
-		<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="5.1.3" />
-
-		<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.1.31" />
-		<PackageReference Include="Uno.WinUI.Lottie" Version="5.1.31" />
-		<PackageReference Include="Uno.Core.Extensions" Version="4.0.1" />
-		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
-		<PackageReference Include="Uno.Core" Version="4.0.1" />
-		<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.1.31" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.1.31" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.1.31" />
-		<PackageReference Include="Uno.Wasm.Bootstrap" Version="8.0.8" />
-		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.8" />
+		<PackageReference Include="Uno.Toolkit.WinUI" Version="6.2.0-dev.6" />
+		<PackageReference Include="Uno.Toolkit.WinUI.Material" Version="6.2.0-dev.6" />
+
+		<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.3.90" />
+		<PackageReference Include="Uno.WinUI.Lottie" Version="5.3.90" />
+		<PackageReference Include="Uno.Core.Extensions" Version="4.1.1" />
+		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.1.1" />
+		<PackageReference Include="Uno.Core" Version="4.1.1" />
+		<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.3.90" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.WinUI.MediaPlayer.WebAssembly" Version="5.3.90" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.3.90" />
+		<PackageReference Include="Uno.Wasm.Bootstrap" Version="9.0.0-dev.96" />
+		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="9.0.0-dev.96" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.2" />
+
+		<PackageReference Include="Uno.Fonts.OpenSans" Version="2.4.0" />
 	</ItemGroup>
 
 	<ItemGroup>