wieslawsoltes
/
SkiaSharp
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

# Conflicts:
#	VERSIONS.txt
#	nuget/SkiaSharp.Views.WinUI.nuspec
#	samples/Basic/WinUI/Desktop/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
#	samples/Basic/WinUI/Desktop/SkiaSharpSample/SkiaSharpSample.csproj
#	scripts/azure-pipelines.yml
#	source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
This commit is contained in:
Matthew Leibowitz 2021-07-09 16:48:24 +02:00
Родитель b53e6b6290 a52d2115f9
Коммит 2403baa649
5 изменённых файлов: 10 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
VERSIONS.txt
Просмотреть файл

@ -22,9 +22,9 @@ System.IO.UnmanagedMemoryStream release 4.3.0
System.Drawing.Common release 4.5.1
SharpVk release 0.4.2
Uno.UI release 3.7.6
Microsoft.ProjectReunion release 0.8.0-preview
Microsoft.ProjectReunion.Foundation release 0.8.0-preview
Microsoft.ProjectReunion.WinUI release 0.8.0-preview
Microsoft.ProjectReunion release 0.8.0
Microsoft.ProjectReunion.Foundation release 0.8.0
Microsoft.ProjectReunion.WinUI release 0.8.0
Microsoft.Maui.Core release 6.0.100-preview.5.794
Microsoft.Maui.Controls release 6.0.100-preview.5.794
Microsoft.Maui.Controls.Compatibility release 6.0.100-preview.5.794

4
samples/Basic/WinUI/Desktop/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
Просмотреть файл

@ -64,10 +64,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.0-preview]">
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.0]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.8.0-preview]">
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.8.0]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
</ItemGroup>

6
samples/Basic/WinUI/Desktop/SkiaSharpSample/SkiaSharpSample.csproj
Просмотреть файл

@ -11,9 +11,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0-preview" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.0-preview" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0-preview" />
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.0" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

2
source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
Просмотреть файл

@ -7,7 +7,7 @@
<PackagingGroup>SkiaSharp.Views.WinUI</PackagingGroup>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0-preview" />
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

2
source/SkiaSharp.Views/SkiaSharp.Views.UWP/SKXamlCanvas.cs
Просмотреть файл

@ -3,7 +3,7 @@ using Windows.ApplicationModel;
using Windows.Graphics.Display;
#if WINDOWS
using Microsoft.System;
using Microsoft.UI.Dispatching;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Data;