Merge pull request #1756 from beto-rodriguez/skiasharp-3

Skiasharp 3
beto-rodriguez · Jan 7, 2025 · d55236b · d55236b
2 parents cd0d0c2 + 2ed2428
commit d55236b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 26 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,8 +4,12 @@
     <GlobalLangVersion>12.0</GlobalLangVersion>
     <LiveChartsVersion>2.0.0-rc4.5</LiveChartsVersion>
     <LiveChartsAuthors>BetoRodriguez</LiveChartsAuthors>
+
     <SkiaSharpVersion>2.88.9</SkiaSharpVersion>
-
+
+    <!-- used for views that use the SkiaSharp 3 as default -->
+    <LatestSkiaSharpVersion>3.116.1</LatestSkiaSharpVersion>
+
     <!-- TODO: Move here other global properties like Version, Author -->
   </PropertyGroup>
 </Project>
diff --git a/samples/WPFSample/WPFSample.csproj b/samples/WPFSample/WPFSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.19041</TargetFramework>
     <UseWPF>true</UseWPF>
     <IsPackable>false</IsPackable>
     <LangVersion>$(GlobalLangVersion)</LangVersion>

diff --git a/samples/WinFormsSample/WinFormsSample.csproj b/samples/WinFormsSample/WinFormsSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.19041</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <IsPackable>false</IsPackable>
     <LangVersion>$(GlobalLangVersion)</LangVersion>

diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp.WPF/LiveChartsCore.SkiaSharpView.WPF.csproj
@@ -4,11 +4,8 @@
     <Nullable>enable</Nullable>
     <LangVersion>$(GlobalLangVersion)</LangVersion>
     <UseWPF>true</UseWPF>
-    <!--
-    netcore app is out of support, but the latest stable release of SkiaSharp requires it.
-    SkiaSharp 3.x removes this target, should we upgrade this view to 3.x?
-    -->
-    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+
+    <TargetFrameworks>net462;net6.0-windows10.0.19041;net8.0-windows10.0.19041</TargetFrameworks>
     <AssemblyName>LiveChartsCore.SkiaSharpView.WPF</AssemblyName>
     <RootNamespace>LiveChartsCore.SkiaSharpView.WPF</RootNamespace>
     <Version>$(LiveChartsVersion)</Version>
@@ -33,8 +30,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
-    <PackageReference Include="SkiaSharp.Views.WPF" Version="$(SkiaSharpVersion)" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="SkiaSharp.Views.WPF" Version="$(LatestSkiaSharpVersion)" />
+  <PackageReference Include="SkiaSharp.HarfBuzz" Version="$(LatestSkiaSharpVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj b/src/skiasharp/LiveChartsCore.SkiaSharp.WinForms/LiveChartsCore.SkiaSharpView.WinForms.csproj
@@ -7,11 +7,7 @@
     <OutputType>WinExe</OutputType>
     <UseWindowsForms>true</UseWindowsForms>
     <OutputType>Library</OutputType>
-    <!--
-    netcore app is out of support, but the latest stable release of SkiaSharp requires it.
-    SkiaSharp 3.x removes this target, should we upgrade this view to 3.x?
-    -->
-    <TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0-windows10.0.19041;net8.0-windows10.0.19041</TargetFrameworks>
     <AssemblyName>LiveChartsCore.SkiaSharpView.WinForms</AssemblyName>
     <RootNamespace>LiveChartsCore.SkiaSharpView.WinForms</RootNamespace>
     <Version>$(LiveChartsVersion)</Version>
@@ -30,19 +26,15 @@
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- SkiaSharp.WinForms warning, lets disable it at our level -->
-    <NoWarn>$(NoWarn);NU1701</NoWarn>
-  </PropertyGroup>
-
   <PropertyGroup>
     <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
-    <PackageReference Include="SkiaSharp.Views.WindowsForms" Version="$(SkiaSharpVersion)" />
+    <PackageReference Include="SkiaSharp.Views.WindowsForms" Version="$(LatestSkiaSharpVersion)" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="$(LatestSkiaSharpVersion)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -53,8 +45,4 @@
     <None Include="images\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Update="PolarChart.cs" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj b/src/skiasharp/LiveChartsCore.SkiaSharpView.Maui/LiveChartsCore.SkiaSharpView.Maui.csproj
@@ -44,7 +44,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
-	  <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="$(SkiaSharpVersion)" />
+	  <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="$(LatestSkiaSharpVersion)" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="$(LatestSkiaSharpVersion)" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
 	</ItemGroup>