Merge remote-tracking branch 'origin/main' into remove-services

This commit is contained in:
Matthew Leibowitz 2022-01-18 20:46:02 +02:00
Родитель 9fd5de19fc bdb5a44b84
Коммит 250f25c9b3
2 изменённых файлов: 23 добавлений и 23 удалений

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

@ -17,56 +17,56 @@
<dependencies>
<group targetFramework="net6.0-android30.0">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
</group>
<group targetFramework="net6.0-ios13.6">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
</group>
<group targetFramework="net6.0-maccatalyst13.5">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
</group>
<group targetFramework="net6.0-windows10.0.18362">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp.Views.WinUI" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views.WinUI" version="2.88.0-preview.179"/>
</group>
<group targetFramework="net6.0-tizen6.5">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
</group>
<group targetFramework="tizen40">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
</group>
<group targetFramework="xamarin.ios10">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
</group>
<group targetFramework="monoandroid10.0">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
</group>
<group targetFramework="xamarin.mac20">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
<dependency id="SkiaSharp.Views" version="2.88.0-preview.179"/>
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
</group>
<group targetFramework=".NETStandard2.1">
<dependency id="Microsoft.Maui.Graphics" version="$version$"/>
<dependency id="SkiaSharp" version="2.88.0-preview.155"/>
<dependency id="SkiaSharp" version="2.88.0-preview.179"/>
</group>
</dependencies>
</metadata>

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

@ -8,15 +8,15 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.155" />
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.179" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-android')) or $(TargetFramework.Contains('-ios')) or $(TargetFramework.Contains('-maccatalyst')) or $(TargetFramework.Contains('-tizen'))">
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.155" />
<PackageReference Include="SkiaSharp.Views" Version="2.88.0-preview.179" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<PackageReference Include="SkiaSharp.Views.WinUI" Version="2.88.0-preview.155" />
<PackageReference Include="SkiaSharp.Views.WinUI" Version="2.88.0-preview.179" />
</ItemGroup>
<ItemGroup>