This commit is contained in:
Jerome Laban 2021-11-17 08:24:49 -05:00
Родитель 04f9332b35
Коммит 9f5e33948e
20 изменённых файлов: 25425 добавлений и 30 удалений

Просмотреть файл

@ -22,7 +22,7 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
</ItemGroup>
<!-- END UNO SPECIFIC -->
</Project>

Просмотреть файл

@ -27,7 +27,7 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
</ItemGroup>
<!-- END UNO SPECIFIC -->

Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -89,9 +89,9 @@
<!--<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.33" />-->
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.33" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed">
<Version>2.3.0-uno.8</Version>
<Version>2.3.0-uno.12</Version>
</PackageReference>
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<PackageReference Include="System.Text.Json" Version="4.7.2" />
</ItemGroup>
<ItemGroup>

Разница между файлами не показана из-за своего большого размера Загрузить разницу

Просмотреть файл

@ -26,8 +26,8 @@
<!-- Note that for WebAssembly version 1.1.1 of the console logger required -->
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI.RemoteControl" Version="4.0.0-dev.5441" Condition="'$(Configuration)'=='Debug'" />
<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="System.Text.Json" Version="4.7.2" />
<!--<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.33" />-->
</ItemGroup>

Просмотреть файл

@ -27,7 +27,7 @@
-->
<ItemGroup>
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI.WebAssembly" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="3.0.0" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />

Просмотреть файл

@ -116,8 +116,8 @@
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<!--<PackageReference Include="Uno.UI.Sample.Banner" Version="1.44.0-dev.33" />-->
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0-uno.8" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0-uno.12" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<PackageReference Include="System.Text.Json" Version="4.7.2" />
</ItemGroup>
<ItemGroup>

Просмотреть файл

@ -33,7 +33,7 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<Compile Remove="Effects\Blur.cs" />
<Compile Remove="Effects\Saturation.cs" />

Просмотреть файл

@ -46,8 +46,8 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0-uno.8" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0-uno.12" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows10.0.18362.0'">

Просмотреть файл

@ -64,7 +64,7 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Remove="Microsoft.UI.Xaml" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
</ItemGroup>
<!-- END UNO SPECIFIC -->

Просмотреть файл

@ -40,7 +40,7 @@
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Remove="Microsoft.UI.Xaml" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid10.0' or '$(TargetFramework)' == 'xamarinios10' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">

Просмотреть файл

@ -55,7 +55,7 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Remove="Microsoft.UI.Xaml" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<Page Remove="RichSuggestBox/**/*.xaml" />
<Compile Remove="RichSuggestBox/**/*.cs" />

Просмотреть файл

@ -56,7 +56,7 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Remove="Microsoft.UI.Xaml" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
</ItemGroup>
<!-- END UNO SPECIFIC -->
</Project>

Просмотреть файл

@ -50,7 +50,7 @@
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.ColorCode.WinUI" Version="2.1.0-uno.32" />
</ItemGroup>

Просмотреть файл

@ -48,7 +48,7 @@
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<Page Remove="Eyedropper/**/*.xaml" />
<Page Remove="InfiniteCanvas/**/*.xaml" />

Просмотреть файл

@ -53,7 +53,7 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Remove="Microsoft.UI.Xaml" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
</ItemGroup>
<!-- END UNO SPECIFIC -->

Просмотреть файл

@ -65,7 +65,7 @@
<XamarinAndroidSupportSkipVerifyVersions>true</XamarinAndroidSupportSkipVerifyVersions>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<Compile Remove="Brushes\**\*.cs" />

Просмотреть файл

@ -61,8 +61,8 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0-uno.8" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
<PackageReference Include="Uno.Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.3.0-uno.12" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.17763'">

Просмотреть файл

@ -22,7 +22,7 @@
</PropertyGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' or '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS' or '$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5441" />
<PackageReference Include="Uno.WinUI" Version="4.0.0-dev.5612" />
</ItemGroup>
<!-- END UNO SPECIFIC -->

Просмотреть файл

@ -36,7 +36,7 @@
<ItemGroup Condition="'$(UnoUIVersionOverride)'!=''">
<!-- Force all projects to use the same uno version to avoid net5 build issues on linux -->
<PackageReference Update="Uno.WinUI"
Version="4.0.0-dev.5441" />
Version="4.0.0-dev.5612" />
</ItemGroup>
<!-- END Uno Specific -->