From 1fa3daddcc45873d6cd84c54392c6be64539b87d Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 24 Jul 2020 03:57:30 +0200 Subject: [PATCH] Update the Uno package versions (#1426) --- VERSIONS.txt | 2 +- cake/UpdateDocs.cake | 4 +-- nuget/SkiaSharp.Views.Uno.nuspec | 10 +++---- nuget/SkiaSharp.nuspec | 3 -- .../SkiaSharpSample.Android.csproj | 4 +-- .../SkiaSharpSample.Wasm.csproj | 8 ++--- .../SkiaSharpSample.iOS.csproj | 4 +-- .../SkiaSharpSample.macOS.csproj | 4 +-- .../SkiaSharpSample.Android.csproj | 4 +-- .../SkiaSharpSample.Wasm.csproj | 8 ++--- .../SkiaSharpSample.iOS.csproj | 4 +-- .../SkiaSharpSample.macOS.csproj | 4 +-- .../SkiaSharp.Views.Uno.Android.csproj | 2 +- .../SkiaSharp.Views.Uno.Mac.csproj | 2 +- .../SKXamlCanvas.Wasm.cs | 25 +--------------- .../SkiaSharp.Views.Uno.Wasm.csproj | 3 +- .../WasmScripts/SkiaSharp.Views.Uno.Wasm.js | 29 +++++++++++++++++++ .../SkiaSharp.Views.Uno.iOS.csproj | 2 +- source/SkiaSharpSource.Linux.sln | 9 ------ source/SkiaSharpSource.Mac.sln | 9 ------ source/SkiaSharpSource.Windows.sln | 9 ------ source/SkiaSharpSource.sln | 9 ------ .../SkiaSharp.Wasm.Tests.csproj | 4 +-- .../wasm/NativeLibraryMiniTest.csproj | 4 +-- 24 files changed, 65 insertions(+), 101 deletions(-) create mode 100644 source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Wasm/WasmScripts/SkiaSharp.Views.Uno.Wasm.js diff --git a/VERSIONS.txt b/VERSIONS.txt index f6477abc54..154113b17d 100644 --- 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 index 59b161a20b..a3b4909fb7 100644 --- 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 index ec58fb6db5..49dcc99d94 100644 --- 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 - + - + - + - + - + diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec index 8802716280..7c5ea4e71a 100644 --- 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 - - - diff --git a/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index 956c935dce..eebb508b08 100644 --- a/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -56,8 +56,8 @@ - - + + diff --git a/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index f827f718aa..9814b5bfda 100644 --- a/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -24,11 +24,9 @@ - - - - - + + + diff --git a/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 2564f88a22..6d267a33ae 100644 --- a/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -95,8 +95,8 @@ - - + + diff --git a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index 026df578b2..2e1fa56e5e 100644 --- a/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -41,8 +41,8 @@ - - + + diff --git a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj index a067ce4df1..434aaa2d41 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Android/SkiaSharpSample.Android.csproj @@ -57,8 +57,8 @@ - - + + diff --git a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index f827f718aa..9814b5bfda 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -24,11 +24,9 @@ - - - - - + + + diff --git a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj index 8486ef924c..c405cce881 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.iOS/SkiaSharpSample.iOS.csproj @@ -101,8 +101,8 @@ - - + + diff --git a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj index e4681a9491..67514ca065 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.macOS/SkiaSharpSample.macOS.csproj @@ -42,8 +42,8 @@ - - + + 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 index 1129a0ed65..44b1a1d2d6 100644 --- 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 @@ monoandroid1.0 - + 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 index eee51d5b93..6e5501b18d 100644 --- 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);__MACOS__ - + 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 index 647bc372e4..86bdd6b7c0 100644 --- 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 index 77dd4172fd..a9934819ef 100644 --- 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);__WASM__ - + + 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 new file mode 100644 index 0000000000..e9dc668df9 --- /dev/null +++ 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 index 0200f2b250..8e26b35f73 100644 --- 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 @@ SkiaSharp.Views.Uno - + diff --git a/source/SkiaSharpSource.Linux.sln b/source/SkiaSharpSource.Linux.sln index 4b50ee45db..12538ea916 100644 --- 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 index dd21c1b270..c34cc6ff2b 100644 --- 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 index 462ac5271f..c4c993529c 100644 --- 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} diff --git a/source/SkiaSharpSource.sln b/source/SkiaSharpSource.sln index d4175315b7..eb6322a268 100644 --- a/source/SkiaSharpSource.sln +++ b/source/SkiaSharpSource.sln @@ -67,10 +67,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}") = "HarfBuzzSharp.UWP", "..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkiaSharp.Views.Gtk", "SkiaSharp.Views\SkiaSharp.Views.Gtk\SkiaSharp.Views.Gtk.csproj", "{67A502A4-E8B2-419A-811E-5A634B29C8D7}" @@ -221,10 +217,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 {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 @@ -321,7 +313,6 @@ Global {8D646738-458A-441F-B69B-253EF058A812} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} {0C940695-4868-4CF7-7D16-266BDD88A812} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} {E6B786C4-3BF9-4A42-9A4A-08002AE3FDAD} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} - {89736865-5272-4A42-A7FB-D802C6345502} = {DF72A8D3-0A12-49C9-BBD2-4ACC9EB1A544} {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} {67A502A4-E8B2-419A-811E-5A634B29C8D7} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} {FE1BCB7F-27F1-4135-8BC5-5A185FC7018C} = {2F28C1EB-D020-4A3A-948F-DF0AD0FDCC53} diff --git a/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj b/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj index 7e82bce1e4..9881886735 100644 --- a/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj +++ b/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/utils/NativeLibraryMiniTest/wasm/NativeLibraryMiniTest.csproj b/utils/NativeLibraryMiniTest/wasm/NativeLibraryMiniTest.csproj index 938696c1c0..2e78b1d223 100644 --- a/utils/NativeLibraryMiniTest/wasm/NativeLibraryMiniTest.csproj +++ b/utils/NativeLibraryMiniTest/wasm/NativeLibraryMiniTest.csproj @@ -10,8 +10,8 @@ - - + +