Skip to content

Commit 164408b

Browse files
authored
Updating TFMs and NuGets (#291)
1 parent 2bb8b91 commit 164408b

File tree

5 files changed

+23
-21
lines changed

5 files changed

+23
-21
lines changed

samples/SkiaSharpDemo/SkiaSharpDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</PropertyGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="HarfBuzzSharp" Version="7.3.0.1" />
35+
<PackageReference Include="HarfBuzzSharp" Version="8.3.0-preview.5.4" />
3636
<PackageReference Include="NLipsum" Version="1.1.0" />
3737
<PackageReference Include="Svg.Skia" Version="1.0.0.18" />
3838
<PackageReference Include="Topten.RichTextKit" Version="0.4.166" />

source/SkiaSharp.Extended.UI.Maui/SkiaSharp.Extended.UI.Maui.csproj

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net7.0;net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
66
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
7-
<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
7+
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
88
<UseMaui>true</UseMaui>
99
<SingleProject>true</SingleProject>
1010
<ImplicitUsings>enable</ImplicitUsings>
@@ -29,9 +29,11 @@
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="SkiaSharp" Version="3.0.0-preview.3.1" />
33-
<PackageReference Include="SkiaSharp.Skottie" Version="3.0.0-preview.3.1" />
34-
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="3.0.0-preview.3.1" />
32+
<PackageReference Include="SkiaSharp" Version="3.0.0-preview.5.4" />
33+
<PackageReference Include="SkiaSharp.Skottie" Version="3.0.0-preview.5.4" />
34+
<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="3.0.0-preview.5.4" />
35+
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
36+
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
3537
</ItemGroup>
3638

3739
<ItemGroup>
@@ -48,7 +50,7 @@
4850
<Using Include="SkiaSharp.Views.Maui.Controls" />
4951
</ItemGroup>
5052

51-
<ItemGroup Condition=" '$(TargetFramework)' != 'net7.0' ">
53+
<ItemGroup Condition=" $(TargetFramework.Contains('-')) ">
5254
<Compile Remove="**\*.ref.cs" />
5355
<Compile Remove="**\*.ref.*.cs" />
5456
</ItemGroup>

source/SkiaSharp.Extended/SkiaSharp.Extended.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
55
<AssemblyName>SkiaSharp.Extended</AssemblyName>
66
<RootNamespace>SkiaSharp.Extended</RootNamespace>
77
</PropertyGroup>
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="SkiaSharp" Version="3.0.0-preview.3.1" />
16+
<PackageReference Include="SkiaSharp" Version="3.0.0-preview.5.4" />
1717
</ItemGroup>
1818

1919
</Project>

tests/SkiaSharp.Extended.Tests/SkiaSharp.Extended.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="SkiaSharp" Version="3.0.0-preview.3.1" />
9-
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.0.0-preview.3.1" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
11-
<PackageReference Include="xunit" Version="2.7.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
8+
<PackageReference Include="SkiaSharp" Version="3.0.0-preview.5.4" />
9+
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.0.0-preview.5.4" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
11+
<PackageReference Include="xunit" Version="2.9.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.35">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

tests/SkiaSharp.Extended.UI.Maui.Tests/SkiaSharp.Extended.UI.Maui.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="SkiaSharp" Version="3.0.0-preview.3.1" />
11-
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.0.0-preview.3.1" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
13-
<PackageReference Include="xunit" Version="2.7.0" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
10+
<PackageReference Include="SkiaSharp" Version="3.0.0-preview.5.4" />
11+
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.0.0-preview.5.4" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13+
<PackageReference Include="xunit" Version="2.9.2" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.35">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>

0 commit comments

Comments
 (0)