fix: Add net6.0 ios, android, catalyst, macos, tvos, tizen for Skottie (

#2133)
mono · Jun 29, 2022 · 1e92d90 · 1e92d90
1 parent 1bfb2ef
commit 1e92d90
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 2 deletions.
diff --git a/binding/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.csproj b/binding/SkiaSharp.SceneGraph/SkiaSharp.SceneGraph.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(BasicTargetFrameworks)</TargetFrameworks>
+    <TargetFrameworks>$(AllTargetFrameworks)</TargetFrameworks>
     <RootNamespace>SkiaSharp.SceneGraph</RootNamespace>
     <AssemblyName>SkiaSharp.SceneGraph</AssemblyName>
     <PackagingGroup>SkiaSharp.Skottie</PackagingGroup>

diff --git a/binding/SkiaSharp.Skottie/SkiaSharp.Skottie.csproj b/binding/SkiaSharp.Skottie/SkiaSharp.Skottie.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>$(BasicTargetFrameworks)</TargetFrameworks>
+    <TargetFrameworks>$(AllTargetFrameworks)</TargetFrameworks>
     <RootNamespace>SkiaSharp.Skottie</RootNamespace>
     <AssemblyName>SkiaSharp.Skottie</AssemblyName>
     <PackagingGroup>SkiaSharp.Skottie</PackagingGroup>

diff --git a/nuget/SkiaSharp.Skottie.nuspec b/nuget/SkiaSharp.Skottie.nuspec
@@ -63,6 +63,24 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
       <group targetFramework="net6.0">
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
+      <group targetFramework="net6.0-ios13.6">
+        <dependency id="SkiaSharp" version="1.0.0" />
+      </group>
+      <group targetFramework="net6.0-maccatalyst13.5">
+        <dependency id="SkiaSharp" version="1.0.0" />
+      </group>
+      <group targetFramework="net6.0-tvos13.4">
+        <dependency id="SkiaSharp" version="1.0.0" />
+      </group>
+      <group targetFramework="net6.0-macos10.15">
+        <dependency id="SkiaSharp" version="1.0.0" />
+      </group>
+      <group targetFramework="net6.0-android30.0">
+        <dependency id="SkiaSharp" version="1.0.0" />
+      </group>
+      <group targetFramework="net6.0-tizen7.0">
+        <dependency id="SkiaSharp" version="1.0.0" />
+      </group>
     </dependencies>
 
   </metadata>
@@ -94,6 +112,19 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="lib/net6.0/SkiaSharp.Skottie.dll" />
     <file src="lib/net6.0/SkiaSharp.Skottie.pdb" />
 
+    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.Skottie.dll" target="lib/net6.0-android30.0/SkiaSharp.Skottie.dll" />
+    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.Skottie.pdb" target="lib/net6.0-android30.0/SkiaSharp.Skottie.pdb" />
+    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.Skottie.dll" target="lib/net6.0-ios13.6/SkiaSharp.Skottie.dll" />
+    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.Skottie.pdb" target="lib/net6.0-ios13.6/SkiaSharp.Skottie.pdb" />
+    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.Skottie.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Skottie.dll" />
+    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.Skottie.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.Skottie.pdb" />
+    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.Skottie.dll" target="lib/net6.0-tvos13.4/SkiaSharp.Skottie.dll" />
+    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.Skottie.pdb" target="lib/net6.0-tvos13.4/SkiaSharp.Skottie.pdb" />
+    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.Skottie.dll" target="lib/net6.0-macos10.15/SkiaSharp.Skottie.dll" />
+    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.Skottie.pdb" target="lib/net6.0-macos10.15/SkiaSharp.Skottie.pdb" />
+    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.Skottie.dll" target="lib/net6.0-tizen7.0/SkiaSharp.Skottie.dll" />
+    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.Skottie.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.Skottie.pdb" />
+
     <!-- SkiaSharp.SceneGraph.dll -->
     <file src="lib/net462/SkiaSharp.SceneGraph.dll" />
     <file src="lib/net462/SkiaSharp.SceneGraph.pdb" />
@@ -120,6 +151,19 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <file src="lib/net6.0/SkiaSharp.SceneGraph.dll" />
     <file src="lib/net6.0/SkiaSharp.SceneGraph.pdb" />
 
+    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.SceneGraph.dll" target="lib/net6.0-android30.0/SkiaSharp.SceneGraph.dll" />
+    <file platform="macos,windows" src="lib/net6.0-android/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-android30.0/SkiaSharp.SceneGraph.pdb" />
+    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.SceneGraph.dll" target="lib/net6.0-ios13.6/SkiaSharp.SceneGraph.dll" />
+    <file platform="macos" src="lib/net6.0-ios/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-ios13.6/SkiaSharp.SceneGraph.pdb" />
+    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.SceneGraph.dll" target="lib/net6.0-maccatalyst13.5/SkiaSharp.SceneGraph.dll" />
+    <file platform="macos" src="lib/net6.0-maccatalyst/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-maccatalyst13.5/SkiaSharp.SceneGraph.pdb" />
+    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.SceneGraph.dll" target="lib/net6.0-tvos13.4/SkiaSharp.SceneGraph.dll" />
+    <file platform="macos" src="lib/net6.0-tvos/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-tvos13.4/SkiaSharp.SceneGraph.pdb" />
+    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.SceneGraph.dll" target="lib/net6.0-macos10.15/SkiaSharp.SceneGraph.dll" />
+    <file platform="macos" src="lib/net6.0-macos/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-macos10.15/SkiaSharp.SceneGraph.pdb" />
+    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.SceneGraph.dll" target="lib/net6.0-tizen7.0/SkiaSharp.SceneGraph.dll" />
+    <file platform="macos" src="lib/net6.0-tizen/SkiaSharp.SceneGraph.pdb" target="lib/net6.0-tizen7.0/SkiaSharp.SceneGraph.pdb" />
+
     <!-- legal -->
     <file src="LICENSE.txt" />