From 282172a28c5e730c74a17655a33e6f4278051ba3 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 15 Aug 2020 02:44:36 +0200 Subject: [PATCH] Switch back to the older version of skia for some --- SkiaSharp.Extended.sln | 12 ++++++++++++ .../SkiaSharp.Extended.Iconify.FontAwesome.csproj | 2 +- .../SkiaSharp.Extended.Iconify.IonIcons.csproj | 2 +- ...Sharp.Extended.Iconify.MaterialDesignIcons.csproj | 2 +- .../SkiaSharp.Extended.Iconify.MaterialIcons.csproj | 2 +- .../SkiaSharp.Extended.Iconify.Meteocons.csproj | 2 +- ...SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj | 2 +- .../SkiaSharp.Extended.Iconify.Typicons.csproj | 2 +- .../SkiaSharp.Extended.Iconify.WeatherIcons.csproj | 2 +- .../SkiaSharp.Extended.Iconify.csproj | 6 +++--- source/SkiaSharp.Extended.Svg/SKSvg.cs | 2 +- .../SkiaSharp.Extended.Svg.csproj | 6 +++--- source/source.sln | 12 ++++++++++++ 13 files changed, 39 insertions(+), 15 deletions(-) diff --git a/SkiaSharp.Extended.sln b/SkiaSharp.Extended.sln index 8ecbba9f..6a166575 100644 --- 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 index 76b44037..7d65958e 100644 --- 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 @@ - + diff --git a/source/SkiaSharp.Extended.Iconify.IonIcons/SkiaSharp.Extended.Iconify.IonIcons.csproj b/source/SkiaSharp.Extended.Iconify.IonIcons/SkiaSharp.Extended.Iconify.IonIcons.csproj index 14cbb6b1..ecd5e6a4 100644 --- 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 @@ - + diff --git a/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj b/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj index 48c38e45..403e9d69 100644 --- a/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj +++ b/source/SkiaSharp.Extended.Iconify.MaterialDesignIcons/SkiaSharp.Extended.Iconify.MaterialDesignIcons.csproj @@ -34,7 +34,7 @@ - + diff --git a/source/SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj b/source/SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj index 70d3a45d..a2f52a6e 100644 --- a/source/SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj +++ b/source/SkiaSharp.Extended.Iconify.MaterialIcons/SkiaSharp.Extended.Iconify.MaterialIcons.csproj @@ -35,7 +35,7 @@ - + diff --git a/source/SkiaSharp.Extended.Iconify.Meteocons/SkiaSharp.Extended.Iconify.Meteocons.csproj b/source/SkiaSharp.Extended.Iconify.Meteocons/SkiaSharp.Extended.Iconify.Meteocons.csproj index 67cc8349..e7b518b0 100644 --- 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 @@ - + diff --git a/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj b/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj index 91ea3b8e..fdf843aa 100644 --- a/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj +++ b/source/SkiaSharp.Extended.Iconify.SimpleLineIcons/SkiaSharp.Extended.Iconify.SimpleLineIcons.csproj @@ -34,7 +34,7 @@ - + diff --git a/source/SkiaSharp.Extended.Iconify.Typicons/SkiaSharp.Extended.Iconify.Typicons.csproj b/source/SkiaSharp.Extended.Iconify.Typicons/SkiaSharp.Extended.Iconify.Typicons.csproj index 0be02e1d..7b00e398 100644 --- 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 @@ - + diff --git a/source/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj b/source/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj index 4736b4a4..e71e5e8a 100644 --- a/source/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj +++ b/source/SkiaSharp.Extended.Iconify.WeatherIcons/SkiaSharp.Extended.Iconify.WeatherIcons.csproj @@ -35,7 +35,7 @@ - + diff --git a/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj b/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj index 62230d9a..3a9074ce 100644 --- a/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj +++ b/source/SkiaSharp.Extended.Iconify/SkiaSharp.Extended.Iconify.csproj @@ -5,8 +5,8 @@ SkiaSharp.Extended.Iconify SkiaSharp.Extended.Iconify 2.80.0.0 - 2.80.1.0 - 2.80.1 + 1.60.0.0 + 1.60.0 $(AssemblyName) ($(TargetFramework)) en @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/source/SkiaSharp.Extended.Svg/SKSvg.cs b/source/SkiaSharp.Extended.Svg/SKSvg.cs index 8e03e3bd..4b6c472f 100644 --- a/source/SkiaSharp.Extended.Svg/SKSvg.cs +++ b/source/SkiaSharp.Extended.Svg/SKSvg.cs @@ -418,7 +418,7 @@ private SKPath ReadElement(XElement e, Dictionary 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 index 7bfda456..013be06e 100644 --- a/source/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.csproj +++ b/source/SkiaSharp.Extended.Svg/SkiaSharp.Extended.Svg.csproj @@ -5,8 +5,8 @@ SkiaSharp.Extended.Svg SkiaSharp.Extended.Svg 2.80.0.0 - 2.80.1.0 - 2.80.1 + 1.60.0.0 + 1.60.0 $(AssemblyName) ($(TargetFramework)) en mono.snk @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/source/source.sln b/source/source.sln index d94743f1..2326f237 100644 --- 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