diff --git a/binding/Directory.Build.props b/binding/Directory.Build.props new file mode 100644 index 00000000..5ac71a8c --- /dev/null +++ b/binding/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + false + + + + + \ No newline at end of file diff --git a/binding/Directory.Build.targets b/binding/Directory.Build.targets new file mode 100644 index 00000000..95a27fb0 --- /dev/null +++ b/binding/Directory.Build.targets @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj index 6bade475..a7cc0b57 100644 --- a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj +++ b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj @@ -1,25 +1,12 @@ - - + monoandroid9.0 - library HarfBuzzSharp HarfBuzzSharp HarfBuzzSharp - MonoAndroid + monoandroid1.0 $(DefineConstants);HARFBUZZ - True - - full - - - pdbonly - - - - - @@ -30,6 +17,4 @@ - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.Android/Properties/AssemblyInfo.cs b/binding/HarfBuzzSharp.Android/Properties/AssemblyInfo.cs deleted file mode 100644 index e69de29b..00000000 diff --git a/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj b/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj deleted file mode 100644 index bb71f213..00000000 --- a/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - net45 - library - HarfBuzzSharp - HarfBuzzSharp - HarfBuzzSharp - net45 - $(DefineConstants);__DESKTOP__;HARFBUZZ - True - - - full - - - pdbonly - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.Desktop/Properties/AssemblyInfo.cs b/binding/HarfBuzzSharp.Desktop/Properties/AssemblyInfo.cs deleted file mode 100644 index e69de29b..00000000 diff --git a/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj b/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj deleted file mode 100644 index aea3af6c..00000000 --- a/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - netstandard1.3 - library - HarfBuzzSharp - HarfBuzzSharp - HarfBuzzSharp - netstandard1.3 - $(DefineConstants);HARFBUZZ;NET_STANDARD - True - - - full - - - pdbonly - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj index de7e8393..8814edd2 100644 --- a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj +++ b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj @@ -1,29 +1,12 @@ - - + xamarinmac2.0 - library HarfBuzzSharp HarfBuzzSharp HarfBuzzSharp - Xamarin.Mac20 $(DefineConstants);HARFBUZZ;__MACOS__ - True - true - false + true - - full - - - pdbonly - - - - - - - @@ -34,6 +17,4 @@ - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj b/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj index 1979f173..222a8f1d 100644 --- a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj +++ b/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj @@ -1,37 +1,23 @@ - - + tizen40 - library HarfBuzzSharp HarfBuzzSharp False false HarfBuzzSharp - tizen40 $(DefineConstants);HARFBUZZ;__TIZEN__; - true - - - full - - - pdbonly - - - + - - diff --git a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj index 355e7fe7..9919d3a0 100644 --- a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj +++ b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj @@ -1,24 +1,12 @@ - - + - uap10.0.10240 - library + uap10.0.10240;uap10.0.16299 HarfBuzzSharp HarfBuzzSharp HarfBuzzSharp - uap10.0 $(DefineConstants);NET_STANDARD;HARFBUZZ - True - - - full - - - pdbonly - - @@ -30,6 +18,4 @@ - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.UWP/Properties/AssemblyInfo.cs b/binding/HarfBuzzSharp.UWP/Properties/AssemblyInfo.cs deleted file mode 100644 index e69de29b..00000000 diff --git a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj index d288fda4..91f2aa8b 100644 --- a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj +++ b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj @@ -1,29 +1,12 @@ - - + xamarinios1.0 - library HarfBuzzSharp HarfBuzzSharp HarfBuzzSharp - Xamarin.iOS $(DefineConstants);HARFBUZZ - True - true - false + true - - full - - - pdbonly - - - - - - - @@ -34,6 +17,4 @@ - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.sln b/binding/HarfBuzzSharp.sln index 224a3a29..ba854db3 100644 --- a/binding/HarfBuzzSharp.sln +++ b/binding/HarfBuzzSharp.sln @@ -1,25 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.13 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29515.35 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Desktop", "HarfBuzzSharp.Desktop\HarfBuzzSharp.Desktop.csproj", "{2AE5D8C5-EAC6-4515-89F2-A4994B41C925}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.OSX", "HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.OSX", "HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.iOS", "HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{E8192110-FCF9-4972-9472-7408BC2CA56B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.iOS", "HarfBuzzSharp.iOS\HarfBuzzSharp.iOS.csproj", "{E8192110-FCF9-4972-9472-7408BC2CA56B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.tvOS", "HarfBuzzSharp.tvOS\HarfBuzzSharp.tvOS.csproj", "{8D646738-458A-441F-B69B-253EF058A812}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.tvOS", "HarfBuzzSharp.tvOS\HarfBuzzSharp.tvOS.csproj", "{8D646738-458A-441F-B69B-253EF058A812}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.watchOS", "HarfBuzzSharp.watchOS\HarfBuzzSharp.watchOS.csproj", "{0C940695-4868-4CF7-7D16-266BDD88A812}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.watchOS", "HarfBuzzSharp.watchOS\HarfBuzzSharp.watchOS.csproj", "{0C940695-4868-4CF7-7D16-266BDD88A812}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Android", "HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "HarfBuzzSharp\HarfBuzzSharp.csproj", "{9B6AABD6-65BD-467E-9DFA-FCC261525B48}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{9B6AABD6-65BD-467E-9DFA-FCC261525B48}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.UWP", "HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.Tizen", "HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{D0CBD4FC-4329-4D79-959B-47FDCFAE2869}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Tizen", "HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{D0CBD4FC-4329-4D79-959B-47FDCFAE2869}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -27,10 +25,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2AE5D8C5-EAC6-4515-89F2-A4994B41C925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2AE5D8C5-EAC6-4515-89F2-A4994B41C925}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2AE5D8C5-EAC6-4515-89F2-A4994B41C925}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2AE5D8C5-EAC6-4515-89F2-A4994B41C925}.Release|Any CPU.Build.0 = Release|Any CPU {30952C22-D566-488F-9D7A-2411B027D6CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {30952C22-D566-488F-9D7A-2411B027D6CA}.Debug|Any CPU.Build.0 = Debug|Any CPU {30952C22-D566-488F-9D7A-2411B027D6CA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -67,4 +61,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {675DCAD3-0B5E-47EE-A0A9-5ED940B8B0AE} + EndGlobalSection EndGlobal diff --git a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj index b7a750f9..0fb95861 100644 --- a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj +++ b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj @@ -1,29 +1,12 @@ - - + xamarintvos1.0 - library HarfBuzzSharp HarfBuzzSharp HarfBuzzSharp - Xamarin.TVOS $(DefineConstants);HARFBUZZ - True - true - false + true - - full - - - pdbonly - - - - - - - @@ -34,6 +17,4 @@ - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj index 22d1b94a..d91e0f79 100644 --- a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj +++ b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj @@ -1,29 +1,12 @@ - - + xamarinwatchos1.0 - library HarfBuzzSharp HarfBuzzSharp HarfBuzzSharp - Xamarin.WatchOS $(DefineConstants);HARFBUZZ - True - true - false + true - - full - - - pdbonly - - - - - - - @@ -34,6 +17,4 @@ - - \ No newline at end of file diff --git a/binding/HarfBuzzSharp/HarfBuzzSharp.csproj b/binding/HarfBuzzSharp/HarfBuzzSharp.csproj new file mode 100644 index 00000000..05fdf2bd --- /dev/null +++ b/binding/HarfBuzzSharp/HarfBuzzSharp.csproj @@ -0,0 +1,42 @@ + + + netstandard1.3;netstandard2.0;net45 + HarfBuzzSharp + HarfBuzzSharp + HarfBuzzSharp + $(DefineConstants);HARFBUZZ + + + $(DefineConstants);NET_STANDARD + + + $(DefineConstants);__DESKTOP__ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/binding/HarfBuzzSharp.Desktop/nuget/build/net45/HarfBuzzSharp.dll.config b/binding/HarfBuzzSharp/nuget/build/net45/HarfBuzzSharp.dll.config similarity index 100% rename from binding/HarfBuzzSharp.Desktop/nuget/build/net45/HarfBuzzSharp.dll.config rename to binding/HarfBuzzSharp/nuget/build/net45/HarfBuzzSharp.dll.config diff --git a/binding/HarfBuzzSharp.Desktop/nuget/build/net45/HarfBuzzSharp.targets b/binding/HarfBuzzSharp/nuget/build/net45/HarfBuzzSharp.targets similarity index 100% rename from binding/HarfBuzzSharp.Desktop/nuget/build/net45/HarfBuzzSharp.targets rename to binding/HarfBuzzSharp/nuget/build/net45/HarfBuzzSharp.targets diff --git a/binding/SkiaSharp.Android/Properties/AssemblyInfo.cs b/binding/SkiaSharp.Android/Properties/AssemblyInfo.cs deleted file mode 100644 index e02abfc9..00000000 --- a/binding/SkiaSharp.Android/Properties/AssemblyInfo.cs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj index 183c5fa4..06bd88f2 100644 --- a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj +++ b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj @@ -1,25 +1,11 @@ - - + monoandroid9.0 - library SkiaSharp SkiaSharp SkiaSharp - MonoAndroid - $(DefineConstants); - True + monoandroid1.0 - - full - - - pdbonly - - - - - @@ -30,6 +16,4 @@ - - \ No newline at end of file diff --git a/binding/SkiaSharp.Desktop/Properties/AssemblyInfo.cs b/binding/SkiaSharp.Desktop/Properties/AssemblyInfo.cs deleted file mode 100644 index e69de29b..00000000 diff --git a/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj b/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj deleted file mode 100644 index 718e604e..00000000 --- a/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - net45 - library - SkiaSharp - SkiaSharp - SkiaSharp - net45 - $(DefineConstants);__DESKTOP__ - True - - - full - - - pdbonly - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/SkiaSharp.NetStandard/Properties/AssemblyInfo.cs b/binding/SkiaSharp.NetStandard/Properties/AssemblyInfo.cs deleted file mode 100644 index e69de29b..00000000 diff --git a/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj b/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj deleted file mode 100644 index 843daf35..00000000 --- a/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - netstandard1.3 - library - SkiaSharp - SkiaSharp - SkiaSharp - netstandard1.3 - $(DefineConstants);NET_STANDARD - True - - - full - - - pdbonly - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj index 5699ade5..481bc76c 100644 --- a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj +++ b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj @@ -1,29 +1,12 @@ - - + xamarinmac2.0 - library SkiaSharp SkiaSharp SkiaSharp - Xamarin.Mac20 $(DefineConstants);__MACOS__ - True - true - false + true - - full - - - pdbonly - - - - - - - @@ -34,6 +17,4 @@ - - \ No newline at end of file diff --git a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj b/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj index 8964528d..24ab7c89 100644 --- a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj +++ b/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj @@ -1,38 +1,23 @@ - - + tizen40 - library SkiaSharp SkiaSharp False false SkiaSharp - tizen40 $(DefineConstants);__TIZEN__; - True - - - full - - - pdbonly - - - - + - - diff --git a/binding/SkiaSharp.UWP/Properties/AssemblyInfo.cs b/binding/SkiaSharp.UWP/Properties/AssemblyInfo.cs deleted file mode 100644 index e69de29b..00000000 diff --git a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj index ca38996b..8b3ecec4 100644 --- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj +++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj @@ -1,24 +1,12 @@ - - + - uap10.0.10240 - library + uap10.0.10240;uap10.0.16299 SkiaSharp SkiaSharp SkiaSharp - uap10.0 $(DefineConstants);NET_STANDARD - True - - - full - - - pdbonly - - @@ -36,6 +24,4 @@ - - \ No newline at end of file diff --git a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj index ff170943..39cdf9ba 100644 --- a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj +++ b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj @@ -1,29 +1,11 @@ - - + xamarinios1.0 - library SkiaSharp SkiaSharp SkiaSharp - Xamarin.iOS - $(DefineConstants); - True - true - false + true - - full - - - pdbonly - - - - - - - @@ -34,6 +16,4 @@ - - \ No newline at end of file diff --git a/binding/SkiaSharp.sln b/binding/SkiaSharp.sln index 9c1b4d05..ced5c897 100644 --- a/binding/SkiaSharp.sln +++ b/binding/SkiaSharp.sln @@ -1,25 +1,23 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.13 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29515.35 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Android", "SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Android", "SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.iOS", "SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.tvOS", "SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.tvOS", "SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.watchOS", "SkiaSharp.watchOS\SkiaSharp.watchOS.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.watchOS", "SkiaSharp.watchOS\SkiaSharp.watchOS.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.OSX", "SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Desktop", "SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.UWP", "SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Tizen", "SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{A48813C8-9C4A-477F-A34C-FCAFFE751037}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Tizen", "SkiaSharp.Tizen\SkiaSharp.Tizen.csproj", "{A48813C8-9C4A-477F-A34C-FCAFFE751037}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -47,10 +45,6 @@ Global {4588A759-3853-49B8-8A68-6C7917BE9220}.Debug|Any CPU.Build.0 = Debug|Any CPU {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.ActiveCfg = Release|Any CPU {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|Any CPU.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -67,4 +61,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {43994D8B-018E-4297-B592-6BEDC30E542A} + EndGlobalSection EndGlobal diff --git a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj index 97ccd570..2c9b39da 100644 --- a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj +++ b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj @@ -1,29 +1,11 @@ - - + xamarintvos1.0 - library SkiaSharp SkiaSharp SkiaSharp - Xamarin.TVOS - $(DefineConstants); - True - true - false + true - - full - - - pdbonly - - - - - - - @@ -34,6 +16,4 @@ - - \ No newline at end of file diff --git a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj index cc59ae38..978b1579 100644 --- a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj +++ b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj @@ -1,29 +1,11 @@ - - + xamarinwatchos1.0 - library SkiaSharp SkiaSharp SkiaSharp - Xamarin.WatchOS - $(DefineConstants); - True - true - false + true - - full - - - pdbonly - - - - - - - @@ -34,6 +16,4 @@ - - \ No newline at end of file diff --git a/binding/SkiaSharp/SkiaSharp.csproj b/binding/SkiaSharp/SkiaSharp.csproj new file mode 100644 index 00000000..dad05a07 --- /dev/null +++ b/binding/SkiaSharp/SkiaSharp.csproj @@ -0,0 +1,41 @@ + + + netstandard1.3;netstandard2.0;net45 + SkiaSharp + SkiaSharp + SkiaSharp + + + $(DefineConstants);NET_STANDARD + + + $(DefineConstants);__DESKTOP__ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/binding/SkiaSharp.Desktop/nuget/build/net45/SkiaSharp.dll.config b/binding/SkiaSharp/nuget/build/net45/SkiaSharp.dll.config similarity index 100% rename from binding/SkiaSharp.Desktop/nuget/build/net45/SkiaSharp.dll.config rename to binding/SkiaSharp/nuget/build/net45/SkiaSharp.dll.config diff --git a/binding/SkiaSharp.Desktop/nuget/build/net45/SkiaSharp.targets b/binding/SkiaSharp/nuget/build/net45/SkiaSharp.targets similarity index 100% rename from binding/SkiaSharp.Desktop/nuget/build/net45/SkiaSharp.targets rename to binding/SkiaSharp/nuget/build/net45/SkiaSharp.targets diff --git a/cake/msbuild.cake b/cake/msbuild.cake index 3dff2130..077278d8 100644 --- a/cake/msbuild.cake +++ b/cake/msbuild.cake @@ -16,7 +16,6 @@ void RunMSBuild( c.Configuration = CONFIGURATION; c.Verbosity = VERBOSITY; c.MaxCpuCount = 0; - c.ToolVersion = MSBuildToolVersion.VS2017; c.NoLogo = VERBOSITY == Verbosity.Minimal; diff --git a/externals/depot_tools b/externals/depot_tools index f170af48..44134341 160000 --- a/externals/depot_tools +++ b/externals/depot_tools @@ -1 +1 @@ -Subproject commit f170af48e4490633334a300bbcb65d50fab09537 +Subproject commit 44134341fa8b46e83bad3bef48a8bc6badaa3083 diff --git a/global.json b/global.json deleted file mode 100644 index ef5e076f..00000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "2.2.108.1" - } -} \ No newline at end of file diff --git a/nuget/HarfbuzzSharp.nuspec b/nuget/HarfbuzzSharp.nuspec index 20ab83a0..2af31ef1 100644 --- a/nuget/HarfbuzzSharp.nuspec +++ b/nuget/HarfbuzzSharp.nuspec @@ -35,23 +35,22 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - + - + + + + + + + + + - - - - - - - - - + @@ -67,18 +66,22 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/nuget/SkiaSharp.HarfBuzz.nuspec b/nuget/SkiaSharp.HarfBuzz.nuspec index 49a5be32..92801884 100644 --- a/nuget/SkiaSharp.HarfBuzz.nuspec +++ b/nuget/SkiaSharp.HarfBuzz.nuspec @@ -37,6 +37,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release + + diff --git a/nuget/SkiaSharp.Views.Desktop.Common.nuspec b/nuget/SkiaSharp.Views.Desktop.Common.nuspec index 095ecdca..4c9c434a 100644 --- a/nuget/SkiaSharp.Views.Desktop.Common.nuspec +++ b/nuget/SkiaSharp.Views.Desktop.Common.nuspec @@ -36,6 +36,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release + + diff --git a/nuget/SkiaSharp.Views.Forms.nuspec b/nuget/SkiaSharp.Views.Forms.nuspec index 1e605c34..310f5cda 100644 --- a/nuget/SkiaSharp.Views.Forms.nuspec +++ b/nuget/SkiaSharp.Views.Forms.nuspec @@ -31,17 +31,21 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + + + + + - + - + @@ -68,23 +72,25 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release + + - - - - - - + + + + + + - - - + + + diff --git a/nuget/SkiaSharp.Views.WPF.nuspec b/nuget/SkiaSharp.Views.WPF.nuspec index 9fc5b36e..482b3083 100644 --- a/nuget/SkiaSharp.Views.WPF.nuspec +++ b/nuget/SkiaSharp.Views.WPF.nuspec @@ -35,6 +35,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release + + diff --git a/nuget/SkiaSharp.Views.nuspec b/nuget/SkiaSharp.Views.nuspec index 3034c9b0..f046e0c1 100644 --- a/nuget/SkiaSharp.Views.nuspec +++ b/nuget/SkiaSharp.Views.nuspec @@ -40,19 +40,19 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + - + - + - + - + @@ -68,16 +68,16 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - - - - - - - - + + + + + + + + + + diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec index 244ca52e..772c9a7b 100644 --- a/nuget/SkiaSharp.nuspec +++ b/nuget/SkiaSharp.nuspec @@ -36,23 +36,22 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - + - + + + + + + + + + - - - - - - - - - + @@ -68,18 +67,22 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/samples/Basic/Desktop/SkiaSharpSample.sln b/samples/Basic/Desktop/SkiaSharpSample.sln index 7bca90c5..de089a70 100644 --- a/samples/Basic/Desktop/SkiaSharpSample.sln +++ b/samples/Basic/Desktop/SkiaSharpSample.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29027.242 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{3214B4BB-D4AD-450F-8296-2905B6CDEFF0}" EndProject diff --git a/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj index 421ba320..d9819310 100644 --- a/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Desktop/SkiaSharpSample/SkiaSharpSample.csproj @@ -54,9 +54,9 @@ - + {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} - SkiaSharp.Desktop + SkiaSharp {92e862c2-e514-4a6d-8970-2caba41aa6ff} diff --git a/samples/Basic/Gtk/SkiaSharpSample.sln b/samples/Basic/Gtk/SkiaSharpSample.sln index c3055fa2..2f543add 100644 --- a/samples/Basic/Gtk/SkiaSharpSample.sln +++ b/samples/Basic/Gtk/SkiaSharpSample.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29027.242 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Gtk\SkiaSharp.Views.Gtk.csproj", "{67A502A4-E8B2-419A-811E-5A634B29C8D7}" EndProject diff --git a/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj index 3ffa307c..13d61517 100644 --- a/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Gtk/SkiaSharpSample/SkiaSharpSample.csproj @@ -34,9 +34,9 @@ - + {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF} - SkiaSharp.Desktop + SkiaSharp {72b681c2-9ade-4b5e-a58c-c1c4b891cf32} diff --git a/samples/Basic/Gtk3/SkiaSharpSample.sln b/samples/Basic/Gtk3/SkiaSharpSample.sln index 79e68a49..58c91483 100644 --- a/samples/Basic/Gtk3/SkiaSharpSample.sln +++ b/samples/Basic/Gtk3/SkiaSharpSample.sln @@ -7,9 +7,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample", "SkiaShar EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk3", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Gtk3\SkiaSharp.Views.Gtk3.csproj", "{2B61CADD-5110-4C24-8FC3-F8193CAC6E05}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{BCC88311-00BF-4B15-950E-97CE788E9405}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{BCC88311-00BF-4B15-950E-97CE788E9405}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Common.NetStandard", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop.Common.NetStandard\SkiaSharp.Views.Desktop.Common.NetStandard.csproj", "{7BC63477-982F-41E4-AA08-DC81F0E82544}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Common", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj", "{7BC63477-982F-41E4-AA08-DC81F0E82544}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj index eafc8b78..f48f661e 100644 --- a/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Gtk3/SkiaSharpSample/SkiaSharpSample.csproj @@ -15,8 +15,8 @@ - - + + diff --git a/samples/Basic/NetCore/SkiaSharpSample.sln b/samples/Basic/NetCore/SkiaSharpSample.sln index fbc64c97..b22341df 100644 --- a/samples/Basic/NetCore/SkiaSharpSample.sln +++ b/samples/Basic/NetCore/SkiaSharpSample.sln @@ -4,7 +4,7 @@ VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{B6D1B569-6ED2-4C9D-9CD3-64ACB89303EA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{ADEB6908-D553-4ED3-94CD-CEC4CF0B34E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{ADEB6908-D553-4ED3-94CD-CEC4CF0B34E2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/Basic/NetCore/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/NetCore/SkiaSharpSample/SkiaSharpSample.csproj index 13f4d642..d678eac8 100644 --- a/samples/Basic/NetCore/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/NetCore/SkiaSharpSample/SkiaSharpSample.csproj @@ -6,7 +6,7 @@ - + diff --git a/samples/Basic/WPF/SkiaSharpSample.sln b/samples/Basic/WPF/SkiaSharpSample.sln index 14ca5119..f80218c4 100644 --- a/samples/Basic/WPF/SkiaSharpSample.sln +++ b/samples/Basic/WPF/SkiaSharpSample.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29027.242 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj", "{743CF830-D458-41A9-865A-F85126562015}" EndProject diff --git a/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj index 432ab74f..bc3bca19 100644 --- a/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -56,9 +56,9 @@ - + {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} - SkiaSharp.Desktop + SkiaSharp {3f9f1fbe-3e06-47a2-ac7e-5e0c6ff70c29} diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Linux.sln b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Linux.sln index 5d976fae..71887d8a 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Linux.sln +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Linux.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2024 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}" EndProject @@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Tizen", ".. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Tizen", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Tizen\SkiaSharp.Views.Forms.Tizen.csproj", "{CB4BF122-0676-4487-A95D-3BA9E3CD6049}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Desktop", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop\SkiaSharp.Views.Desktop.csproj", "{E5A90865-C185-45AD-88D1-6DA7D6004B03}" EndProject Global @@ -231,30 +229,6 @@ Global {CB4BF122-0676-4487-A95D-3BA9E3CD6049}.Release|x64.Build.0 = Release|Any CPU {CB4BF122-0676-4487-A95D-3BA9E3CD6049}.Release|x86.ActiveCfg = Release|Any CPU {CB4BF122-0676-4487-A95D-3BA9E3CD6049}.Release|x86.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|ARM.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhone.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|ARM.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|ARM.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhone.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhone.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.Build.0 = Release|Any CPU {E5A90865-C185-45AD-88D1-6DA7D6004B03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E5A90865-C185-45AD-88D1-6DA7D6004B03}.Debug|Any CPU.Build.0 = Debug|Any CPU {E5A90865-C185-45AD-88D1-6DA7D6004B03}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Mac.sln b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Mac.sln index ada5bfaf..0afb9b79 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Mac.sln +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Mac.sln @@ -9,9 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.iOS", "..\..\..\b EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Mac", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Mac\SkiaSharp.Views.Mac.csproj", "{809A15DC-E675-4A24-83FA-DF13160F7E4C}" EndProject @@ -93,18 +91,6 @@ Global {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhone.Build.0 = Release|Any CPU {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhone.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhone.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhone.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {4E0924F8-D546-4428-9412-4B9411FBA5FF}.Debug|iPhone.ActiveCfg = Debug|Any CPU diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj index 82433801..54bbe56e 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.WPF/SkiaSharpSample.WPF.csproj @@ -55,9 +55,9 @@ - + {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} - SkiaSharp.Desktop + SkiaSharp {e5a90865-c185-45ad-88d1-6da7d6004b03} diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Windows.sln b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Windows.sln index e5654297..84a0593e 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Windows.sln +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Windows.sln @@ -7,13 +7,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.UWP", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.UWP\SkiaSharp.Views.UWP.csproj", "{8BB20362-91A2-4206-944D-634070EAC6F3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj", "{743CF830-D458-41A9-865A-F85126562015}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}" EndProject @@ -89,22 +87,6 @@ Global {8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x64.Build.0 = Release|Any CPU {8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x86.ActiveCfg = Release|Any CPU {8BB20362-91A2-4206-944D-634070EAC6F3}.Release|x86.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|ARM.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|ARM.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|ARM.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.Build.0 = Release|Any CPU {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 0e0e8266..44614f07 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -21,7 +21,6 @@ prompt 4 false - Mac Developer false false false diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.sln b/samples/Basic/Xamarin.Forms/SkiaSharpSample.sln index 4b7f5e80..8fe4446f 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.sln +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.sln @@ -23,13 +23,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.iOS", "..\..\..\b EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj", "{743CF830-D458-41A9-865A-F85126562015}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Mac", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Mac\SkiaSharp.Views.Forms.Mac.csproj", "{DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}" EndProject @@ -319,30 +317,6 @@ Global {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x64.Build.0 = Release|Any CPU {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x86.ActiveCfg = Release|Any CPU {4588A759-3853-49B8-8A68-6C7917BE9220}.Release|x86.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|ARM.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|ARM.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhone.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x64.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.ActiveCfg = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Debug|x86.Build.0 = Debug|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|Any CPU.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|ARM.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|ARM.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhone.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhone.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x64.Build.0 = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.ActiveCfg = Release|Any CPU - {EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}.Release|x86.Build.0 = Release|Any CPU {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|Any CPU.Build.0 = Debug|Any CPU {BAB615AA-956E-4079-B260-DD7B1F52EC7D}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj index fb9f0ea1..7e3ceeee 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample/SkiaSharpSample.csproj @@ -9,7 +9,7 @@ - + diff --git a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj index 9842563b..ed393ac9 100644 --- a/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -21,7 +21,6 @@ prompt 4 false - Mac Developer false false false diff --git a/samples/Gallery/Desktop/SkiaSharpSample.sln b/samples/Gallery/Desktop/SkiaSharpSample.sln index c6b0e15a..bce2d50c 100644 --- a/samples/Gallery/Desktop/SkiaSharpSample.sln +++ b/samples/Gallery/Desktop/SkiaSharpSample.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29027.242 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Desktop", "..\..\..\binding\HarfBuzzSharp.Desktop\HarfBuzzSharp.Desktop.csproj", "{2AE5D8C5-EAC6-4515-89F2-A4994B41C925}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{2AE5D8C5-EAC6-4515-89F2-A4994B41C925}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.Desktop", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Desktop\SkiaSharp.HarfBuzz.Desktop.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{F9B5AA70-AA4E-438D-A48E-CF5B638E55A8}" EndProject diff --git a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj index 09362b76..758f2164 100644 --- a/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/Desktop/SkiaSharpSample/SkiaSharpSample.csproj @@ -89,17 +89,17 @@ - + {2ae5d8c5-eac6-4515-89f2-a4994b41c925} - HarfBuzzSharp.Desktop + HarfBuzzSharp - + {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} - SkiaSharp.Desktop + SkiaSharp - + {233220cc-f0f3-4c44-9736-ed2cfc363fd3} - SkiaSharp.HarfBuzz.Desktop + SkiaSharp.HarfBuzz {6d71fecc-a676-4942-ad04-776f24be3ea2} diff --git a/samples/Gallery/UWP/SkiaSharpSample.sln b/samples/Gallery/UWP/SkiaSharpSample.sln index ddc3ddd0..8e5c625d 100644 --- a/samples/Gallery/UWP/SkiaSharpSample.sln +++ b/samples/Gallery/UWP/SkiaSharpSample.sln @@ -13,9 +13,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.UWP", "..\..\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{BFC6B190-A17C-4538-B2C6-EEDA46D87EFE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{083CAE88-1CB4-4D59-AB34-7BA1665140E6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{083CAE88-1CB4-4D59-AB34-7BA1665140E6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{7B8EC15C-BC89-4A83-8FFB-15F19EBCA66C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{7B8EC15C-BC89-4A83-8FFB-15F19EBCA66C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj index e1fd3b4c..918c6a0f 100644 --- a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -119,10 +119,10 @@ - + Windows Desktop Extensions for the UWP - + Windows Mobile Extensions for the UWP diff --git a/samples/Gallery/WPF/SkiaSharpSample.sln b/samples/Gallery/WPF/SkiaSharpSample.sln index 0b845ec4..84b159ce 100644 --- a/samples/Gallery/WPF/SkiaSharpSample.sln +++ b/samples/Gallery/WPF/SkiaSharpSample.sln @@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29027.242 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{EB1BBDCC-FB07-40D5-8B9E-0079E2C2F2DF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj", "{743CF830-D458-41A9-865A-F85126562015}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Desktop", "..\..\..\binding\HarfBuzzSharp.Desktop\HarfBuzzSharp.Desktop.csproj", "{2AE5D8C5-EAC6-4515-89F2-A4994B41C925}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{2AE5D8C5-EAC6-4515-89F2-A4994B41C925}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharpSample", "SkiaSharpSample\SkiaSharpSample.csproj", "{74178C7C-19A0-45E6-8EFB-F4DB7EE37C6F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.Desktop", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Desktop\SkiaSharp.HarfBuzz.Desktop.csproj", "{156FADFB-602E-4658-A235-D4D24CD46F09}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{156FADFB-602E-4658-A235-D4D24CD46F09}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Common", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj", "{D52BB2A5-9B68-4A89-B221-2A4EC7DA01F9}" EndProject diff --git a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj index fe00690d..45d2007b 100644 --- a/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/WPF/SkiaSharpSample/SkiaSharpSample.csproj @@ -97,17 +97,17 @@ - + {2ae5d8c5-eac6-4515-89f2-a4994b41c925} - HarfBuzzSharp.Desktop + HarfBuzzSharp - + {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} - SkiaSharp.Desktop + SkiaSharp - + {156fadfb-602e-4658-a235-d4d24cd46f09} - SkiaSharp.HarfBuzz.Desktop + SkiaSharp.HarfBuzz {d52bb2a5-9b68-4a89-b221-2a4ec7da01f9} diff --git a/samples/Gallery/Xamarin.Forms/Core/Core.csproj b/samples/Gallery/Xamarin.Forms/Core/Core.csproj index c2733b3f..6ac84c28 100644 --- a/samples/Gallery/Xamarin.Forms/Core/Core.csproj +++ b/samples/Gallery/Xamarin.Forms/Core/Core.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj index fc543d55..43a62551 100644 --- a/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj +++ b/samples/Gallery/Xamarin.Forms/Mac/Mac.csproj @@ -21,7 +21,6 @@ prompt 4 false - Mac Developer false false false diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln index 98760107..8067987b 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Linux.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2024 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj", "{99411A8A-1F8C-469C-AC10-E72F28EDB376}" EndProject diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln index 17dedf1d..652796ed 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Mac.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2010 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.OSX", "..\..\..\binding\HarfBuzzSharp.OSX\HarfBuzzSharp.OSX.csproj", "{30952C22-D566-488F-9D7A-2411B027D6CA}" EndProject @@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.iOS", "..\..\..\b EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.OSX", "..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj", "{4588A759-3853-49B8-8A68-6C7917BE9220}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln index 5b1f3811..1baaa074 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.Windows.sln @@ -9,9 +9,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.UWP", "..\. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject @@ -35,12 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", ".. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF", "WPF\WPF.csproj", "{748981C3-5D0F-462A-9F56-A3C6D792ED30}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Desktop", "..\..\..\binding\HarfBuzzSharp.Desktop\HarfBuzzSharp.Desktop.csproj", "{6A23B204-8B69-4632-9568-7A5E0B228B90}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{2CB94CB0-6694-481C-896B-689E479BD52C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz.Desktop", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Desktop\SkiaSharp.HarfBuzz.Desktop.csproj", "{FA74C7D4-2B7F-4C60-9E6D-D903F7861878}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Desktop.Common", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.Desktop.Common\SkiaSharp.Views.Desktop.Common.csproj", "{28299971-B249-427B-ADDB-61B46637F343}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "..\..\..\source\SkiaSharp.Views\SkiaSharp.Views.WPF\SkiaSharp.Views.WPF.csproj", "{C26AFF96-4F0F-4164-9F66-075B9C5CE4EF}" @@ -333,54 +327,6 @@ Global {748981C3-5D0F-462A-9F56-A3C6D792ED30}.Release|x64.Build.0 = Release|Any CPU {748981C3-5D0F-462A-9F56-A3C6D792ED30}.Release|x86.ActiveCfg = Release|Any CPU {748981C3-5D0F-462A-9F56-A3C6D792ED30}.Release|x86.Build.0 = Release|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Debug|ARM.Build.0 = Debug|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Debug|x64.ActiveCfg = Debug|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Debug|x64.Build.0 = Debug|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Debug|x86.ActiveCfg = Debug|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Debug|x86.Build.0 = Debug|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Release|Any CPU.Build.0 = Release|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Release|ARM.ActiveCfg = Release|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Release|ARM.Build.0 = Release|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Release|x64.ActiveCfg = Release|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Release|x64.Build.0 = Release|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Release|x86.ActiveCfg = Release|Any CPU - {6A23B204-8B69-4632-9568-7A5E0B228B90}.Release|x86.Build.0 = Release|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Debug|ARM.Build.0 = Debug|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Debug|x64.ActiveCfg = Debug|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Debug|x64.Build.0 = Debug|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Debug|x86.ActiveCfg = Debug|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Debug|x86.Build.0 = Debug|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Release|Any CPU.Build.0 = Release|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Release|ARM.ActiveCfg = Release|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Release|ARM.Build.0 = Release|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Release|x64.ActiveCfg = Release|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Release|x64.Build.0 = Release|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Release|x86.ActiveCfg = Release|Any CPU - {2CB94CB0-6694-481C-896B-689E479BD52C}.Release|x86.Build.0 = Release|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Debug|ARM.ActiveCfg = Debug|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Debug|ARM.Build.0 = Debug|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Debug|x64.ActiveCfg = Debug|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Debug|x64.Build.0 = Debug|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Debug|x86.ActiveCfg = Debug|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Debug|x86.Build.0 = Debug|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Release|Any CPU.Build.0 = Release|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Release|ARM.ActiveCfg = Release|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Release|ARM.Build.0 = Release|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Release|x64.ActiveCfg = Release|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Release|x64.Build.0 = Release|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Release|x86.ActiveCfg = Release|Any CPU - {FA74C7D4-2B7F-4C60-9E6D-D903F7861878}.Release|x86.Build.0 = Release|Any CPU {28299971-B249-427B-ADDB-61B46637F343}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {28299971-B249-427B-ADDB-61B46637F343}.Debug|Any CPU.Build.0 = Debug|Any CPU {28299971-B249-427B-ADDB-61B46637F343}.Debug|ARM.ActiveCfg = Debug|Any CPU diff --git a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln index 578797a4..8b26983f 100644 --- a/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln +++ b/samples/Gallery/Xamarin.Forms/SkiaSharpSample.sln @@ -25,11 +25,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.OSX", "..\..\..\b EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.UWP", "..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj", "{BAB615AA-956E-4079-B260-DD7B1F52EC7D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.NetStandard", "..\..\..\binding\SkiaSharp.NetStandard\SkiaSharp.NetStandard.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp", "..\..\..\binding\SkiaSharp\SkiaSharp.csproj", "{4E0924F8-D546-4428-9412-4B9411FBA5FF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.Mac", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Mac\SkiaSharp.Views.Forms.Mac.csproj", "{DA5DA4D8-4885-4AF2-96BB-AE803C344AB0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.NetStandard", "..\..\..\binding\HarfBuzzSharp.NetStandard\HarfBuzzSharp.NetStandard.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\..\..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{DD3EAFFF-E420-4AC3-925D-501EAE140B49}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "..\..\..\source\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{233220CC-F0F3-4C44-9736-ED2CFC363FD3}" EndProject @@ -73,10 +73,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.WPF", "..\. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Forms.WPF", "..\..\..\source\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.WPF\SkiaSharp.Views.Forms.WPF.csproj", "{88149207-012F-4804-B5BF-1247F77639DC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Desktop", "..\..\..\binding\SkiaSharp.Desktop\SkiaSharp.Desktop.csproj", "{973064C1-6515-4916-8F17-6E323D029FD2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Desktop", "..\..\..\binding\HarfBuzzSharp.Desktop\HarfBuzzSharp.Desktop.csproj", "{B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -957,54 +953,6 @@ Global {88149207-012F-4804-B5BF-1247F77639DC}.Release|x64.Build.0 = Release|Any CPU {88149207-012F-4804-B5BF-1247F77639DC}.Release|x86.ActiveCfg = Release|Any CPU {88149207-012F-4804-B5BF-1247F77639DC}.Release|x86.Build.0 = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|ARM.ActiveCfg = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|ARM.Build.0 = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|iPhone.Build.0 = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|x64.ActiveCfg = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|x64.Build.0 = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|x86.ActiveCfg = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Debug|x86.Build.0 = Debug|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|Any CPU.Build.0 = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|ARM.ActiveCfg = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|ARM.Build.0 = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|iPhone.ActiveCfg = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|iPhone.Build.0 = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|x64.ActiveCfg = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|x64.Build.0 = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|x86.ActiveCfg = Release|Any CPU - {973064C1-6515-4916-8F17-6E323D029FD2}.Release|x86.Build.0 = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|ARM.Build.0 = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|iPhone.Build.0 = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|x64.ActiveCfg = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|x64.Build.0 = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|x86.ActiveCfg = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Debug|x86.Build.0 = Debug|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|Any CPU.Build.0 = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|ARM.ActiveCfg = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|ARM.Build.0 = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|iPhone.ActiveCfg = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|iPhone.Build.0 = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|x64.ActiveCfg = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|x64.Build.0 = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|x86.ActiveCfg = Release|Any CPU - {B650BA9B-8EBF-4B2D-BA6A-C26A675A6760}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj b/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj index 4a035e66..225e3968 100644 --- a/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj +++ b/samples/Gallery/Xamarin.Forms/WPF/WPF.csproj @@ -56,9 +56,9 @@ - + {eb1bbdcc-fb07-40d5-8b9e-0079e2c2f2df} - SkiaSharp.Desktop + HarfBuzzSharp {27059729-96a9-4313-b2a4-b10798450519} diff --git a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj index 583cc473..8f5641e0 100644 --- a/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/macOS/SkiaSharpSample/SkiaSharpSample.csproj @@ -29,8 +29,6 @@ true NSUrlSessionHandler None - Mac Developer - 3rd Party Mac Developer Installer @@ -39,15 +37,13 @@ __UNIFIED__;__MACOS__ prompt 4 - true + false true false true true true Full - Mac Developer - 3rd Party Mac Developer Installer NSUrlSessionHandler None diff --git a/scripts/Docker/ubuntu16/amd64/Dockerfile b/scripts/Docker/ubuntu16/amd64/Dockerfile index 9ea0eacc..0a17086e 100644 --- a/scripts/Docker/ubuntu16/amd64/Dockerfile +++ b/scripts/Docker/ubuntu16/amd64/Dockerfile @@ -3,11 +3,13 @@ FROM amd64/ubuntu:16.04 RUN apt-get update \ && apt-get install -y apt-transport-https curl wget \ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \ - && echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial/snapshots/5.20.1.34 main" | tee /etc/apt/sources.list.d/mono-official-stable.list \ + && echo "deb https://download.mono-project.com/repo/ubuntu stable-xenial main" | tee /etc/apt/sources.list.d/mono-official-stable.list \ + && curl -L https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ + && echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main" | tee /etc/apt/sources.list.d/llvm.list \ && apt-get update \ - && apt-get install -y mono-complete msbuild python git libfontconfig1-dev clang-4.0 make \ + && apt-get install -y mono-complete msbuild python git libfontconfig1-dev clang-9 make \ && rm -rf /var/lib/apt/lists/* -ENV CC=clang-4.0 CXX=clang++-4.0 +ENV CC=clang-9 CXX=clang++-9 WORKDIR /work diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index e54c0a0e..4ae3266b 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -13,12 +13,13 @@ variables: PREVIEW_LABEL: 'preview' TIZEN_LINUX_PACKAGES: libxcb-xfixes0 libxcb-render-util0 libwebkitgtk-1.0-0 libxcb-image0 acl libsdl1.2debian libv4l-0 libxcb-randr0 libxcb-shape0 libxcb-icccm4 libsm6 gettext rpm2cpio cpio bridge-utils openvpn MANAGED_LINUX_PACKAGES: ttf-ancient-fonts - MONO_VERSION_MACOS: 5_18_3 - MONO_VERSION_LINUX: stable-xenial/snapshots/5.20.1.34 - XCODE_VERSION: 10.3 - DOTNET_VERSION: 2.2.108 + MONO_VERSION_MACOS: 6_4_0 + MONO_VERSION_LINUX: stable-xenial/snapshots/6.4.0 + XCODE_VERSION: 11 + DOTNET_VERSION: 3.0.x CONFIGURATION: 'Release' - VM_IMAGE_WINDOWS: Hosted VS2017 + VM_IMAGE_WINDOWS_NATIVE: Hosted VS2017 + VM_IMAGE_WINDOWS: Hosted Windows 2019 with VS2019 VM_IMAGE_MAC: Hosted macOS VM_IMAGE_LINUX: Hosted Ubuntu 1604 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true @@ -56,84 +57,84 @@ stages: parameters: name: native_android_x86_windows displayName: Build Native Android|x86 (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-android additionalArgs: --buildarch=x86 - template: azure-templates-bootstrapper.yml # Build Native Android|x64 (Windows) parameters: name: native_android_x64_windows displayName: Build Native Android|x64 (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-android additionalArgs: --buildarch=x64 - template: azure-templates-bootstrapper.yml # Build Native Android|arm (Windows) parameters: name: native_android_arm_windows displayName: Build Native Android|arm (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-android additionalArgs: --buildarch=arm - template: azure-templates-bootstrapper.yml # Build Native Android|arm64 (Windows) parameters: name: native_android_arm64_windows displayName: Build Native Android|arm64 (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-android additionalArgs: --buildarch=arm64 - template: azure-templates-bootstrapper.yml # Build Native Tizen (Windows) parameters: name: native_tizen_windows displayName: Build Native Tizen (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-tizen condition: false # TODO: TIZEN INSTALL BUGS - template: azure-templates-bootstrapper.yml # Build Native UWP|x86 (Windows) parameters: name: native_uwp_x86_windows displayName: Build Native UWP|x86 (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-uwp additionalArgs: --buildarch=x86 - template: azure-templates-bootstrapper.yml # Build Native UWP|x64 (Windows) parameters: name: native_uwp_x64_windows displayName: Build Native UWP|x64 (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-uwp additionalArgs: --buildarch=x64 - template: azure-templates-bootstrapper.yml # Build Native UWP|arm (Windows) parameters: name: native_uwp_arm_windows displayName: Build Native UWP|arm (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-uwp additionalArgs: --buildarch=arm - template: azure-templates-bootstrapper.yml # Build Native UWP|arm64 (Windows) parameters: name: native_uwp_arm64_windows displayName: Build Native UWP|arm64 (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-uwp additionalArgs: --buildarch=arm64 - template: azure-templates-bootstrapper.yml # Build Native Win32|x86 (Windows) parameters: name: native_win32_x86_windows displayName: Build Native Win32|x86 (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-windows additionalArgs: --buildarch=x86 - template: azure-templates-bootstrapper.yml # Build Native Win32|x64 (Windows) parameters: name: native_win32_x64_windows displayName: Build Native Win32|x64 (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-windows additionalArgs: --buildarch=x64 - template: azure-templates-bootstrapper.yml # Build Native NanoServer|x64 (Windows) parameters: name: native_win32_x64_nanoserver_windows displayName: Build Native NanoServer|x64 (Windows) - vmImage: $(VM_IMAGE_WINDOWS) + vmImage: $(VM_IMAGE_WINDOWS_NATIVE) target: externals-nanoserver additionalArgs: --buildarch=x64 preBuildSteps: @@ -249,6 +250,12 @@ stages: - native_win32_x86_windows - native_win32_x64_windows - native_win32_x64_nanoserver_windows + preBuildSteps: + - pwsh: | + $uri = 'https://go.microsoft.com/fwlink/p/?LinkId=619296' + .\scripts\download-file.ps1 -Uri $uri -OutFile sdksetup.exe + .\sdksetup.exe /norestart /quiet | Out-Null + displayName: Install the Windows 10 SDK 10.0.10240 - template: azure-templates-bootstrapper.yml # Build Managed (macOS) parameters: name: managed_macos diff --git a/source/Directory.Build.props b/source/Directory.Build.props new file mode 100644 index 00000000..13351e2f --- /dev/null +++ b/source/Directory.Build.props @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/source/Directory.Build.targets b/source/Directory.Build.targets new file mode 100644 index 00000000..fd185488 --- /dev/null +++ b/source/Directory.Build.targets @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/source/SkiaSharp.Build.props b/source/SkiaSharp.Build.props index c63c8dde..f2170cbf 100644 --- a/source/SkiaSharp.Build.props +++ b/source/SkiaSharp.Build.props @@ -1,5 +1,4 @@ - - + - + <_CopyItems Include="$(TargetPath)" Dest="nuget\lib\$(PackagingPlatform)\$(TargetFileName)" /> <_CopyItems Include="$(TargetDir)$(TargetName).xml" Dest="nuget\lib\$(PackagingPlatform)\$(TargetName).xml" Condition=" Exists('$(TargetDir)$(TargetName).xml') " /> @@ -120,6 +125,10 @@ <_CopyItems Include="@(_NoneWithTargetPath)" Dest="%(_NoneWithTargetPath.TargetPath)" /> + + - + @(PackageReference -> '%(Version)') @(PackageDefinitions -> '%(ResolvedPath)') @@ -146,6 +155,13 @@ $(IntermediateOutputPath)mdoc\ <_ShouldGenerateDocs Condition=" '$(MDocDocumentationDirectory)' != '' and Exists('$(MDocDocumentationDirectory)\index.xml') ">true + + <_MDocInputs Include="$(MDocDocumentationDirectory)\**\*" /> + + + - - - net45 - library - SkiaSharp.HarfBuzz - SkiaSharp.HarfBuzz - SkiaSharp.HarfBuzz - net45 - $(DefineConstants);__DESKTOP__ - true - - - - - - - - - - \ No newline at end of file diff --git a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/Properties/AssemblyInfo.cs b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/Properties/AssemblyInfo.cs deleted file mode 100644 index e69de29b..00000000 diff --git a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj index bc1bf292..df5ca733 100644 --- a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj +++ b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj @@ -1,21 +1,21 @@  - - netstandard1.3 - library + netstandard1.3;netstandard2.0;net45 SkiaSharp.HarfBuzz SkiaSharp.HarfBuzz SkiaSharp.HarfBuzz - netstandard1.3 + + $(DefineConstants);NET_STANDARD - true + + + $(DefineConstants);__DESKTOP__ - - + + - \ No newline at end of file diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj index 9a3fa058..2de8ffcb 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj @@ -1,17 +1,13 @@ - - + monoandroid9.0 - library SkiaSharp.Views.Forms SkiaSharp.Views.Forms false SkiaSharp.Views.Forms - MonoAndroid - $(DefineConstants); + monoandroid1.0 - @@ -22,6 +18,4 @@ - - \ No newline at end of file diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj index a1d48c67..065ffe92 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj @@ -1,25 +1,18 @@ - - + xamarinmac2.0 - library SkiaSharp.Views.Forms SkiaSharp.Views.Forms false SkiaSharp.Views.Forms - Xamarin.Mac20 $(DefineConstants);__MACOS__ - + - - - - @@ -28,6 +21,4 @@ - - \ No newline at end of file diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj index c52e284e..c70a7885 100755 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj @@ -1,22 +1,16 @@ - - + tizen40 - library SkiaSharp.Views.Forms SkiaSharp.Views.Forms False false false SkiaSharp.Views.Forms - tizen40 $(DefineConstants);__TIZEN__; - - - @@ -26,6 +20,4 @@ - - diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj index 24c4a0fe..05e7fb85 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj @@ -1,18 +1,13 @@ - - + uap10.0.16299 - library SkiaSharp.Views.Forms SkiaSharp.Views.Forms false SkiaSharp.Views.Forms uap10.0 - $(DefineConstants); - - @@ -23,6 +18,4 @@ - - \ No newline at end of file diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SkiaSharp.Views.Forms.WPF.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SkiaSharp.Views.Forms.WPF.csproj index c90a6a5c..16785bca 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SkiaSharp.Views.Forms.WPF.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.WPF/SkiaSharp.Views.Forms.WPF.csproj @@ -1,9 +1,6 @@  - net461 - library - true SkiaSharp.Views.Forms SkiaSharp.Views.Forms False @@ -25,7 +22,7 @@ - + @@ -36,5 +33,4 @@ - diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj index 3a9bc001..2c628765 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj @@ -1,17 +1,12 @@ - - + xamarinios1.0 - library SkiaSharp.Views.Forms SkiaSharp.Views.Forms false SkiaSharp.Views.Forms - Xamarin.iOS - $(DefineConstants); - @@ -22,6 +17,4 @@ - - \ No newline at end of file diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj index 180727e5..f162e41c 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj @@ -1,20 +1,17 @@  - - netstandard1.3 - library + netstandard1.3;netstandard2.0 SkiaSharp.Views.Forms SkiaSharp.Views.Forms false SkiaSharp.Views.Forms - netstandard1.3 $(DefineConstants);NET_STANDARD - + @@ -22,5 +19,4 @@ - \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj index 363e5092..0ceb4de6 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj @@ -1,23 +1,15 @@ - - + monoandroid9.0 - library SkiaSharp.Views.Android SkiaSharp.Views.Android SkiaSharp.Views - MonoAndroid - $(DefineConstants); + monoandroid1.0 - - - - - \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop.Common.NetStandard/SkiaSharp.Views.Desktop.Common.NetStandard.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Desktop.Common.NetStandard/SkiaSharp.Views.Desktop.Common.NetStandard.csproj deleted file mode 100644 index c8c77e70..00000000 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop.Common.NetStandard/SkiaSharp.Views.Desktop.Common.NetStandard.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - netstandard2.0 - library - SkiaSharp.Views.Desktop - SkiaSharp.Views.Desktop.Common - SkiaSharp.Views.Desktop.Common - netstandard2.0 - $(DefineConstants);__DESKTOP__;NET_STANDARD - - - - - - - - - \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.csproj index 2bff5587..7a334af6 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Desktop.Common/SkiaSharp.Views.Desktop.Common.csproj @@ -1,19 +1,23 @@  - - net45 - library + netstandard2.0;net45;netcoreapp3.0 SkiaSharp.Views.Desktop SkiaSharp.Views.Desktop.Common SkiaSharp.Views.Desktop.Common - net45 + + + $(DefineConstants);__DESKTOP__;NET_STANDARD + + $(DefineConstants);__DESKTOP__ - + - + + + \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj index cd3b1f6e..5cd8b332 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj @@ -1,18 +1,14 @@  - net45 - library SkiaSharp.Views.Desktop SkiaSharp.Views.Desktop SkiaSharp.Views - net45 $(DefineConstants);__DESKTOP__ - + - \ No newline at end of file diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj index 4f15e003..41b915e0 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj @@ -1,12 +1,9 @@ - net45 - library SkiaSharp.Views.Gtk SkiaSharp.Views.Gtk SkiaSharp.Views.Gtk2 - net45 $(DefineConstants);__DESKTOP__;__GTK__