From 2ce378e49267f915ee2eee0ffef71ca174d8d642 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 16 Jan 2019 04:46:27 +0200 Subject: [PATCH] The new 2.x MSBuild.Sdk.Extras do not work without the custom SDK --- VERSIONS.txt | 2 +- binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj | 2 +- binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj | 2 +- binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj | 3 ++- binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj | 2 +- binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj | 2 +- binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj | 2 +- binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj | 2 +- binding/SkiaSharp.Android/SkiaSharp.Android.csproj | 2 +- binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj | 2 +- binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj | 3 ++- binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj | 2 +- binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj | 2 +- binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj | 2 +- binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj | 2 +- global.json | 2 +- samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj | 3 ++- samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj | 3 ++- .../SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj | 3 ++- samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj | 3 ++- .../SkiaSharp.Views.Forms.Android.csproj | 2 +- .../SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj | 2 +- .../SkiaSharp.Views.Forms.Tizen.csproj | 3 ++- .../SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj | 2 +- .../SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj | 2 +- .../SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj | 2 +- .../SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj | 2 +- .../SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj | 3 ++- .../SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj | 2 +- .../SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj | 2 +- .../SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj | 2 +- .../SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj | 2 +- 32 files changed, 40 insertions(+), 32 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index a80389ea..9c4b3c5c 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -9,7 +9,7 @@ xunit.runner.console release 2.4.0 Xamarin.Forms release 3.3.0.912540 Tizen.NET release 4.0.0 OpenTK.GLControl release 1.1.2349.61993 -MSBuild.Sdk.Extras release 2.0.0-preview.14 +MSBuild.Sdk.Extras release 1.6.65 Cake release 0.31.0 # native sonames diff --git a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj index 0af8ff32..8d73b846 100644 --- a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj +++ b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj index d225878b..0955fdf2 100644 --- a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj +++ b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj b/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj index 64973330..4a6f36cd 100644 --- a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj +++ b/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj @@ -18,7 +18,8 @@ pdbonly - + + diff --git a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj index 5668860d..16c568d8 100644 --- a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj +++ b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj index 2a17ddfc..850f4df9 100644 --- a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj +++ b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj index b68c735e..ef672c6b 100644 --- a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj +++ b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj index d045ee40..de4c4582 100644 --- a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj +++ b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj index 3f09726d..7b1a924c 100644 --- a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj +++ b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj index c60f8395..64f7b84d 100644 --- a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj +++ b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj b/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj index c4ab7cc3..dcb61481 100644 --- a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj +++ b/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj @@ -19,7 +19,8 @@ pdbonly - + + diff --git a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj index ed27cc68..a64c4b3d 100644 --- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj +++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj index b93cd131..00639dc2 100644 --- a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj +++ b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj index 2350778d..3b74fd0a 100644 --- a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj +++ b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj index d5142a35..08313aa7 100644 --- a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj +++ b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/global.json b/global.json index 71229135..f438600d 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "MSBuild.Sdk.Extras": "2.0.0-preview.14" + "MSBuild.Sdk.Extras": "1.6.65" } } \ No newline at end of file diff --git a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj index 55fea5c8..8cfa918e 100644 --- a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj @@ -14,7 +14,8 @@ - + + diff --git a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj index 44be7cd5..e62051e5 100644 --- a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj @@ -16,7 +16,8 @@ - + + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj index 7e91f9f6..5f49f121 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj @@ -20,7 +20,8 @@ - + + diff --git a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj index 66293f67..cf090052 100644 --- a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj +++ b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj @@ -18,7 +18,8 @@ - + + 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 79e5e6a0..aeae9532 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 @@ -11,7 +11,7 @@ $(DefineConstants); - + 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 7d02e7b4..51bf190f 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 @@ -11,7 +11,7 @@ $(DefineConstants);__MACOS__ - + 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 480ade86..ff523c69 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 @@ -13,7 +13,8 @@ $(DefineConstants);__TIZEN__; - + + 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 95cd099a..4b0369fd 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 @@ -11,7 +11,7 @@ $(DefineConstants); - + 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 ab51ddf6..1273a308 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 @@ -11,7 +11,7 @@ $(DefineConstants); - + 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 9705ed16..6a5fbf9e 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj @@ -10,7 +10,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj index ef23f4f2..5279c539 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj @@ -10,7 +10,7 @@ $(DefineConstants);__MACOS__ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj index bf74b526..80b0314f 100755 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj @@ -12,7 +12,8 @@ $(DefineConstants);__TIZEN__; - + + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj index d2d1c04d..90f7e1b8 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj @@ -10,7 +10,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj index 45c6c8e5..e7660dc2 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj @@ -10,7 +10,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj index 3694b115..420dc612 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj @@ -10,7 +10,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj index f95c6782..61f9511a 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj @@ -10,7 +10,7 @@ $(DefineConstants); - +