Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Remove the extra FAB space above the TabBar #286

Merged
merged 1 commit into from
Aug 18, 2022
Merged

fix: Remove the extra FAB space above the TabBar #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions build/workflow/templates/dotnet6-install-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,23 @@ steps:
errorActionPreference: continue
ignoreLASTEXITCODE: true
retryCountOnTaskFailure: 3

# https://github.com/actions/runner-images/issues/6082#issuecomment-1215100175
- powershell: |
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
$InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
$componentsToAdd = @(
"Component.Xamarin"
)
[string]$workloadArgs = $componentsToAdd | ForEach-Object {" --add " + $_}
$Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
if ($process.ExitCode -eq 0)
{
Write-Host "components have been successfully added"
}
else
{
Write-Host "components were not installed"
exit 1
}
12 changes: 6 additions & 6 deletions samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Uno.Toolkit.Samples.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.Cupertino">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.Material">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="4.3.6" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
Expand All @@ -82,7 +82,7 @@
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
<Version>2.3.1.1</Version>
</PackageReference>
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
</ItemGroup>
Expand Down Expand Up @@ -135,4 +135,4 @@
<Compile Remove="$(_AndroidResourceDesignerFile)" />
</ItemGroup>
</Target>
</Project>
</Project>
10 changes: 5 additions & 5 deletions samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Gtk/Uno.Toolkit.Samples.Skia.Gtk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Uno.Cupertino" Version="2.2.0" />
<PackageReference Include="Uno.Material" Version="2.2.0" />
<PackageReference Include="Uno.UI.Skia.Gtk" Version="4.3.6" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
<PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.4" />
<PackageReference Include="Uno.Material" Version="2.3.0-dev.4" />
<PackageReference Include="Uno.UI.Skia.Gtk" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.UWP/Uno.Toolkit.Samples.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.0-prerelease.210623001" />
<PackageReference Include="Uno.Cupertino">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.Material">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="4.3.6" />
<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
Expand Down Expand Up @@ -189,4 +189,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
14 changes: 7 additions & 7 deletions samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/Uno.Toolkit.Samples.Wasm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Uno.Cupertino" Version="2.2.0" />
<PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.4" />
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0-dev.1" />
<PackageReference Include="Uno.Material" Version="2.2.0" />
<PackageReference Include="Uno.UI.WebAssembly" Version="4.3.6" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.2.0" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.2.0" />
<PackageReference Include="Uno.Material" Version="2.3.0-dev.4" />
<PackageReference Include="Uno.UI.WebAssembly" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="4.0.0-dev.174" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="4.0.0-dev.174" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
</ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.iOS/Uno.Toolkit.Samples.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,16 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Uno.Cupertino">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.Material">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="4.3.6" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.3.0-dev.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageReference Include="Xamarin.TestCloud.Agent">
Expand All @@ -224,4 +224,4 @@
<ItemGroup />
<Import Project="..\Uno.Toolkit.Samples.Shared\Uno.Toolkit.Samples.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
</Project>
12 changes: 6 additions & 6 deletions samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.macOS/Uno.Toolkit.Samples.macOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.Cupertino">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.Material">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="4.3.6" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
</ItemGroup>
Expand Down Expand Up @@ -157,4 +157,4 @@
<ReferencePath Remove="@(_ReferencePathToRemove)" />
</ItemGroup>
</Target>
</Project>
</Project>
10 changes: 5 additions & 5 deletions ...lkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Droid/Uno.Toolkit.WinUI.Samples.Droid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.Material.WinUI">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.WinUI" Version="4.3.6" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
Expand All @@ -84,7 +84,7 @@
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
<Version>2.3.1.1</Version>
</PackageReference>
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
</ItemGroup>
Expand Down Expand Up @@ -136,4 +136,4 @@
<Compile Remove="$(_AndroidResourceDesignerFile)" />
</ItemGroup>
</Target>
</Project>
</Project>
8 changes: 4 additions & 4 deletions ...inUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Uno.Material.WinUI" Version="2.2.0" />
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.3.6" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
<PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.4" />
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
</ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions ...oolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0-dev.1" />
<PackageReference Include="Uno.Material.WinUI" Version="2.2.0" />
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.3.6" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.2.0" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.2.0" />
<PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.4" />
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="4.0.0-dev.174" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="4.0.0-dev.174" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...no.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
<DefineConstants>$(DefineConstants);IS_WINUI</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
<Manifest Include="$(ApplicationManifest)" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageReference Include="Uno.Material.WinUI" Version="2.2.0" />
<PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.4" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...o.Toolkit.WinUI.Samples.Windows.Package/Uno.Toolkit.WinUI.Samples.Windows.Package.wapproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.196">
Expand Down
10 changes: 5 additions & 5 deletions ....Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.iOS/Uno.Toolkit.WinUI.Samples.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.Material.WinUI">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.WinUI" Version="4.3.6" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.3.0-dev.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
</ItemGroup>
Expand Down Expand Up @@ -179,4 +179,4 @@
</ItemGroup>
<Import Project="..\..\Uno.Toolkit.Samples\Uno.Toolkit.Samples.Shared\Uno.Toolkit.Samples.Shared.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
</Project>
</Project>
10 changes: 5 additions & 5 deletions ...lkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.macOS/Uno.Toolkit.WinUI.Samples.macOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.Material.WinUI">
<Version>2.2.0</Version>
<Version>2.3.0-dev.4</Version>
</PackageReference>
<PackageReference Include="Uno.WinUI" Version="4.3.6" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.3.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.3.6" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
</ItemGroup>
Expand Down Expand Up @@ -150,4 +150,4 @@
<ReferencePath Remove="@(_ReferencePathToRemove)" />
</ItemGroup>
</Target>
</Project>
</Project>
2 changes: 1 addition & 1 deletion src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.UI" Version="4.3.6" />
<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
Expand Down
5 changes: 3 additions & 2 deletions src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
<DefineConstants>$(DefineConstants);IS_WINUI</DefineConstants>
<AssemblyName>Uno.Toolkit.WinUI</AssemblyName>
<RootNamespace>Uno.Toolkit.UI</RootNamespace>
<LangVersion>9.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.WinUI" Version="4.3.6" />
<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
<PackageReference Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
Expand All @@ -25,7 +26,7 @@
<When Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'">

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
</ItemGroup>

</When>
Expand Down
4 changes: 2 additions & 2 deletions src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.Cupertino" Version="2.2.0" />
<PackageReference Include="Uno.UI" Version="4.3.6" />
<PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.4" />
<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
</ItemGroup>

<PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Uno.Cupertino.WinUI" Version="2.2.0" />
<PackageReference Include="Uno.WinUI" Version="4.3.6" />
<PackageReference Include="Uno.Cupertino.WinUI" Version="2.3.0-dev.4" />
<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
</ItemGroup>

<Choose>
Expand All @@ -44,7 +44,7 @@
<When Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'">

<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
</ItemGroup>
Expand Down