Skip to content

Commit 1d19216

Browse files
jeromelabanjeromelaban
authored
Merge pull request #162 from unoplatform/dev/jela/uno-update5
chore: Update to uno latest
2 parents 5420f98 + 8275339 commit 1d19216

File tree

24 files changed

+276
-26
lines changed

24 files changed

+276
-26
lines changed

‎Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<ItemGroup Condition="'$(UnoUIVersionOverride)'!=''">
3737
<!-- Force all projects to use the same uno version to avoid net5 build issues on linux -->
3838
<PackageReference Update="Uno.UI"
39-
Version="4.0.0-dev.5429" />
39+
Version="4.0.0-dev.5594" />
4040
</ItemGroup>
4141
<!-- END Uno Specific -->
4242

‎Microsoft.Toolkit.Uwp.Connectivity/Microsoft.Toolkit.Uwp.Connectivity.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
2525
<PackageReference Include="Uno.UI"
26-
Version="4.0.0-dev.5429" />
26+
Version="4.0.0-dev.5594" />
2727
</ItemGroup>
2828
<!-- END UNO SPECIFIC -->
2929
</Project>

‎Microsoft.Toolkit.Uwp.DeveloperTools/Microsoft.Toolkit.Uwp.DeveloperTools.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
3030
<PackageReference Include="Uno.UI"
31-
Version="4.0.0-dev.5429" />
31+
Version="4.0.0-dev.5594" />
3232
</ItemGroup>
3333
<!-- END UNO SPECIFIC -->
3434

‎Microsoft.Toolkit.Uwp.SampleApp.Droid/Microsoft.Toolkit.Uwp.SampleApp.Droid.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -86,12 +86,13 @@
8686
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
8787
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
8888
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
89+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
8990
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.35" />
9091
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
9192
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed">
9293
<Version>2.3.0-uno.4</Version>
9394
</PackageReference>
94-
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5429" />
95+
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
9596
<PackageReference Include="System.Text.Json" Version="4.7.2" />
9697
</ItemGroup>
9798
<ItemGroup>

‎Microsoft.Toolkit.Uwp.SampleApp.Droid/Resources/Resource.designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Microsoft.Toolkit.Uwp.SampleApp.Skia.Gtk/Microsoft.Toolkit.Uwp.SampleApp.Skia.Gtk.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
<!-- Note that for WebAssembly version 1.1.1 of the console logger required -->
2626
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
2727
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
28-
<PackageReference Include="Uno.UI.Skia.Gtk" Version="4.0.0-dev.5429" />
29-
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5429" Condition="'$(Configuration)'=='Debug'" />
28+
<PackageReference Include="Uno.UI.Skia.Gtk" Version="4.0.0-dev.5594" />
29+
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
3030
<PackageReference Include="System.Text.Json" Version="4.7.2" />
31-
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.35" />
32-
</ItemGroup>
31+
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.37" />
32+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
33+
</ItemGroup>
3334
<ItemGroup>
3435
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj" />
3536
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.DeveloperTools\Microsoft.Toolkit.Uwp.DeveloperTools.csproj" />

‎Microsoft.Toolkit.Uwp.SampleApp.Wasm/Microsoft.Toolkit.Uwp.SampleApp.Wasm.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
-->
2828

2929
<ItemGroup>
30-
<PackageReference Include="Uno.UI.WebAssembly" Version="4.0.0-dev.5429" />
30+
<PackageReference Include="Uno.UI.WebAssembly" Version="4.0.0-dev.5594" />
3131
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.0.0-dev.127" />
3232
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.0.0-dev.127" />
3333
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
@@ -38,6 +38,7 @@
3838
<Reference Include="System.Net.Http" />
3939
<PackageReference Include="System.Text.Json" Version="4.7.2" />
4040
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
41+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
4142
</ItemGroup>
4243

4344
<ItemGroup>

‎Microsoft.Toolkit.Uwp.SampleApp.iOS/Microsoft.Toolkit.Uwp.SampleApp.iOS.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,9 @@
117117
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
118118
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.35" />
119119
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed" Version="2.3.0-uno.4" />
120-
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5429" />
120+
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
121121
<PackageReference Include="System.Text.Json" Version="4.7.2" />
122+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
122123
</ItemGroup>
123124
<ItemGroup>
124125
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">

‎Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,10 @@ static void ConfigureFilters(ILoggerFactory factory)
255255
.AddConsole(LogLevel.Debug)
256256
#endif
257257
;
258+
259+
#if HAS_UNO
260+
Uno.UI.Adapter.Microsoft.Extensions.Logging.LoggingAdapter.Initialize();
261+
#endif
258262
}
259263
}
260264
}

‎Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -129,6 +129,7 @@
129129
<PackageReference Include="System.ValueTuple">
130130
<Version>4.5.0</Version>
131131
</PackageReference>
132+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
132133
</ItemGroup>
133134
<ItemGroup>
134135
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->

0 commit comments

Comments
 (0)