Skip to content

Commit 9b18df8

Browse files
authored
Merge pull request #164 from MartinZikmund/dev/update-uno
chore: Update to latest verision to fix NavigationView white bar
2 parents fd12a2f + fb3c3ce commit 9b18df8

File tree

25 files changed

+31
-29
lines changed

25 files changed

+31
-29
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.5612" />
39+
Version="4.0.0-dev.5688" />
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.5612" />
26+
Version="4.0.0-dev.5688" />
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.5612" />
31+
Version="4.0.0-dev.5688" />
3232
</ItemGroup>
3333
<!-- END UNO SPECIFIC -->
3434

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +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.5612" />
89+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5688" />
9090
<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.35" />
9191
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
9292
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.Uwp.Managed">
9393
<Version>2.3.0-uno.12</Version>
9494
</PackageReference>
95-
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5612" />
95+
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5688" />
9696
<PackageReference Include="System.Text.Json" Version="4.7.2" />
9797
</ItemGroup>
9898
<ItemGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
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.5612" />
29-
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5612" Condition="'$(Configuration)'=='Debug'" />
28+
<PackageReference Include="Uno.UI.Skia.Gtk" Version="4.0.0-dev.5688" />
29+
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5688" Condition="'$(Configuration)'=='Debug'" />
3030
<PackageReference Include="System.Text.Json" Version="4.7.2" />
3131
<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.5612" />
32+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5688" />
3333
</ItemGroup>
3434
<ItemGroup>
3535
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.Connectivity\Microsoft.Toolkit.Uwp.Connectivity.csproj" />

Microsoft.Toolkit.Uwp.SampleApp.Wasm/LinkerConfig.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<linker>
1+
<linker>
22
<assembly fullname="Uno.Foundation"/>
33
<assembly fullname="Uno.Xaml"/>
44
<assembly fullname="Microsoft.Toolkit.Uwp.SampleApp.Wasm"/>
@@ -9,6 +9,7 @@
99
<assembly fullname="Microsoft.Toolkit.Uwp"/>
1010
<assembly fullname="Microsoft.Toolkit.Uwp.UI.Animations"/>
1111
<assembly fullname="Microsoft.Toolkit.Uwp.UI.Controls" />
12+
<assembly fullname="Microsoft.Toolkit.Uwp.UI.Controls.Primitives" />
1213
<assembly fullname="Microsoft.Toolkit.Uwp.UI.Controls.DataGrid"/>
1314
<assembly fullname="Microsoft.Toolkit.Uwp.UI"/>
1415
<assembly fullname="Microsoft.Toolkit.Uwp"/>

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

Lines changed: 2 additions & 2 deletions
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.5612" />
30+
<PackageReference Include="Uno.UI.WebAssembly" Version="4.0.0-dev.5688" />
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,7 +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.5612" />
41+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5688" />
4242
</ItemGroup>
4343

4444
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +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.12" />
120-
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5612" />
120+
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5688" />
121121
<PackageReference Include="System.Text.Json" Version="4.7.2" />
122-
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
122+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5688" />
123123
</ItemGroup>
124124
<ItemGroup>
125125
<ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj">

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.Shared.projitems

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@
437437
<Content Include="$(MSBuildThisFileDirectory)SamplePages\ListDetailsView\OneDriveLogo.png" />
438438
<Content Include="$(MSBuildThisFileDirectory)SamplePages\OnDevice\OnDevice.png" />
439439
<Content Include="$(MSBuildThisFileDirectory)SamplePages\PipelineBrush\PipelineBrush.png" />
440+
<Content Include="$(MSBuildThisFileDirectory)SamplePages\Primitives\ConstrainedBox.png" />
440441
<Content Include="$(MSBuildThisFileDirectory)SamplePages\Primitives\SwitchPresenter.png" />
441442
<Content Include="$(MSBuildThisFileDirectory)SamplePages\RemoteDeviceHelper\RemoteDeviceHelper.png" />
442443
<Content Include="$(MSBuildThisFileDirectory)SamplePages\RemoteDevicePicker\RemoteDevicePicker.png" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +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.5612" />
132+
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5688" />
133133
</ItemGroup>
134134
<ItemGroup>
135135
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->

0 commit comments

Comments
 (0)