Update the Uno package versions (#1426)

mono · Jul 24, 2020 · 1fa3dad · 1fa3dad
1 parent 5e92da4
commit 1fa3dad
Show file tree

Hide file tree

Showing 24 changed files with 65 additions and 101 deletions.
diff --git a/VERSIONS.txt b/VERSIONS.txt
@@ -20,7 +20,7 @@ AtkSharp                                        release     3.22.24.37
 System.Memory                                   release     4.5.3
 System.IO.UnmanagedMemoryStream                 release     4.3.0
 SharpVk                                         release     0.4.2
-Uno.UI                                          release     2.0.532
+Uno.UI                                          release     2.4.4
 
 # additional references used by the tooling
 OpenTK.GLControl                                reference   1.1.2349.61993

diff --git a/cake/UpdateDocs.cake b/cake/UpdateDocs.cake
@@ -199,8 +199,8 @@ Task ("docs-update-frameworks")
     // generate the temp frameworks.xml
     var xFrameworks = new XElement ("Frameworks");
     foreach (var id in TRACKED_NUGETS.Keys) {
-        // skip doc generatgion for Uno, this is the same as UWP and it is not needed
-        if (id == "SkiaSharp.Views.Uno")
+        // skip doc generation for Uno, this is the same as UWP and it is not needed
+        if (id.StartsWith ("SkiaSharp.Views.Uno"))
             continue;
 
         // get the versions

diff --git a/nuget/SkiaSharp.Views.Uno.nuspec b/nuget/SkiaSharp.Views.Uno.nuspec
@@ -28,24 +28,24 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
 
     <dependencies>
       <group targetFramework="netstandard2.0">
-        <dependency id="Uno.UI" version="2.0.532" />
+        <dependency id="Uno.UI" version="2.4.4" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.NativeAssets.WebAssembly" version="1.0.0" />
       </group>
       <group targetFramework="monoandroid1.0">
-        <dependency id="Uno.UI" version="2.0.532" />
+        <dependency id="Uno.UI" version="2.4.4" />
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
       <group targetFramework="xamarinios1.0">
-        <dependency id="Uno.UI" version="2.0.532" />
+        <dependency id="Uno.UI" version="2.4.4" />
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
       <group targetFramework="xamarinmac2.0">
-        <dependency id="Uno.UI" version="2.0.532" />
+        <dependency id="Uno.UI" version="2.4.4" />
         <dependency id="SkiaSharp" version="1.0.0" />
       </group>
       <group targetFramework="uap10.0">
-        <dependency id="Uno.UI" version="2.0.532" />
+        <dependency id="Uno.UI" version="2.4.4" />
         <dependency id="SkiaSharp" version="1.0.0" />
         <dependency id="SkiaSharp.Views" version="1.0.0" />
       </group>

diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec
@@ -133,9 +133,6 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <!-- watchos -->
     <file platform="macos" src="build/xamarinwatchos1.0/libSkiaSharp.framework/" target="/" />
 
-    <!-- Workbooks integration -->
-    <file src="xamarin.interactive/SkiaSharp.Workbooks.dll" />
-
     <!-- legal -->
     <file src="LICENSE.txt" />
     <file src="THIRD-PARTY-NOTICES.txt" /> 

diff --git a/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
@@ -56,8 +56,8 @@
     <Reference Include="Mono.Android.Export" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="2.4.0" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.0" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.4" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />

diff --git a/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj
@@ -24,11 +24,9 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
     <PackageReference Include="Uno.UI" Version="2.4.4" />
-  </ItemGroup>
-  <!-- workaround for https://github.com/unoplatform/Uno.Wasm.Bootstrap/issues/253 -->
-  <ItemGroup Condition=" '$(WasmShellForceDisableWSL)' != 'true' ">
-    <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.9" />
-    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.9" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.4" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.12" />
+    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.12" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

diff --git a/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj
@@ -95,8 +95,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="2.4.0" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.0" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.4" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
   </ItemGroup>

diff --git a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
@@ -41,8 +41,8 @@
     <Reference Include="System.Memory" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="2.4.0" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.0" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.4" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
   </ItemGroup>

diff --git a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj
@@ -57,8 +57,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
-    <PackageReference Include="Uno.UI" Version="2.4.0" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.0" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.4" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.32" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />

diff --git a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj
@@ -24,11 +24,9 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
     <PackageReference Include="Uno.UI" Version="2.4.4" />
-  </ItemGroup>
-  <!-- workaround for https://github.com/unoplatform/Uno.Wasm.Bootstrap/issues/253 -->
-  <ItemGroup Condition=" '$(WasmShellForceDisableWSL)' != 'true' ">
-    <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.9" />
-    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.9" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.4" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.12" />
+    <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.12" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

diff --git a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj
@@ -101,8 +101,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
-    <PackageReference Include="Uno.UI" Version="2.4.0" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.0" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.4" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
   </ItemGroup>

diff --git a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj
@@ -42,8 +42,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Essentials" Version="1.5.1" />
-    <PackageReference Include="Uno.UI" Version="2.4.0" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.0" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="2.4.4" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
   </ItemGroup>

diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj
@@ -8,7 +8,7 @@
     <PackagingPlatform>monoandroid1.0</PackagingPlatform>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="2.0.532" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp.Android\SkiaSharp.Android.csproj" />

diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj
@@ -8,7 +8,7 @@
     <DefineConstants>$(DefineConstants);__MACOS__</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="2.0.532" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp.OSX\SkiaSharp.OSX.csproj" />

diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Wasm/SKXamlCanvas.Wasm.cs b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Wasm/SKXamlCanvas.Wasm.cs
@@ -11,29 +11,6 @@ public partial class SKXamlCanvas : FrameworkElement
 		private int pixelWidth;
 		private int pixelHeight;
 
-		static SKXamlCanvas()
-		{
-			const string js = @"
-(window || global).SkiaSharp_Views_UWP_SKXamlCanvas = class SKXamlCanvas {
-  static invalidateCanvas(pData, canvasId, width, height) {
-    var htmlCanvas = document.getElementById(canvasId);
-    htmlCanvas.width = width;
-    htmlCanvas.height = height;
-
-    var ctx = htmlCanvas.getContext('2d');
-    if (!ctx)
-      return false;
-
-    var buffer = new Uint8ClampedArray(Module.HEAPU8.buffer, pData, width * height * 4);
-    var imageData = new ImageData(buffer, width, height);
-    ctx.putImageData(imageData, 0, 0);
-
-    return true;
-  }
-};";
-			WebAssemblyRuntime.InvokeJS(js);
-		}
-
 		public SKXamlCanvas()
 			: base("canvas")
 		{
@@ -77,7 +54,7 @@ private void DoInvalidate()
 				OnPaintSurface(new SKPaintSurfaceEventArgs(surface, info));
 			}
 
-			WebAssemblyRuntime.InvokeJS($"SkiaSharp_Views_UWP_SKXamlCanvas.invalidateCanvas({pixels}, \"{HtmlId}\", {info.Width}, {pixelHeight});");
+			WebAssemblyRuntime.InvokeJS($"SkiaSharp.Views.UWP.SKXamlCanvas.invalidateCanvas({pixels}, \"{HtmlId}\", {info.Width}, {pixelHeight});");
 		}
 
 		private unsafe void CreateBitmap(SKImageInfo info)

diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Wasm/SkiaSharp.Views.Uno.Wasm.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Wasm/SkiaSharp.Views.Uno.Wasm.csproj
@@ -8,12 +8,13 @@
     <DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="2.0.532" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <None Remove="nuget\build\netstandard2.0\SkiaSharp.Views.Uno.targets" />
     <None Include="nuget\build\netstandard2.0\SkiaSharp.Views.Uno.targets" Link="nuget\build\$(PackagingPlatform)\SkiaSharp.Views.Uno.targets" />
   </ItemGroup>
   <ItemGroup>

diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js
@@ -0,0 +1,29 @@
+var SkiaSharp;
+(function (SkiaSharp) {
+    var Views;
+    (function (Views) {
+        var UWP;
+        (function (UWP) {
+
+            class SKXamlCanvas {
+                static invalidateCanvas(pData, canvasId, width, height) {
+                    var htmlCanvas = document.getElementById(canvasId);
+                    htmlCanvas.width = width;
+                    htmlCanvas.height = height;
+
+                    var ctx = htmlCanvas.getContext('2d');
+                    if (!ctx)
+                        return false;
+
+                    var buffer = new Uint8ClampedArray(Module.HEAPU8.buffer, pData, width * height * 4);
+                    var imageData = new ImageData(buffer, width, height);
+                    ctx.putImageData(imageData, 0, 0);
+
+                    return true;
+                }
+            }
+            UWP.SKXamlCanvas = SKXamlCanvas;
+
+        })(UWP = Views.UWP || (Views.UWP = {}));
+    })(Views = SkiaSharp.Views || (SkiaSharp.Views = {}));
+})(SkiaSharp || (SkiaSharp = {}));
diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj
@@ -7,7 +7,7 @@
     <PackagingGroup>SkiaSharp.Views.Uno</PackagingGroup>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI" Version="2.0.532" />
+    <PackageReference Include="Uno.UI" Version="2.4.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp.iOS\SkiaSharp.iOS.csproj" />

diff --git a/source/SkiaSharpSource.Linux.sln b/source/SkiaSharpSource.Linux.sln
@@ -11,10 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.HarfBuzz", "SkiaS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{7CAD1912-05A5-42E5-B7BA-81BB051F0566}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Workbooks", "SkiaSharp.Workbooks", "{DF72A8D3-0A12-49C9-BBD2-4ACC9EB1A544}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Workbooks", "SkiaSharp.Workbooks\SkiaSharp.Workbooks.csproj", "{89736865-5272-4A42-A7FB-D802C6345502}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views", "SkiaSharp.Views", "{4F5EBFFB-DD81-43B9-8531-156ED3639C91}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk", "SkiaSharp.Views\SkiaSharp.Views.Gtk\SkiaSharp.Views.Gtk.csproj", "{67A502A4-E8B2-419A-811E-5A634B29C8D7}"
@@ -59,10 +55,6 @@ Global
 		{7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Release|Any CPU.Build.0 = Release|Any CPU
 		{67A502A4-E8B2-419A-811E-5A634B29C8D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67A502A4-E8B2-419A-811E-5A634B29C8D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67A502A4-E8B2-419A-811E-5A634B29C8D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -121,7 +113,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{7CAD1912-05A5-42E5-B7BA-81BB051F0566} = {87D751FF-6347-40FF-8EC5-7CAD06BD5973}
-		{89736865-5272-4A42-A7FB-D802C6345502} = {DF72A8D3-0A12-49C9-BBD2-4ACC9EB1A544}
 		{67A502A4-E8B2-419A-811E-5A634B29C8D7} = {4F5EBFFB-DD81-43B9-8531-156ED3639C91}
 		{1555D119-8598-4E4D-91AC-D313F94A1673} = {B3C4E4EC-68C7-4AFB-A6D4-1B2B0EB8C421}
 		{249C9EBD-88ED-4BE8-8EF7-72FB65659363} = {815C2429-8C88-4C09-B6AB-A916040F9FEF}

diff --git a/source/SkiaSharpSource.Mac.sln b/source/SkiaSharpSource.Mac.sln
@@ -53,10 +53,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.watchOS", "..
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Android", "..\binding\HarfBuzzSharp.Android\HarfBuzzSharp.Android.csproj", "{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Workbooks", "SkiaSharp.Workbooks", "{DF72A8D3-0A12-49C9-BBD2-4ACC9EB1A544}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Workbooks", "SkiaSharp.Workbooks\SkiaSharp.Workbooks.csproj", "{89736865-5272-4A42-A7FB-D802C6345502}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk", "SkiaSharp.Views\SkiaSharp.Views.Gtk\SkiaSharp.Views.Gtk.csproj", "{67A502A4-E8B2-419A-811E-5A634B29C8D7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.Tizen", "..\binding\HarfBuzzSharp.Tizen\HarfBuzzSharp.Tizen.csproj", "{C04A659E-5738-49EF-9455-044947792A0C}"
@@ -173,10 +169,6 @@ Global
 		{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Release|Any CPU.Build.0 = Release|Any CPU
 		{67A502A4-E8B2-419A-811E-5A634B29C8D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67A502A4-E8B2-419A-811E-5A634B29C8D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{67A502A4-E8B2-419A-811E-5A634B29C8D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -254,7 +246,6 @@ Global
 		{8D646738-458A-441F-B69B-253EF058A812} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A}
 		{0C940695-4868-4CF7-7D16-266BDD88A812} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A}
 		{E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A}
-		{89736865-5272-4A42-A7FB-D802C6345502} = {DF72A8D3-0A12-49C9-BBD2-4ACC9EB1A544}
 		{67A502A4-E8B2-419A-811E-5A634B29C8D7} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141}
 		{C04A659E-5738-49EF-9455-044947792A0C} = {56AE868D-7AD9-4DFC-BD27-6BBA8DC9F75A}
 		{7A4C851F-9FD6-480B-A341-7DF1A498AC74} = {C335869B-7CC8-4239-B4A5-8031AA9758D3}

diff --git a/source/SkiaSharpSource.Windows.sln b/source/SkiaSharpSource.Windows.sln
@@ -27,10 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.HarfBuzz", "SkiaS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.HarfBuzz", "SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.csproj", "{7CAD1912-05A5-42E5-B7BA-81BB051F0566}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Workbooks", "SkiaSharp.Workbooks", "{DF72A8D3-0A12-49C9-BBD2-4ACC9EB1A544}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Workbooks", "SkiaSharp.Workbooks\SkiaSharp.Workbooks.csproj", "{89736865-5272-4A42-A7FB-D802C6345502}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp.UWP", "..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HarfBuzzSharp", "..\binding\HarfBuzzSharp\HarfBuzzSharp.csproj", "{2E3C9751-6A89-4510-AC4C-225A909460A0}"
@@ -105,10 +101,6 @@ Global
 		{7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7CAD1912-05A5-42E5-B7BA-81BB051F0566}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89736865-5272-4A42-A7FB-D802C6345502}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -193,7 +185,6 @@ Global
 		{BAB615AA-956E-4079-B260-DD7B1F52EC7D} = {C335869B-7CC8-4239-B4A5-8031AA9758D3}
 		{743CF830-D458-41A9-865A-F85126562015} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141}
 		{7CAD1912-05A5-42E5-B7BA-81BB051F0566} = {EDCCEA7A-E6CD-4311-B686-41D7CA40DF85}
-		{89736865-5272-4A42-A7FB-D802C6345502} = {DF72A8D3-0A12-49C9-BBD2-4ACC9EB1A544}
 		{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF} = {9F016D5D-C7BF-45C7-BC0C-5A6E721DCF9E}
 		{2E3C9751-6A89-4510-AC4C-225A909460A0} = {9F016D5D-C7BF-45C7-BC0C-5A6E721DCF9E}
 		{7BFEC966-9910-49BA-A7D4-6204C30E3174} = {C335869B-7CC8-4239-B4A5-8031AA9758D3}