Switch back to the older version of skia for some

mono · Aug 15, 2020 · 282172a · 282172a
1 parent c19ad45
commit 282172a
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 15 deletions.
diff --git a/SkiaSharp.Extended.sln b/SkiaSharp.Extended.sln
@@ -47,6 +47,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Svg.Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Extended.Tests", "tests\SkiaSharp.Extended.Tests\SkiaSharp.Extended.Tests.csproj", "{B5A95CCE-FF80-4ACA-AA49-F150C23C65D5}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprectated", "deprectated", "{7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -545,6 +547,16 @@ Global
 		{C9938859-CB05-4AAD-909A-8118F3D6B47A} = {51B0C2C7-732B-4A5C-A4F2-55655D147866}
 		{F9CC0B31-7A41-46A6-9A23-EECF765F4E2C} = {51B0C2C7-732B-4A5C-A4F2-55655D147866}
 		{108D8FA2-92DB-4D6F-8E94-1C138CFC15E8} = {51B0C2C7-732B-4A5C-A4F2-55655D147866}
+		{854B652B-685E-4147-BBA3-0E1DA85FDEE5} = {7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}
+		{941BC633-58F2-4D38-ACFA-DA4B381AC406} = {7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}
+		{C4320934-1A4F-4037-813F-5159C3FB97EE} = {7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}
+		{EE925218-F50F-40DE-8C2A-5065EAC76932} = {7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}
+		{AE75FEC5-5673-4351-B296-BE0BAEA1C090} = {7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}
+		{6370B6B2-A1F4-4A7C-A24F-D58E8DA7C47D} = {7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}
+		{836B21CF-10F0-4DB6-A437-BC43F15EAC86} = {7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}
+		{C55C8DD2-0CEF-4D71-A75D-F495F2ABAEE8} = {7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}
+		{91DF572A-CB40-4D5F-9F09-6244E60C7625} = {7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}
+		{4B690A05-D653-4CC5-A34E-CB4A6472729A} = {7BB41E64-A9E4-4675-8CE6-98360BF6AB0C}
 		{8E2211C7-EA20-4670-98DB-0489D2127DAB} = {E546FFE2-58F6-4F5B-8EDB-15056F9810BA}
 		{4EDBF443-6305-48DA-90E7-9943E6E97B03} = {5555F827-12DF-4D15-BF07-3A720FC2EF3F}
 		{B5A95CCE-FF80-4ACA-AA49-F150C23C65D5} = {5555F827-12DF-4D15-BF07-3A720FC2EF3F}

diff --git a/source/SkiaSharp.Extended.Iconify.FontAwesome/SkiaSharp.Extended.Iconify.FontAwesome.csproj b/source/SkiaSharp.Extended.Iconify.FontAwesome/SkiaSharp.Extended.Iconify.FontAwesome.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/source/SkiaSharp.Extended.Iconify.IonIcons/SkiaSharp.Extended.Iconify.IonIcons.csproj b/source/SkiaSharp.Extended.Iconify.IonIcons/SkiaSharp.Extended.Iconify.IonIcons.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...xtended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj b/...xtended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/.../SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj b/.../SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj
@@ -35,7 +35,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/source/SkiaSharp.Extended.Iconify.Meteocons/SkiaSharp.Extended.Iconify.Meteocons.csproj b/source/SkiaSharp.Extended.Iconify.Meteocons/SkiaSharp.Extended.Iconify.Meteocons.csproj
@@ -33,7 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...aSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj b/...aSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/source/SkiaSharp.Extended.Iconify.Typicons/SkiaSharp.Extended.Iconify.Typicons.csproj b/source/SkiaSharp.Extended.Iconify.Typicons/SkiaSharp.Extended.Iconify.Typicons.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ce/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj b/...ce/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj
@@ -35,7 +35,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj b/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj
@@ -5,8 +5,8 @@
     <AssemblyName>SkiaSharp.Extended.Iconify</AssemblyName>
     <RootNamespace>SkiaSharp.Extended.Iconify</RootNamespace>
     <AssemblyVersion>2.80.0.0</AssemblyVersion>
-    <AssemblyFileVersion>2.80.1.0</AssemblyFileVersion>
-    <Version>2.80.1</Version>
+    <AssemblyFileVersion>1.60.0.0</AssemblyFileVersion>
+    <Version>1.60.0</Version>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
     <NeutralLanguage>en</NeutralLanguage>
   </PropertyGroup>
@@ -28,7 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
   </ItemGroup>
 
 </Project>
diff --git a/source/SkiaSharp.Extended.Svg/SKSvg.cs b/source/SkiaSharp.Extended.Svg/SKSvg.cs
@@ -418,7 +418,7 @@ private SKPath ReadElement(XElement e, Dictionary<string, string> style = null)
 				case "rect":
 					var rect = ReadRoundedRect(e);
 					if (rect.IsRounded)
-						path.AddRoundRect(rect.Rect, rect.RadiusX, rect.RadiusY);
+						path.AddRoundedRect(rect.Rect, rect.RadiusX, rect.RadiusY);
 					else
 						path.AddRect(rect.Rect);
 					break;

diff --git a/source/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.csproj b/source/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.csproj
@@ -5,8 +5,8 @@
     <AssemblyName>SkiaSharp.Extended.Svg</AssemblyName>
     <RootNamespace>SkiaSharp.Extended.Svg</RootNamespace>
     <AssemblyVersion>2.80.0.0</AssemblyVersion>
-    <AssemblyFileVersion>2.80.1.0</AssemblyFileVersion>
-    <Version>2.80.1</Version>
+    <AssemblyFileVersion>1.60.0.0</AssemblyFileVersion>
+    <Version>1.60.0</Version>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
     <NeutralLanguage>en</NeutralLanguage>
     <KeyFileName>mono.snk</KeyFileName>
@@ -29,7 +29,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="2.80.1" />
+    <PackageReference Include="SkiaSharp" Version="1.60.0" />
   </ItemGroup>
 
 </Project>
diff --git a/source/source.sln b/source/source.sln
@@ -29,6 +29,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconifyGenerator", "Iconify
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{E546FFE2-58F6-4F5B-8EDB-15056F9810BA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated", "{E4E7DB00-7592-404B-A71C-611AC846702E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -338,6 +340,16 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{854B652B-685E-4147-BBA3-0E1DA85FDEE5} = {E4E7DB00-7592-404B-A71C-611AC846702E}
+		{941BC633-58F2-4D38-ACFA-DA4B381AC406} = {E4E7DB00-7592-404B-A71C-611AC846702E}
+		{C4320934-1A4F-4037-813F-5159C3FB97EE} = {E4E7DB00-7592-404B-A71C-611AC846702E}
+		{EE925218-F50F-40DE-8C2A-5065EAC76932} = {E4E7DB00-7592-404B-A71C-611AC846702E}
+		{AE75FEC5-5673-4351-B296-BE0BAEA1C090} = {E4E7DB00-7592-404B-A71C-611AC846702E}
+		{6370B6B2-A1F4-4A7C-A24F-D58E8DA7C47D} = {E4E7DB00-7592-404B-A71C-611AC846702E}
+		{836B21CF-10F0-4DB6-A437-BC43F15EAC86} = {E4E7DB00-7592-404B-A71C-611AC846702E}
+		{C55C8DD2-0CEF-4D71-A75D-F495F2ABAEE8} = {E4E7DB00-7592-404B-A71C-611AC846702E}
+		{91DF572A-CB40-4D5F-9F09-6244E60C7625} = {E4E7DB00-7592-404B-A71C-611AC846702E}
+		{4B690A05-D653-4CC5-A34E-CB4A6472729A} = {E4E7DB00-7592-404B-A71C-611AC846702E}
 		{8E2211C7-EA20-4670-98DB-0489D2127DAB} = {E546FFE2-58F6-4F5B-8EDB-15056F9810BA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution