This commit is contained in:
Youssef Victor 2024-07-30 14:57:05 +03:00
Родитель e17d9aa2a4
Коммит 5c76b3ec90
5 изменённых файлов: 16 добавлений и 12 удалений

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

@ -42,8 +42,8 @@
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Condition="'$(UNO_UWP_BUILD)'!='true'" />
<!-- Explicitly included to remove all assets from Uno dependencies coming from SkiaSharp.Views.* -->
<PackageReference Include="Uno.UI" Version="4.4.5" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<PackageReference Include="Uno.WinUI" Version="4.4.5" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'!='true'" />
<PackageReference Include="Uno.UI" Version="4.9.26" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<PackageReference Include="Uno.WinUI" Version="4.9.26" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'!='true'" />
</ItemGroup>
<Import Project="..\..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" />

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

@ -25,8 +25,8 @@
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Condition="'$(UNO_UWP_BUILD)'!='true'" />
<!-- Explicitly included to remove all assets from Uno dependencies coming from SkiaSharp.Views.* -->
<PackageReference Include="Uno.UI" Version="4.4.5" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<PackageReference Include="Uno.WinUI" Version="4.4.5" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'!='true'" />
<PackageReference Include="Uno.UI" Version="4.9.26" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<PackageReference Include="Uno.WinUI" Version="4.9.26" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'!='true'" />
</ItemGroup>
<ItemGroup>

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

@ -40,8 +40,8 @@
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Condition="'$(UNO_UWP_BUILD)'!='true'" />
<!-- Explicitly included to remove all assets from Uno dependencies coming from SkiaSharp.Views.* -->
<PackageReference Include="Uno.UI" Version="4.4.5" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<PackageReference Include="Uno.WinUI" Version="4.4.5" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'!='true'" />
<PackageReference Include="Uno.UI" Version="4.9.26" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<PackageReference Include="Uno.WinUI" Version="4.9.26" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'!='true'" />
</ItemGroup>
<Import Project="..\..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" />

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

@ -40,8 +40,8 @@
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Condition="'$(UNO_UWP_BUILD)'!='true'" />
<!-- Explicitly included to remove all assets from Uno dependencies coming from SkiaSharp.Views.* -->
<PackageReference Include="Uno.UI" Version="4.4.5" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<PackageReference Include="Uno.WinUI" Version="4.4.5" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'!='true'" />
<PackageReference Include="Uno.UI" Version="4.9.26" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'=='true'"/>
<PackageReference Include="Uno.WinUI" Version="4.9.26" ExcludeAssets="all" IncludeAssets="none" PrivateAssets="all" Condition="'$(UNO_UWP_BUILD)'!='true'" />
</ItemGroup>
<ItemGroup Condition="$(IsAndroid)">

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

@ -62,7 +62,11 @@
<PropertyGroup>
<SkiaSharpVersion>2.88.7</SkiaSharpVersion>
<SkiaSharpVersion Condition="'$(IsTestProject)' == 'true' or '$(IsSampleProject)' == 'true'">3.0.0-preview.4.1</SkiaSharpVersion>
<!-- SkiaSharp is no longer supporting SkiaSharp.Views.Uno, so there is no 3.x of this particular package. -->
<SkiaSharpViewsUnoVersion>$(SkiaSharpVersion)</SkiaSharpViewsUnoVersion>
<SkiaSharpVersion Condition="'$(IsTestProject)' == 'true' or '$(IsSampleProject)' == 'true'">3.0.0-preview.4.1</SkiaSharpVersion>
</PropertyGroup>
<ItemGroup>
@ -97,7 +101,7 @@
<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Update="SkiaSharp.Views" Version="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp.Views.Uno" Version="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp.Views.Uno" Version="$(SkiaSharpViewsUnoVersion)" />
<PackageReference Update="SkiaSharp.Views.Uno.WinUI" Version="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp.Views.WPF" Version="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp" Version="$(SkiaSharpVersion)" />
@ -108,11 +112,11 @@
<PackageReference Update="SkiaSharp.NativeAssets.iOS" Version="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp.NativeAssets.MacCatalyst" Version="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp.NativeAssets.macos" Version="$(SkiaSharpVersion)" />
<PackageReference Update="SkiaSharp.HarfBuzz" Version="$(SkiaSharpVersion)" />
<PackageReference Update="HarfBuzzSharp.NativeAssets.macOS" Version="7.3.0.1" />
<PackageReference Update="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.1" />
<PackageReference Update="harfbuzzsharp.nativeassets.ios" Version="7.3.0.1" />
<PackageReference Update="SkiaSharp.HarfBuzz" Version="$(SkiaSharpVersion)" />
<PackageReference Update="Svg.Skia" Version="1.0.0.1" />
<PackageReference Update="GtkSharp" Version="3.24.24.38" />