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

Updated Uno packages to latest version, removed WPF head from All solution #258

Merged
merged 2 commits into from
Aug 10, 2022
Merged

Updated Uno packages to latest version, removed WPF head from All solution #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b796027
Updated Uno to latest version
Arlodotexe Aug 10, 2022
024aa06
Removed WPF head from "all" solution template
Arlodotexe Aug 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions common/Labs.Uno.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
<!-- This file is modified by common/Scripts/UseUnoWinUI.ps1 to switch between WinUI 2 and 3 under Uno Platform -->
<!-- All Uno-based heads and multitargeted library projects reference this file, while native (UWP/WinAppSdk) heads don't and shouldn't need to. -->
<ItemGroup Condition="'$(IsUno)' == 'true'">
<PackageReference Include="Uno.UI" Version="4.2.6" />
<PackageReference Include="Uno.UI" Version="4.4.13" />
</ItemGroup>

<ItemGroup Condition="'$(IsWasm)' == 'true' OR '$(IsWpf)' == 'true' OR '$(IsGtk)' == 'true'">
<PackageReference Include="Uno.UI.RemoteControl" Version="4.2.6" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.4.13" Condition="'$(Configuration)'=='Debug'" />
</ItemGroup>

<ItemGroup Condition="'$(IsGtkHead)' == 'true'">
<PackageReference Include="Uno.UI.Skia.Gtk" Version="4.2.6" />
<PackageReference Include="Uno.UI.Skia.Gtk" Version="4.4.13" />
</ItemGroup>

<ItemGroup Condition="'$(IsWpfHead)' == 'true'">
<PackageReference Include="Uno.UI.Skia.Wpf" Version="4.2.6" />
<PackageReference Include="Uno.UI.Skia.Wpf" Version="4.4.13" />
</ItemGroup>
<PropertyGroup Condition="'$(IsWpfHead)' == 'true'">
<!-- Ignorable issue from SkiaSharp package, see: https://github.com/CommunityToolkit/Labs-Windows/pull/119#issuecomment-1125373091 -->
<NoWarn>NU1701</NoWarn>
</PropertyGroup>

<ItemGroup Condition="'$(IsWasmHead)' == 'true'">
<PackageReference Include="Uno.UI.WebAssembly" Version="4.2.6" />
<PackageReference Include="Uno.UI.WebAssembly" Version="4.4.13" />
</ItemGroup>

<!-- Import Uno and native dependencies for all multitargeted library projects. -->
Expand Down
118 changes: 0 additions & 118 deletions common/Toolkit.Labs.All.sln.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Labs.macOS
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Skia.Gtk", "platforms\CommunityToolkit.Labs.Skia.Gtk\CommunityToolkit.Labs.Skia.Gtk.csproj", "{1B273854-1051-4FE3-9566-A9FA705304DE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Skia.WPF", "platforms\CommunityToolkit.Labs.Skia.WPF\CommunityToolkit.Labs.Skia.WPF.csproj", "{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Skia.Wpf.Host", "platforms\CommunityToolkit.Labs.Skia.WPF.Host\CommunityToolkit.Labs.Skia.Wpf.Host.csproj", "{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Labs.Uwp", "platforms\CommunityToolkit.Labs.Uwp\CommunityToolkit.Labs.Uwp.csproj", "{B3D6DF0B-13DB-493E-9D1A-56343EFEDEA7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkit.Labs.Wasm", "platforms\CommunityToolkit.Labs.Wasm\CommunityToolkit.Labs.Wasm.csproj", "{20926634-C200-43A6-AE59-86F9C3878992}"
Expand Down Expand Up @@ -610,118 +606,6 @@ Global
{1B273854-1051-4FE3-9566-A9FA705304DE}.Release|x64.Build.0 = Release|Any CPU
{1B273854-1051-4FE3-9566-A9FA705304DE}.Release|x86.ActiveCfg = Release|Any CPU
{1B273854-1051-4FE3-9566-A9FA705304DE}.Release|x86.Build.0 = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|ARM.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|ARM64.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|iPhone.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|x64.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|x64.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|x86.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.AppStore|x86.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|ARM.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|ARM64.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|iPhone.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|x64.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|x64.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|x86.ActiveCfg = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Debug|x86.Build.0 = Debug|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|Any CPU.Build.0 = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|ARM.ActiveCfg = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|ARM.Build.0 = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|ARM64.ActiveCfg = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|ARM64.Build.0 = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|iPhone.ActiveCfg = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|iPhone.Build.0 = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|x64.ActiveCfg = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|x64.Build.0 = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|x86.ActiveCfg = Release|Any CPU
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C}.Release|x86.Build.0 = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|ARM.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|ARM.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|ARM64.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|iPhone.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|x64.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|x64.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|x86.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.AppStore|x86.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|ARM.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|ARM.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|ARM64.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|iPhone.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|x64.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|x64.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|x86.ActiveCfg = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Debug|x86.Build.0 = Debug|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|Any CPU.Build.0 = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|ARM.ActiveCfg = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|ARM.Build.0 = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|ARM64.ActiveCfg = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|ARM64.Build.0 = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|iPhone.ActiveCfg = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|iPhone.Build.0 = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|x64.ActiveCfg = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|x64.Build.0 = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|x86.ActiveCfg = Release|Any CPU
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12}.Release|x86.Build.0 = Release|Any CPU
{B3D6DF0B-13DB-493E-9D1A-56343EFEDEA7}.Ad-Hoc|Any CPU.ActiveCfg = Debug|x86
{B3D6DF0B-13DB-493E-9D1A-56343EFEDEA7}.Ad-Hoc|Any CPU.Build.0 = Debug|x86
{B3D6DF0B-13DB-493E-9D1A-56343EFEDEA7}.Ad-Hoc|ARM.ActiveCfg = Debug|ARM
Expand Down Expand Up @@ -1132,8 +1016,6 @@ Global
{93BFD459-2E21-41C7-9E54-868F5B014DBC} = {E824D592-EBCB-41C6-A176-D001C5A124CB}
{34617141-25C4-4FEC-8A15-5B46934F1A99} = {E824D592-EBCB-41C6-A176-D001C5A124CB}
{1B273854-1051-4FE3-9566-A9FA705304DE} = {E824D592-EBCB-41C6-A176-D001C5A124CB}
{7A5BB49C-1CEB-4FD0-94BD-4A2DD91B818C} = {E824D592-EBCB-41C6-A176-D001C5A124CB}
{BB83E9E5-D2FA-4273-884D-8CFBFBBD8C12} = {E824D592-EBCB-41C6-A176-D001C5A124CB}
{B3D6DF0B-13DB-493E-9D1A-56343EFEDEA7} = {E824D592-EBCB-41C6-A176-D001C5A124CB}
{20926634-C200-43A6-AE59-86F9C3878992} = {E824D592-EBCB-41C6-A176-D001C5A124CB}
{FD78002E-C4E6-4BF8-9EC3-C06250DFEF34} = {FF878CF0-59B1-4B8C-A7DB-1E2A7B47575A}
Expand Down