Skip to content

Commit 91e36d3

Browse files
jeromelabanjeromelaban
authored
Merge pull request #589 from unoplatform/dev/nr/5release
placeholder
2 parents fbf0652 + 73cca23 commit 91e36d3

File tree

603 files changed

+3057
-3079
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

603 files changed

+3057
-3079
lines changed

‎.vsts-ci.canaries.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
parameters:
2+
- name: solution
3+
type: string
4+
default: ''
5+
16
steps:
27
- pwsh: |
38
git merge origin/master -s recursive -X theirs
49
$savedMSBuildExtensionsPath = $env:MSBuildExtensionsPath
510
$env:MSBuildExtensionsPath = 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild'
11+
$folderPath = [System.IO.Path]::GetDirectoryName("${{ parameters.solution }}");
612
dotnet new sln --name=Uno.Samples.generated
7-
dotnet sln Uno.Samples.generated.sln add (Get-ChildItem -Recurse *.csproj)
13+
dotnet sln Uno.Samples.generated.sln add (Get-ChildItem -Path $folderPath -Recurse *.csproj)
814
$env:MSBuildExtensionsPath = $savedMSBuildExtensionsPath
915
1016
- task: nventiveCanaryUpdater@5

‎UI/AdvancedXBind/AdvancedXBind.Mobile/AdvancedXBind.Mobile.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
<SupportedOSPlatformVersion Condition="'$(TargetFramework)'=='net7.0-macos'">10.14</SupportedOSPlatformVersion>
1919
</PropertyGroup>
2020
<ItemGroup>
21-
<PackageReference Include="Uno.WinUI" Version="4.9.26" />
22-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
23-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
21+
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
22+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
23+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
2424
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
2525
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
2626
</ItemGroup>
2727
<Choose>
2828
<When Condition="'$(TargetFramework)'=='net7.0-android'">
2929
<ItemGroup>
30-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
30+
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.10.0.1" />
3131
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
3232
</ItemGroup>
3333
<ItemGroup>
@@ -42,7 +42,7 @@
4242
<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
4343
</PropertyGroup>
4444
<ItemGroup>
45-
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
45+
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
4646
</ItemGroup>
4747
</When>
4848
<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
@@ -57,7 +57,7 @@
5757
<InvariantGlobalization>false</InvariantGlobalization>
5858
</PropertyGroup>
5959
<ItemGroup>
60-
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
60+
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
6161
</ItemGroup>
6262
</When>
6363
<When Condition="'$(TargetFramework)'=='net7.0-macos'">

‎UI/AdvancedXBind/AdvancedXBind.Skia.Gtk/AdvancedXBind.Skia.Gtk.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
<ItemGroup>
1717
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
1818
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
19-
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.9.26" />
20-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
21-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
19+
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="5.0.19" />
20+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
21+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
2222
</ItemGroup>
2323
<Import Project="..\AdvancedXBind.Shared\AdvancedXBind.Shared.projitems" Label="Shared" />
2424
</Project>

‎UI/AdvancedXBind/AdvancedXBind.Skia.Gtk/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using GLib;
22
using System;
3-
using Uno.UI.Runtime.Skia;
3+
using Uno.UI.Runtime.Skia.Gtk;
44

55
namespace AdvancedXBind.Skia.Gtk
66
{

‎UI/AdvancedXBind/AdvancedXBind.Wasm/AdvancedXBind.Wasm.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
</ItemGroup>
4242
<ItemGroup>
4343
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
44-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.1" />
45-
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0" />
46-
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.9.26" />
47-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
48-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
44+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.5" />
45+
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
46+
<PackageReference Include="Uno.WinUI.WebAssembly" Version="5.0.19" />
47+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
48+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
4949
<PackageReference Include="Uno.Wasm.Bootstrap" Version="7.0.24" />
5050
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.24" />
5151
</ItemGroup>

‎UI/AdvancedXBind/AdvancedXBind.Windows/AdvancedXBind.Windows.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
6-
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
6+
<TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
77
<RootNamespace>AdvancedXBind</RootNamespace>
88
<ApplicationManifest>app.manifest</ApplicationManifest>
99
<Platforms>x86;x64;arm64</Platforms>
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
27+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
2828
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
2929
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
3030
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />

‎UI/AdvancedXBind/AdvancedXBind.Windows/Package.appxmanifest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</Properties>
1919

2020
<Dependencies>
21-
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
22-
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.18362.0" MaxVersionTested="10.0.19041.0" />
21+
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.19041.0" MaxVersionTested="10.0.19041.0" />
22+
<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.19041.0" />
2323
</Dependencies>
2424

2525
<Resources>

‎UI/AndroidCustomCamera/AndroidCustomCamera/AndroidCustomCamera.Mobile/AndroidCustomCamera.Mobile.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@
2828
<RuntimeIdentifier Condition="'$(TargetFramework)' == 'net7.0-macos'">osx-x64</RuntimeIdentifier>
2929
</PropertyGroup>
3030
<ItemGroup>
31-
<PackageReference Include="Uno.WinUI" Version="4.9.26" />
32-
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
33-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
31+
<PackageReference Include="Uno.WinUI" Version="5.0.19" />
32+
<PackageReference Include="Uno.WinUI.DevServer" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
33+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
3434
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
35-
<PackageReference Include="Uno.WinUI.Lottie" Version="4.9.26" />
35+
<PackageReference Include="Uno.WinUI.Lottie" Version="5.0.19" />
3636
</ItemGroup>
3737
<Choose>
3838
<When Condition="'$(TargetFramework)'=='net7.0-android'">
3939
<ItemGroup>
40-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.4" />
40+
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.10.0.1" />
4141
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
4242
</ItemGroup>
4343
<ItemGroup>
@@ -53,7 +53,7 @@
5353
<MtouchExtraArgs>$(MtouchExtraArgs) --marshal-objectivec-exceptions:disable</MtouchExtraArgs>
5454
</PropertyGroup>
5555
<ItemGroup>
56-
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
56+
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
5757
</ItemGroup>
5858
</When>
5959
<When Condition="'$(TargetFramework)'=='net7.0-maccatalyst'">
@@ -68,7 +68,7 @@
6868
<InvariantGlobalization>false</InvariantGlobalization>
6969
</PropertyGroup>
7070
<ItemGroup>
71-
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.4.0" />
71+
<PackageReference Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
7272
</ItemGroup>
7373
</When>
7474
<When Condition="'$(TargetFramework)'=='net7.0-macos'">

‎UI/AndroidCustomCamera/AndroidCustomCamera/AndroidCustomCamera.Shared/App.xaml.cs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
11
using Microsoft.Extensions.Logging;
2+
using Microsoft.UI.Xaml;
3+
using Microsoft.UI.Xaml.Controls;
24
using Microsoft.UI.Xaml.Navigation;
35
using System;
4-
using System.Collections.Generic;
5-
using System.IO;
6-
using System.Linq;
7-
using System.Runtime.InteropServices.WindowsRuntime;
86
using Windows.ApplicationModel;
97
using Windows.ApplicationModel.Activation;
10-
using Windows.Foundation;
11-
using Windows.Foundation.Collections;
12-
using Microsoft.UI.Xaml;
13-
using Microsoft.UI.Xaml.Controls;
14-
using Windows.UI.Xaml.Controls.Primitives;
15-
using Microsoft.UI.Xaml.Data;
16-
using Microsoft.UI.Xaml.Input;
17-
using Microsoft.UI.Xaml.Media;
18-
using Microsoft.UI.Xaml.Navigation;
198

209
namespace AndroidCustomCamera
2110
{

‎UI/Authentication.OidcDemo/Authentication.OidcDemo/Authentication.OidcDemo.Droid/Authentication.OidcDemo.Droid.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
<Reference Include="System.Xml" />
6565
</ItemGroup>
6666
<ItemGroup>
67-
<PackageReference Include="Uno.UI" Version="4.9.26" />
68-
<PackageReference Include="Uno.UI.RemoteControl" Version="4.9.26" Condition="'$(Configuration)'=='Debug'" />
69-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.9.26" />
67+
<PackageReference Include="Uno.UI" Version="5.0.19" />
68+
<PackageReference Include="Uno.UI.RemoteControl" Version="5.0.19" Condition="'$(Configuration)'=='Debug'" />
69+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
7070
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
7171
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
7272
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />

0 commit comments

Comments
 (0)