Skip to content

Commit dd07893

Browse files
jeromelabanjeromelaban
committed
chore: Revert 4.x downgrade
1 parent 50268af commit dd07893

File tree

6 files changed

+89
-89
lines changed

6 files changed

+89
-89
lines changed

‎UI/MapControlSample/MapControlSample/MapControlSample.Mobile/MapControlSample.Mobile.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,24 @@
2929
</PropertyGroup>
3030
<ItemGroup>
3131
<PackageReference Include="Mapsui.Uno.WinUI" Version="4.0.0" />
32-
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
33-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.26" Condition="'$(Configuration)'=='Debug'" />
34-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.10.26" />
32+
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
33+
<PackageReference Include="Uno.WinUI.RemoteControl" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
34+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
3535
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
3636

3737

38-
<PackageReference Include="SkiaSharp" Version="2.88.3" />
39-
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
40-
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.3" />
41-
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
38+
<PackageReference Include="SkiaSharp" Version="2.88.6" />
39+
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
40+
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.6" />
41+
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
4242

4343
</ItemGroup>
4444
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
4545
</ItemGroup>
4646
<Choose>
4747
<When Condition="'$(TargetFramework)'=='net8.0-android'">
4848
<ItemGroup>
49-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.1" />
49+
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.10.0.1" />
5050
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
5151
</ItemGroup>
5252
<ItemGroup>
@@ -62,7 +62,7 @@
6262
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
6363
</PropertyGroup>
6464
<ItemGroup>
65-
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
65+
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
6666
</ItemGroup>
6767
</When>
6868
<When Condition="'$(TargetFramework)'=='net8.0-maccatalyst'">
@@ -77,7 +77,7 @@
7777
<InvariantGlobalization>false</InvariantGlobalization>
7878
</PropertyGroup>
7979
<ItemGroup>
80-
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
80+
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
8181
</ItemGroup>
8282
</When>
8383
<When Condition="'$(TargetFramework)'=='net8.0-macos'">

‎UI/MapControlSample/MapControlSample/MapControlSample.Skia.Gtk/MapControlSample.Skia.Gtk.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
</ItemGroup>
1717
<ItemGroup>
1818
<PackageReference Include="Mapsui.Uno.WinUI" Version="4.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
20-
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.10.26" />
21-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.26" Condition="'$(Configuration)'=='Debug'" />
22-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.10.26" />
23-
<PackageReference Include="Uno.WinUI.Lottie" Version="4.10.26" />
24-
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
20+
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="5.0.19" />
21+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
22+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
23+
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.19" />
24+
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.6" />
2525

26-
<PackageReference Include="SkiaSharp" Version="2.88.3" />
27-
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
28-
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.3" />
29-
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
26+
<PackageReference Include="SkiaSharp" Version="2.88.6" />
27+
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
28+
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.6" />
29+
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
3030
</ItemGroup>
3131
<Import Project="..\MapControlSample.Shared\MapControlSample.Shared.projitems" Label="Shared" />
3232
</Project>

‎UI/MapControlSample/MapControlSample/MapControlSample.Skia.Linux.FrameBuffer/MapControlSample.Skia.Linux.FrameBuffer.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
</ItemGroup>
1717
<ItemGroup>
1818
<PackageReference Include="Mapsui.Uno.WinUI" Version="4.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
20-
<PackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="4.10.26" />
21-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.26" Condition="'$(Configuration)'=='Debug'" />
22-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.10.26" />
23-
<PackageReference Include="Uno.WinUI.Lottie" Version="4.10.26" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
20+
<PackageReference Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.0.19" />
21+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
22+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
23+
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.19" />
2424

25-
<PackageReference Include="SkiaSharp" Version="2.88.3" />
26-
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
27-
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.3" />
28-
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
29-
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
25+
<PackageReference Include="SkiaSharp" Version="2.88.6" />
26+
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
27+
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.6" />
28+
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
29+
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.6" />
3030

3131

3232
</ItemGroup>

‎UI/MapControlSample/MapControlSample/MapControlSample.Skia.WPF/MapControlSample.Skia.WPF.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
</ItemGroup>
1919
<ItemGroup>
2020
<PackageReference Include="Mapsui.Uno.WinUI" Version="4.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
22-
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="4.10.26" />
23-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.26" Condition="'$(Configuration)'=='Debug'" />
24-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.10.26" />
25-
<PackageReference Include="Uno.WinUI.Lottie" Version="4.10.26" />
26-
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
22+
<PackageReference Include="Uno.WinUI.Skia.Wpf" Version="5.0.19" />
23+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
24+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
25+
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.19" />
26+
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.6" />
2727

28-
<PackageReference Include="SkiaSharp" Version="2.88.3" />
29-
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
30-
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.3" />
31-
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
28+
<PackageReference Include="SkiaSharp" Version="2.88.6" />
29+
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
30+
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.6" />
31+
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
3232

3333

3434
</ItemGroup>

‎UI/MapControlSample/MapControlSample/MapControlSample.Wasm/MapControlSample.Wasm.csproj

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,58 @@
55
<NoWarn>NU1701</NoWarn>
66

77
</PropertyGroup>
8-
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
9-
<MonoRuntimeDebuggerEnabled>true</MonoRuntimeDebuggerEnabled>
10-
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
11-
<DebugType>portable</DebugType>
12-
<DebugSymbols>true</DebugSymbols>
13-
<!--
8+
<PropertyGroup Condition="'$(Configuration)'=='Debug'">
9+
<MonoRuntimeDebuggerEnabled>true</MonoRuntimeDebuggerEnabled>
10+
<DefineConstants>$(DefineConstants);TRACE;DEBUG</DefineConstants>
11+
<DebugType>portable</DebugType>
12+
<DebugSymbols>true</DebugSymbols>
13+
<!--
1414
IL Linking is disabled in Debug configuration.
1515
When building in Release, see https://platform.uno/docs/articles/features/using-il-linker-webassembly.html
1616
-->
17-
<WasmShellILLinkerEnabled>false</WasmShellILLinkerEnabled>
18-
</PropertyGroup>
19-
<ItemGroup>
20-
<Content Include="Assets\SplashScreen.png" />
21-
</ItemGroup>
22-
<ItemGroup>
23-
<UpToDateCheckInput Include="..\MapControlSample.Shared\**\*.xaml" />
24-
</ItemGroup>
25-
<ItemGroup>
26-
<EmbeddedResource Include="WasmCSS\Fonts.css" />
27-
<EmbeddedResource Include="WasmScripts\AppManifest.js" />
28-
</ItemGroup>
29-
<ItemGroup>
30-
<LinkerDescriptor Include="LinkerConfig.xml" />
31-
</ItemGroup>
32-
<ItemGroup>
33-
<!--
17+
<WasmShellILLinkerEnabled>false</WasmShellILLinkerEnabled>
18+
</PropertyGroup>
19+
<ItemGroup>
20+
<Content Include="Assets\SplashScreen.png" />
21+
</ItemGroup>
22+
<ItemGroup>
23+
<UpToDateCheckInput Include="..\MapControlSample.Shared\**\*.xaml" />
24+
</ItemGroup>
25+
<ItemGroup>
26+
<EmbeddedResource Include="WasmCSS\Fonts.css" />
27+
<EmbeddedResource Include="WasmScripts\AppManifest.js" />
28+
</ItemGroup>
29+
<ItemGroup>
30+
<LinkerDescriptor Include="LinkerConfig.xml" />
31+
</ItemGroup>
32+
<ItemGroup>
33+
<!--
3434
This item group is required by the project template because of the
3535
new SDK-Style project, otherwise some files are not added automatically.
3636
3737
You can safely remove this ItemGroup completely.
3838
-->
39-
<None Include="Program.cs" />
40-
<None Include="LinkerConfig.xml" />
41-
<None Include="wwwroot\web.config" />
42-
</ItemGroup>
43-
<ItemGroup>
44-
<PackageReference Include="Mapsui.Uno.WinUI" Version="4.0.0" />
45-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
46-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
47-
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
48-
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.10.26" />
49-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.10.26" Condition="'$(Configuration)'=='Debug'" />
50-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.10.26" />
51-
<PackageReference Include="Uno.Wasm.Bootstrap" Version="8.0.4" />
52-
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.24" />
53-
<PackageReference Include="Uno.WinUI.Lottie" Version="4.10.26" />
39+
<None Include="Program.cs" />
40+
<None Include="LinkerConfig.xml" />
41+
<None Include="wwwroot\web.config" />
42+
</ItemGroup>
43+
<ItemGroup>
44+
<PackageReference Include="Mapsui.Uno.WinUI" Version="4.0.0" />
45+
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
46+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.1" />
47+
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
48+
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.0.19" />
49+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
50+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
51+
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.24" />
52+
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.24" />
53+
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.19" />
5454

55-
<PackageReference Include="SkiaSharp" Version="2.88.3" />
56-
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
57-
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.3" />
58-
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
55+
<PackageReference Include="SkiaSharp" Version="2.88.6" />
56+
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
57+
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.6" />
58+
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
5959

60-
</ItemGroup>
61-
<Import Project="..\MapControlSample.Shared\MapControlSample.Shared.projitems" Label="Shared" Condition="Exists('..\MapControlSample.Shared\MapControlSample.Shared.projitems')" />
60+
</ItemGroup>
61+
<Import Project="..\MapControlSample.Shared\MapControlSample.Shared.projitems" Label="Shared" Condition="Exists('..\MapControlSample.Shared\MapControlSample.Shared.projitems')" />
6262
</Project>

‎UI/MapControlSample/MapControlSample/MapControlSample.Windows/MapControlSample.Windows.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
44
<TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
5-
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
5+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
66
<RootNamespace>MapControlSample</RootNamespace>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<Platforms>x86;x64;arm64</Platforms>
@@ -30,10 +30,10 @@
3030
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
3131
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
3232

33-
<PackageReference Include="SkiaSharp" Version="2.88.3" />
34-
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.3" />
35-
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.3" />
36-
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
33+
<PackageReference Include="SkiaSharp" Version="2.88.6" />
34+
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.6" />
35+
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.6" />
36+
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
3737

3838

3939
<Manifest Include="$(ApplicationManifest)" />

0 commit comments

Comments
 (0)