Merge remote-tracking branch 'origin/main' into develop

This commit is contained in:
Matthew Leibowitz 2021-05-23 04:42:03 +02:00
Родитель d18e852f05 1916562ba5
Коммит fb6741acd1
19 изменённых файлов: 41 добавлений и 43 удалений

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

@ -21,7 +21,7 @@ System.Memory release 4.5.3
System.IO.UnmanagedMemoryStream release 4.3.0 System.IO.UnmanagedMemoryStream release 4.3.0
System.Drawing.Common release 4.5.1 System.Drawing.Common release 4.5.1
SharpVk release 0.4.2 SharpVk release 0.4.2
Uno.UI release 2.4.4 Uno.UI release 3.7.4
Microsoft.ProjectReunion release 0.5.0 Microsoft.ProjectReunion release 0.5.0
Microsoft.ProjectReunion.Foundation release 0.5.0 Microsoft.ProjectReunion.Foundation release 0.5.0
Microsoft.ProjectReunion.WinUI release 0.5.0 Microsoft.ProjectReunion.WinUI release 0.5.0

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

@ -28,24 +28,24 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependencies> <dependencies>
<group targetFramework="netstandard2.0"> <group targetFramework="netstandard2.0">
<dependency id="Uno.UI" version="3.0.12" /> <dependency id="Uno.UI" version="3.7.4" />
<dependency id="SkiaSharp" version="1.0.0" /> <dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.NativeAssets.WebAssembly" version="1.0.0" /> <dependency id="SkiaSharp.NativeAssets.WebAssembly" version="1.0.0" />
</group> </group>
<group targetFramework="monoandroid1.0"> <group targetFramework="monoandroid1.0">
<dependency id="Uno.UI" version="3.0.12" /> <dependency id="Uno.UI" version="3.7.4" />
<dependency id="SkiaSharp" version="1.0.0" /> <dependency id="SkiaSharp" version="1.0.0" />
</group> </group>
<group targetFramework="xamarinios1.0"> <group targetFramework="xamarinios1.0">
<dependency id="Uno.UI" version="3.0.12" /> <dependency id="Uno.UI" version="3.7.4" />
<dependency id="SkiaSharp" version="1.0.0" /> <dependency id="SkiaSharp" version="1.0.0" />
</group> </group>
<group targetFramework="xamarinmac2.0"> <group targetFramework="xamarinmac2.0">
<dependency id="Uno.UI" version="3.0.12" /> <dependency id="Uno.UI" version="3.7.4" />
<dependency id="SkiaSharp" version="1.0.0" /> <dependency id="SkiaSharp" version="1.0.0" />
</group> </group>
<group targetFramework="uap10.0"> <group targetFramework="uap10.0">
<dependency id="Uno.UI" version="3.0.12" /> <dependency id="Uno.UI" version="3.7.4" />
<dependency id="SkiaSharp" version="1.0.0" /> <dependency id="SkiaSharp" version="1.0.0" />
<dependency id="SkiaSharp.Views" version="1.0.0" /> <dependency id="SkiaSharp.Views" version="1.0.0" />
</group> </group>

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

@ -56,9 +56,9 @@
<Reference Include="Mono.Android.Export" /> <Reference Include="Mono.Android.Export" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.12" Condition="'$(Configuration)'=='Debug'" /> <PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" /> <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.33" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
</ItemGroup> </ItemGroup>

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

@ -118,7 +118,7 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" /> <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.Core" Version="2.0.0" /> <PackageReference Include="Uno.Core" Version="2.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj"> <ProjectReference Include="..\..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj">

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

@ -5,7 +5,6 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<WasmHead>true</WasmHead>
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants> <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
<WasmShellILLinkerEnabled>true</WasmShellILLinkerEnabled> <WasmShellILLinkerEnabled>true</WasmShellILLinkerEnabled>
@ -23,10 +22,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.UI.WebAssembly" Version="3.0.12" /> <PackageReference Include="Uno.UI.WebAssembly" Version="3.7.4" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.12" Condition="'$(Configuration)'=='Debug'" /> <PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="2.0.0-dev.148" /> <PackageReference Include="Uno.Wasm.Bootstrap" Version="2.1.0" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.148" /> <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" /> <ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

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

@ -95,8 +95,8 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.12" Condition="'$(Configuration)'=='Debug'" /> <PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
</ItemGroup> </ItemGroup>

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

@ -41,8 +41,8 @@
<Reference Include="System.Memory" /> <Reference Include="System.Memory" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.12" Condition="'$(Configuration)'=='Debug'" /> <PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
</ItemGroup> </ItemGroup>

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

@ -57,9 +57,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.12" Condition="'$(Configuration)'=='Debug'" /> <PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" /> <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.33" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
</ItemGroup> </ItemGroup>

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

@ -119,7 +119,7 @@
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" /> <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.Core" Version="2.0.0" /> <PackageReference Include="Uno.Core" Version="2.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj"> <ProjectReference Include="..\..\..\..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj">

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

@ -6,7 +6,6 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<WasmHead>true</WasmHead>
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants> <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
<WasmShellILLinkerEnabled>true</WasmShellILLinkerEnabled> <WasmShellILLinkerEnabled>true</WasmShellILLinkerEnabled>
@ -24,10 +23,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.UI.WebAssembly" Version="3.0.12" /> <PackageReference Include="Uno.UI.WebAssembly" Version="3.7.4" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.12" Condition="'$(Configuration)'=='Debug'" /> <PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="2.0.0-dev.148" /> <PackageReference Include="Uno.Wasm.Bootstrap" Version="2.1.0" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.148" /> <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" /> <ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

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

@ -101,8 +101,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.12" Condition="'$(Configuration)'=='Debug'" /> <PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
</ItemGroup> </ItemGroup>

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

@ -42,8 +42,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Xamarin.Essentials" Version="1.5.1" /> <PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.12" Condition="'$(Configuration)'=='Debug'" /> <PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
</ItemGroup> </ItemGroup>

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

@ -1,6 +1,6 @@
<Project Sdk="MSBuild.Sdk.Extras/3.0.23"> <Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup> <PropertyGroup>
<TargetFramework>monoandroid9.0</TargetFramework> <TargetFramework>monoandroid10.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.UWP</RootNamespace> <RootNamespace>SkiaSharp.Views.UWP</RootNamespace>
<AssemblyName>SkiaSharp.Views.UWP</AssemblyName> <AssemblyName>SkiaSharp.Views.UWP</AssemblyName>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
@ -8,7 +8,7 @@
<PackagingPlatform>monoandroid1.0</PackagingPlatform> <PackagingPlatform>monoandroid1.0</PackagingPlatform>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj" /> <ProjectReference Include="..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj" />

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

@ -8,7 +8,7 @@
<DefineConstants>$(DefineConstants);__MACOS__</DefineConstants> <DefineConstants>$(DefineConstants);__MACOS__</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj" /> <ProjectReference Include="..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj" />

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

@ -7,7 +7,7 @@
<PackagingGroup>SkiaSharp.Views.Uno</PackagingGroup> <PackagingGroup>SkiaSharp.Views.Uno</PackagingGroup>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" /> <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

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

@ -9,8 +9,8 @@
<PackagingLocation>uno-runtime\webassembly</PackagingLocation> <PackagingLocation>uno-runtime\webassembly</PackagingLocation>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
<PackageReference Include="Uno.UI.Runtime.WebAssembly" Version="3.0.12" /> <PackageReference Include="Uno.UI.Runtime.WebAssembly" Version="3.7.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" /> <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

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

@ -7,7 +7,7 @@
<PackagingGroup>SkiaSharp.Views.Uno</PackagingGroup> <PackagingGroup>SkiaSharp.Views.Uno</PackagingGroup>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.UI" Version="3.0.12" /> <PackageReference Include="Uno.UI" Version="3.7.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj" /> <ProjectReference Include="..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj" />

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

@ -17,8 +17,8 @@
<LinkerDescriptor Include="LinkerConfig.xml" /> <LinkerDescriptor Include="LinkerConfig.xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.Wasm.Bootstrap" Version="2.0.0-dev.148" /> <PackageReference Include="Uno.Wasm.Bootstrap" Version="2.1.0" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.148" /> <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.1.0" />
<PackageReference Include="xunit" Version="2.4.1" /> <PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.1" /> <PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
<PackageReference Include="xunit.runner.utility" Version="2.4.1" /> <PackageReference Include="xunit.runner.utility" Version="2.4.1" />

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

@ -10,8 +10,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Uno.Wasm.Bootstrap" Version="2.0.0-dev.148" /> <PackageReference Include="Uno.Wasm.Bootstrap" Version="2.1.0" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.148" /> <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.1.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>