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

Update to WindowsAppSDK (#1800)

This commit is contained in:
Matthew Leibowitz 2021-09-08 22:30:47 +02:00 коммит произвёл GitHub
Родитель 2e08f1b404
Коммит 57378897c9
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
8 изменённых файлов: 19 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -22,10 +22,11 @@ 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.1
Microsoft.ProjectReunion.Foundation release 0.8.1
Microsoft.ProjectReunion.WinUI release 0.8.1
Microsoft.Maui.Graphics release 6.0.100-preview.5.246
Microsoft.WindowsAppSDK release 1.0.0-experimental1
Microsoft.WindowsAppSDK.Foundation release 1.0.0-experimental1
Microsoft.WindowsAppSDK.WinUI release 1.0.0-experimental1
Microsoft.WindowsAppSDK.InteractiveExperiences release 1.0.0-experimental1
Microsoft.Maui.Graphics release 6.0.100-preview.7.358
Microsoft.Windows.SDK.NET.Ref release 10.0.18362.15
# additional references used by the tooling

5
cake/UtilsManaged.cake
Просмотреть файл

@ -254,8 +254,9 @@ async Task<NuGetDiff> CreateNuGetDiffAsync()
await AddDep("Uno.UI", "xamarinios10");
await AddDep("Uno.UI", "xamarinmac20");
await AddDep("Uno.UI", "UAP");
await AddDep("Microsoft.ProjectReunion.Foundation", "net5.0-windows");
await AddDep("Microsoft.ProjectReunion.WinUI", "net5.0-windows10.0.18362.0");
await AddDep("Microsoft.WindowsAppSDK.Foundation", "net5.0-windows");
await AddDep("Microsoft.WindowsAppSDK.WinUI", "net5.0-windows10.0.18362.0");
await AddDep("Microsoft.WindowsAppSDK.InteractiveExperiences", "net5.0-windows10.0.17763.0");
await AddDep("Microsoft.Maui.Graphics", "netstandard2.0");
await AddDep("Microsoft.Windows.SDK.NET.Ref", "");

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

@ -29,7 +29,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<dependencies>
<group targetFramework="net5.0-windows10.0.18362">
<dependency id="SkiaSharp" version="1.0.0" />
<dependency id="Microsoft.ProjectReunion" version="1.0.0" />
<dependency id="Microsoft.WindowsAppSDK" version="1.0.0" />
</group>
</dependencies>

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

@ -27,9 +27,9 @@
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.1" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.1" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.1" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
<PackageReference Include="Microsoft.WindowsAppSDK.Foundation" Version="1.0.0-experimental1" />
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="1.0.0-experimental1" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">

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

@ -64,10 +64,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.1]">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0-experimental1]">
<IncludeAssets>build</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.8.1]">
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="[1.0.0-experimental1]">
<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.1" />
<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.1" />
<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.1" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
<PackageReference Include="Microsoft.WindowsAppSDK.Foundation" Version="1.0.0-experimental1" />
<PackageReference Include="Microsoft.WindowsAppSDK.WinUI" Version="1.0.0-experimental1" />
<Manifest Include="$(ApplicationManifest)" />
</ItemGroup>

2
scripts/azure-pipelines.yml
Просмотреть файл

@ -26,7 +26,7 @@ variables:
XCODE_VERSION: 12.4
DOTNET_VERSION_PREVIOUS: 3.1.412
DOTNET_VERSION: 5.0.400
DOTNET_VERSION_PREVIEW: 6.0.100-rc.1.21425.1
DOTNET_VERSION_PREVIEW: 6.0.100-rc.1.21426.23
DOTNET_WORKLOAD_SOURCE: 'https://aka.ms/dotnet/maui/rc1/index.json'
VS_VERSION_PREVIEW: 16/pre
CONFIGURATION: 'Release'

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.1" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />