Reverting the project SDK type as this is not yet supported on mac

2019-01-15 22:39:14 +02:00 · 2019-01-15 22:39:14 +02:00 · ff8c2b9f4b
--- a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj
+++ b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>monoandroid4.4</TargetFramework>
@ -16,6 +16,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <EmbeddedNativeLibrary Include="..\..\output\native\android\arm64-v8a\libHarfBuzzSharp.so" Link="libs\arm64-v8a\libHarfBuzzSharp.so" />
    <EmbeddedNativeLibrary Include="..\..\output\native\android\armeabi-v7a\libHarfBuzzSharp.so" Link="libs\armeabi-v7a\libHarfBuzzSharp.so" />
@ -27,4 +30,5 @@
    <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj
+++ b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinmac2.0</TargetFramework>
@ -18,6 +18,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
@ -29,4 +32,5 @@
    <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj
+++ b/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>tizen40</TargetFramework>
@ -18,6 +18,7 @@
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
  </ItemGroup>
  <ItemGroup>
@ -29,4 +30,5 @@
    <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj
+++ b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>uap10.0.10240</TargetFramework>
@ -16,6 +16,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\output\native\uwp\x64\libHarfBuzzSharp.dll" Link="nuget\runtimes\win10-x64\nativeassets\uap10.0\libHarfBuzzSharp.dll" />
    <None Include="..\..\output\native\uwp\x86\libHarfBuzzSharp.dll" Link="nuget\runtimes\win10-x86\nativeassets\uap10.0\libHarfBuzzSharp.dll" />
@ -26,4 +29,5 @@
    <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
+++ b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinios1.0</TargetFramework>
@ -18,6 +18,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
@ -29,4 +32,5 @@
    <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
+++ b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarintvos1.0</TargetFramework>
@ -18,6 +18,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
@ -29,4 +32,5 @@
    <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
+++ b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinwatchos1.0</TargetFramework>
@ -18,6 +18,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
@ -29,4 +32,5 @@
    <Compile Include="..\HarfBuzzSharp.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj
+++ b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>monoandroid4.4</TargetFramework>
@ -16,6 +16,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <EmbeddedNativeLibrary Include="..\..\output\native\android\arm64-v8a\libSkiaSharp.so" Link="libs\arm64-v8a\libSkiaSharp.so" />
    <EmbeddedNativeLibrary Include="..\..\output\native\android\armeabi-v7a\libSkiaSharp.so" Link="libs\armeabi-v7a\libSkiaSharp.so" />
@ -27,4 +30,5 @@
    <Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
+++ b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinmac2.0</TargetFramework>
@ -18,6 +18,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
@ -29,4 +32,5 @@
    <Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj
+++ b/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>tizen40</TargetFramework>
@ -19,6 +19,7 @@
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
    <PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
  </ItemGroup>
@ -31,4 +32,5 @@
    <Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
+++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>uap10.0.10240</TargetFramework>
@ -16,6 +16,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\output\native\uwp\x64\libSkiaSharp.dll" Link="nuget\runtimes\win10-x64\nativeassets\uap10.0\libSkiaSharp.dll" />
    <None Include="..\..\output\native\uwp\x86\libSkiaSharp.dll" Link="nuget\runtimes\win10-x86\nativeassets\uap10.0\libSkiaSharp.dll" />
@ -32,4 +35,5 @@
    <Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj
+++ b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinios1.0</TargetFramework>
@ -18,6 +18,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
@ -29,4 +32,5 @@
    <Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj
+++ b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarintvos1.0</TargetFramework>
@ -18,6 +18,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
@ -29,4 +32,5 @@
    <Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj
+++ b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\source\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinwatchos1.0</TargetFramework>
@ -18,6 +18,9 @@
  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <Compile Include="Properties\AssemblyInfo.cs" />
    <ObjcBindingApiDefinition Include="ApiDefinition.cs" />
@ -29,4 +32,5 @@
    <Compile Include="..\Binding\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\source\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/ElmSharp/SkiaSharpSample/SkiaSharpSample.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>tizen40</TargetFramework>
@ -14,6 +14,7 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
  </ItemGroup>

@ -37,4 +38,6 @@

  <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets')" />

+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
+
 </Project>
--- a/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj
+++ b/samples/Basic/Tizen/SkiaSharpSample/SkiaSharpSample.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>tizen40</TargetFramework>
@ -16,6 +16,7 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
  </ItemGroup>
@ -41,4 +42,6 @@

  <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets')" />

+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
+
 </Project>
--- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj
+++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.Tizen/SkiaSharpSample.Tizen.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>tizen40</TargetFramework>
@ -20,6 +20,7 @@
  </ItemGroup>

  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
  </ItemGroup>
@ -46,4 +47,6 @@

  <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets')" />

+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
+
 </Project>
--- a/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj
+++ b/samples/Gallery/Xamarin.Forms/Tizen/TizenOS.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>tizen40</TargetFramework>
@ -18,6 +18,7 @@
  </PropertyGroup>

  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
  </ItemGroup>
@ -66,4 +67,6 @@
  <Import Project="..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets" Condition="Exists('..\..\..\..\output\SkiaSharp\nuget\build\tizen40\SkiaSharp.targets')" />
  <Import Project="..\..\..\..\output\HarfBuzzSharp\nuget\build\tizen40\HarfBuzzSharp.targets" Condition="Exists('..\..\..\..\output\HarfBuzzSharp\nuget\build\tizen40\HarfBuzzSharp.targets')" />

+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
+
 </Project>
--- 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,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>monoandroid8.1</TargetFramework>
@ -11,6 +11,7 @@
    <DefineConstants>$(DefineConstants);</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
  </ItemGroup>
  <ItemGroup>
@ -22,4 +23,5 @@
    <Compile Include="..\SkiaSharp.Views.Forms.Native.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- 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,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinmac2.0</TargetFramework>
@ -11,6 +11,7 @@
    <DefineConstants>$(DefineConstants);__MACOS__</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
  </ItemGroup>
  <ItemGroup>
@ -22,4 +23,5 @@
    <Compile Include="..\SkiaSharp.Views.Forms.Native.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- 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,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>tizen40</TargetFramework>
@ -13,6 +13,7 @@
    <DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
  </ItemGroup>
@ -25,4 +26,5 @@
    <Compile Include="..\SkiaSharp.Views.Forms.Native.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- 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,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>uap10.0.16299</TargetFramework>
@ -11,6 +11,7 @@
    <DefineConstants>$(DefineConstants);</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
  </ItemGroup>
  <ItemGroup>
@ -22,4 +23,5 @@
    <Compile Include="..\SkiaSharp.Views.Forms.Native.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- 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,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinios1.0</TargetFramework>
@ -11,6 +11,7 @@
    <DefineConstants>$(DefineConstants);</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
  </ItemGroup>
  <ItemGroup>
@ -22,4 +23,5 @@
    <Compile Include="..\SkiaSharp.Views.Forms.Native.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>monoandroid4.4</TargetFramework>
@ -9,6 +9,9 @@
    <PackagingPlatform>MonoAndroid</PackagingPlatform>
    <DefineConstants>$(DefineConstants);</DefineConstants>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj" />
  </ItemGroup>
@ -16,4 +19,5 @@
    <Compile Include="..\SkiaSharp.Views.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinmac2.0</TargetFramework>
@ -9,6 +9,9 @@
    <PackagingPlatform>Xamarin.Mac20</PackagingPlatform>
    <DefineConstants>$(DefineConstants);__MACOS__</DefineConstants>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj" />
  </ItemGroup>
@ -17,4 +20,5 @@
    <Compile Include="..\SkiaSharp.Views.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>tizen40</TargetFramework>
@ -12,6 +12,7 @@
    <DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
  </PropertyGroup>
  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.0" />
    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
  </ItemGroup>
@ -22,4 +23,5 @@
    <Compile Include="..\SkiaSharp.Views.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>uap10.0.10240</TargetFramework>
@ -9,6 +9,9 @@
    <PackagingPlatform>uap10.0</PackagingPlatform>
    <DefineConstants>$(DefineConstants);</DefineConstants>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.UWP\SkiaSharp.UWP.csproj" />
  </ItemGroup>
@ -21,4 +24,5 @@
    <Compile Include="..\SkiaSharp.Views.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinios1.0</TargetFramework>
@ -9,6 +9,9 @@
    <PackagingPlatform>Xamarin.iOS</PackagingPlatform>
    <DefineConstants>$(DefineConstants);</DefineConstants>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj" />
  </ItemGroup>
@ -18,4 +21,5 @@
    <Compile Include="..\SkiaSharp.Views.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarintvos1.0</TargetFramework>
@ -9,6 +9,9 @@
    <PackagingPlatform>Xamarin.TVOS</PackagingPlatform>
    <DefineConstants>$(DefineConstants);</DefineConstants>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.tvOS\SkiaSharp.tvOS.csproj" />
  </ItemGroup>
@ -18,4 +21,5 @@
    <Compile Include="..\SkiaSharp.Views.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>
--- a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj
@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
  <Import Project="..\..\SkiaSharp.Build.props" />
  <PropertyGroup>
    <TargetFramework>xamarinwatchos1.0</TargetFramework>
@ -9,6 +9,9 @@
    <PackagingPlatform>Xamarin.WatchOS</PackagingPlatform>
    <DefineConstants>$(DefineConstants);</DefineConstants>
  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="2.0.0-preview.14" PrivateAssets="All" />
+  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\..\binding\SkiaSharp.watchOS\SkiaSharp.watchOS.csproj" />
  </ItemGroup>
@ -18,4 +21,5 @@
    <Compile Include="..\SkiaSharp.Views.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
  </ItemGroup>
  <Import Project="..\..\SkiaSharp.Build.targets" />
+  <Import Project="$(MSBuildSdkExtrasTargets)" Condition="Exists('$(MSBuildSdkExtrasTargets)')" />
 </Project>