From 2f1e224c88e8b955e5e568ad25b45d922db80c93 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 27 Oct 2017 13:19:12 +0200 Subject: [PATCH] Project changes to v1.60 --- samples/FormsSample/Android/Android.csproj | 8 +++--- samples/FormsSample/Core/Core.csproj | 6 ++-- samples/FormsSample/Mac/Mac.csproj | 8 +++--- samples/FormsSample/UWP/UWP.csproj | 8 +++--- samples/FormsSample/iOS/iOS.csproj | 8 +++--- samples/MacSample/MacSample/MacSample.csproj | 6 ++-- samples/TvSample/TvSample/TvSample.csproj | 6 ++-- samples/UWPSample/UWPSample/UWPSample.csproj | 6 ++-- samples/WPFSample/WPFSample/WPFSample.csproj | 6 ++-- .../WindowsSample/WindowsSample.csproj | 6 ++-- source/SkiaSharpSource.Mac.sln | 28 +++++++++---------- .../SkiaSharp.NetCore.Tests.csproj | 4 +-- 12 files changed, 50 insertions(+), 50 deletions(-) diff --git a/samples/FormsSample/Android/Android.csproj b/samples/FormsSample/Android/Android.csproj index d42a2716..387a3721 100644 --- a/samples/FormsSample/Android/Android.csproj +++ b/samples/FormsSample/Android/Android.csproj @@ -54,11 +54,11 @@ - - + + - - + + diff --git a/samples/FormsSample/Core/Core.csproj b/samples/FormsSample/Core/Core.csproj index 0775492c..ffa7109b 100644 --- a/samples/FormsSample/Core/Core.csproj +++ b/samples/FormsSample/Core/Core.csproj @@ -35,10 +35,10 @@ - - + + - + diff --git a/samples/FormsSample/Mac/Mac.csproj b/samples/FormsSample/Mac/Mac.csproj index 9c8c5b8b..1e955867 100644 --- a/samples/FormsSample/Mac/Mac.csproj +++ b/samples/FormsSample/Mac/Mac.csproj @@ -56,12 +56,12 @@ - - + + - - + + diff --git a/samples/FormsSample/UWP/UWP.csproj b/samples/FormsSample/UWP/UWP.csproj index 2feb7ecb..47c4b440 100644 --- a/samples/FormsSample/UWP/UWP.csproj +++ b/samples/FormsSample/UWP/UWP.csproj @@ -17,7 +17,7 @@ true 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\AppStoreCertificates\Skia.UWP.Demo_StoreKey.pfx + ..\..\AppStoreCertificates\Skia.UWP.Demo_StoreKey.pfx A9102DF7FB3501F23B65D59B624A9CB05C065366 False Always @@ -96,10 +96,10 @@ - - + + - + diff --git a/samples/FormsSample/iOS/iOS.csproj b/samples/FormsSample/iOS/iOS.csproj index f4fb67fd..95e6774a 100644 --- a/samples/FormsSample/iOS/iOS.csproj +++ b/samples/FormsSample/iOS/iOS.csproj @@ -115,11 +115,11 @@ - - + + - - + + diff --git a/samples/MacSample/MacSample/MacSample.csproj b/samples/MacSample/MacSample/MacSample.csproj index 9631a987..6dfd12d9 100644 --- a/samples/MacSample/MacSample/MacSample.csproj +++ b/samples/MacSample/MacSample/MacSample.csproj @@ -54,10 +54,10 @@ - - + + - + diff --git a/samples/TvSample/TvSample/TvSample.csproj b/samples/TvSample/TvSample/TvSample.csproj index 5eb47715..e663fd9e 100644 --- a/samples/TvSample/TvSample/TvSample.csproj +++ b/samples/TvSample/TvSample/TvSample.csproj @@ -87,10 +87,10 @@ - - + + - + diff --git a/samples/UWPSample/UWPSample/UWPSample.csproj b/samples/UWPSample/UWPSample/UWPSample.csproj index 81f74c62..2d0ca3cb 100644 --- a/samples/UWPSample/UWPSample/UWPSample.csproj +++ b/samples/UWPSample/UWPSample/UWPSample.csproj @@ -92,10 +92,10 @@ - - + + - + diff --git a/samples/WPFSample/WPFSample/WPFSample.csproj b/samples/WPFSample/WPFSample/WPFSample.csproj index d517c20b..cb108afe 100644 --- a/samples/WPFSample/WPFSample/WPFSample.csproj +++ b/samples/WPFSample/WPFSample/WPFSample.csproj @@ -98,10 +98,10 @@ - - + + - + diff --git a/samples/WindowsSample/WindowsSample/WindowsSample.csproj b/samples/WindowsSample/WindowsSample/WindowsSample.csproj index 87a562c3..f20793f9 100644 --- a/samples/WindowsSample/WindowsSample/WindowsSample.csproj +++ b/samples/WindowsSample/WindowsSample/WindowsSample.csproj @@ -92,10 +92,10 @@ - - + + - + diff --git a/source/SkiaSharpSource.Mac.sln b/source/SkiaSharpSource.Mac.sln index 14b969cb..885c5ea9 100644 --- a/source/SkiaSharpSource.Mac.sln +++ b/source/SkiaSharpSource.Mac.sln @@ -3,6 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26430.13 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Binding", "..\Binding\Binding\Binding.shproj", "{9C502B9A-25D4-473F-89BD-5A13DDE16354}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Android", "..\Binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.iOS", "..\Binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.tvOS", "..\Binding\SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.watchOS", "..\Binding\SkiaSharp.watchOS\SkiaSharp.watchOS.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}" +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.Portable", "..\Binding\SkiaSharp.Portable\SkiaSharp.Portable.csproj", "{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}" +EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.Forms.Shared", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Shared\SkiaSharp.Views.Forms.Shared.shproj", "{314FB505-9858-4E03-B799-91B0BA627D05}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms.Android", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Android\SkiaSharp.Views.Forms.Android.csproj", "{2F94F024-1841-47E8-B521-74AA4E3EBA54}" @@ -27,20 +41,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.AppleiOS", EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "SkiaSharp.Views.Shared", "SkiaSharp.Views\SkiaSharp.Views.Shared\SkiaSharp.Views.Shared.shproj", "{5A67972C-1C04-4913-9950-06A03BFE9533}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Binding", "..\Binding\Binding\Binding.shproj", "{9C502B9A-25D4-473F-89BD-5A13DDE16354}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Android", "..\Binding\SkiaSharp.Android\SkiaSharp.Android.csproj", "{C737DC80-5B71-4B26-A2DC-DA30421788B0}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.iOS", "..\Binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj", "{6A678CFB-21A7-4E81-8909-FD72ABBFD408}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.tvOS", "..\Binding\SkiaSharp.tvOS\SkiaSharp.tvOS.csproj", "{5180E370-A455-42BB-99F9-97BD269B8A52}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.watchOS", "..\Binding\SkiaSharp.watchOS\SkiaSharp.watchOS.csproj", "{099A4BAD-6CF7-4898-9D16-266BDD844F95}" -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.Portable", "..\Binding\SkiaSharp.Portable\SkiaSharp.Portable.csproj", "{7AA90628-2FDD-4585-AF2F-CC51CFA8B52A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp", "SkiaSharp", "{C335869B-7CC8-4239-B4A5-8031AA9758D3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views", "SkiaSharp.Views", "{F19E1537-81B2-4D4F-A69E-78DC73ACC141}" diff --git a/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj b/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj index af6148b7..db10c70d 100644 --- a/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj +++ b/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj @@ -14,8 +14,8 @@ - - + +