unoplatform
/
uno.toolkit.ui
зеркало из https://github.com/unoplatform/uno.toolkit.ui.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #120 from unoplatform/dev/jela/update 

chore: Update to uno latest
This commit is contained in:
Jérôme Laban 2021-11-17 13:19:52 -05:00 коммит произвёл GitHub
Родитель 5f66c69008 eb5f18106e
Коммит 40c2f5af16
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
17 изменённых файлов: 58 добавлений и 58 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Uno.Toolkit.Samples.Droid.csproj
Просмотреть файл

@ -66,13 +66,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.Cupertino">
<Version>1.1.0-dev.13</Version>
<Version>1.1.0-dev.15</Version>
</PackageReference>
<PackageReference Include="Uno.Material">
<Version>1.1.0-dev.13</Version>
<Version>1.1.0-dev.15</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5612" 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" />
@ -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.0.0-dev.5594" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
</ItemGroup>

10
samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Gtk/Uno.Toolkit.Samples.Skia.Gtk.csproj
Просмотреть файл

@ -17,11 +17,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="1.1.0-dev.13" />
<PackageReference Include="Uno.Material" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.UI.Skia.Gtk" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.Cupertino" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.Material" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.UI.Skia.Gtk" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5612" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
</ItemGroup>

6
samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.UWP/Uno.Toolkit.Samples.UWP.csproj
Просмотреть файл

@ -12,12 +12,12 @@
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.0-prerelease.210623001" />
<PackageReference Include="Uno.Cupertino">
<Version>1.1.0-dev.13</Version>
<Version>1.1.0-dev.15</Version>
</PackageReference>
<PackageReference Include="Uno.Material">
<Version>1.1.0-dev.13</Version>
<Version>1.1.0-dev.15</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5612" />
<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.0-dev.7" />

10
samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/Uno.Toolkit.Samples.Wasm.csproj
Просмотреть файл

@ -42,15 +42,15 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Uno.Cupertino" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.Cupertino" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.0.1" />
<PackageReference Include="Uno.Material" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.UI.WebAssembly" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Material" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.UI.WebAssembly" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5612" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.0.0" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
</ItemGroup>

10
samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.iOS/Uno.Toolkit.Samples.iOS.csproj
Просмотреть файл

@ -181,16 +181,16 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Uno.Cupertino">
<Version>1.1.0-dev.13</Version>
<Version>1.1.0-dev.15</Version>
</PackageReference>
<PackageReference Include="Uno.Material">
<Version>1.1.0-dev.13</Version>
<Version>1.1.0-dev.15</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5612" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.1.0" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
</ItemGroup>

10
samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.macOS/Uno.Toolkit.Samples.macOS.csproj
Просмотреть файл

@ -71,16 +71,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.Cupertino">
<Version>1.1.0-dev.13</Version>
<Version>1.1.0-dev.15</Version>
</PackageReference>
<PackageReference Include="Uno.Material">
<Version>1.1.0-dev.13</Version>
<Version>1.1.0-dev.15</Version>
</PackageReference>
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5612" 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.0.0-dev.5594" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
</ItemGroup>

6
samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Droid/Uno.Toolkit.WinUI.Samples.Droid.csproj
Просмотреть файл

@ -70,8 +70,8 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5612" 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" />
@ -81,7 +81,7 @@
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
<Version>2.3.1.1</Version>
</PackageReference>
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
</ItemGroup>

6
samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj
Просмотреть файл

@ -24,9 +24,9 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5612" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
</ItemGroup>

6
samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj
Просмотреть файл

@ -42,12 +42,12 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.0.1" />
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5612" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.0.0" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.0.0" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
</ItemGroup>

6
samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.iOS/Uno.Toolkit.WinUI.Samples.iOS.csproj
Просмотреть файл

@ -119,11 +119,11 @@
<BundleResource Include="Resources\Fonts\uno-fluentui-assets.ttf" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5612" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.1.0" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
</ItemGroup>

6
samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.macOS/Uno.Toolkit.WinUI.Samples.macOS.csproj
Просмотреть файл

@ -73,11 +73,11 @@
<Reference Include="System.Memory" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5612" 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.0.0-dev.5594" />
<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
</ItemGroup>

2
src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
Просмотреть файл

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Collections" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.0-dev.7" />

2
src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
Просмотреть файл

@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Core.Extensions.Collections" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.0-dev.7" />
<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.0-dev.7" />

8
src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
Просмотреть файл

@ -14,9 +14,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.Cupertino" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.Material" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.Cupertino" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.Material" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5612" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.18362'">
@ -56,4 +56,4 @@
</ItemGroup>
</Target>
</Project>
</Project>

6
src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
Просмотреть файл

@ -16,9 +16,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.Cupertino.WinUI" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.Material.WinUI" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.Cupertino.WinUI" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.Material.WinUI" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.16" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.18362.16" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
</ItemGroup>

6
src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
Просмотреть файл

@ -15,9 +15,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.Cupertino" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.Material" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.Cupertino" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.Material" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.UI" Version="4.0.0-dev.5612" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.18362'">

6
src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
Просмотреть файл

@ -16,9 +16,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.Material.WinUI" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.Cupertino.WinUI" Version="1.1.0-dev.13" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5594" />
<PackageReference Include="Uno.Material.WinUI" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.Cupertino.WinUI" Version="1.1.0-dev.15" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.16" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.18362.16" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
</ItemGroup>