From 4b3f33f012b2a9111e2cbe20ea0afbd757482125 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 24 Jun 2017 02:17:26 +0400 Subject: [PATCH] we don't need to build forms on linux, yet. --- build.cake | 4 ++-- source/SkiaSharpSource.Linux.sln | 14 -------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/build.cake b/build.cake index e4ef75fe..967a36a7 100644 --- a/build.cake +++ b/build.cake @@ -142,6 +142,7 @@ Task ("libs") CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.Desktop/bin/Release/SkiaSharp.Views.Desktop.dll", "./output/windows/"); CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.WPF/bin/Release/SkiaSharp.Views.WPF.dll", "./output/windows/"); // SkiaSharp.Views.Forms + CopyFileToDirectory ("./source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/bin/Release/SkiaSharp.Views.Forms.dll", "./output/portable/"); CopyFileToDirectory ("./source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/bin/Release/SkiaSharp.Views.Forms.dll", "./output/uwp/"); } else if (IsRunningOnMac ()) { RunNuGetRestore ("binding/SkiaSharp.Mac.sln"); @@ -168,6 +169,7 @@ Task ("libs") CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.Mac/bin/Release/SkiaSharp.Views.Mac.dll", "./output/osx/"); CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.tvOS/bin/Release/SkiaSharp.Views.tvOS.dll", "./output/tvos/"); // SkiaSharp.Views.Forms + CopyFileToDirectory ("./source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/bin/Release/SkiaSharp.Views.Forms.dll", "./output/portable/"); CopyFileToDirectory ("./source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/bin/Release/SkiaSharp.Views.Forms.dll", "./output/android/"); CopyFileToDirectory ("./source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/bin/Release/SkiaSharp.Views.Forms.dll", "./output/ios/"); CopyFileToDirectory ("./source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/bin/Release/SkiaSharp.Views.Forms.dll", "./output/osx/"); @@ -179,8 +181,6 @@ Task ("libs") CopyFileToDirectory ("./binding/SkiaSharp.Portable/bin/Release/SkiaSharp.dll", "./output/portable/"); // HarfBuzzSharp CopyFileToDirectory ("./binding/HarfBuzzSharp.Portable/bin/Release/HarfBuzzSharp.dll", "./output/portable/"); - // SkiaSharp.Views.Forms - CopyFileToDirectory ("./source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/bin/Release/SkiaSharp.Views.Forms.dll", "./output/portable/"); // SkiaSharp.HarfBuzz CopyFileToDirectory ("./source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/bin/Release/SkiaSharp.HarfBuzz.dll", "./output/portable/"); // SkiaSharp.Workbooks diff --git a/source/SkiaSharpSource.Linux.sln b/source/SkiaSharpSource.Linux.sln index 45154497..4e565248 100644 --- a/source/SkiaSharpSource.Linux.sln +++ b/source/SkiaSharpSource.Linux.sln @@ -21,16 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Workbooks", "Skia EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Workbooks", "SkiaSharp.Workbooks\SkiaSharp.Workbooks.csproj", "{89736865-5272-4A42-A7FB-D802C6345502}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SkiaSharp.Views.Forms", "SkiaSharp.Views.Forms", "{653002F7-1D82-4A1A-B5BC-9EC83C16C886}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Forms", "SkiaSharp.Views.Forms\SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.csproj", "{1555D119-8598-4E4D-91AC-D313F94A1673}" -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 Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Shared\SkiaSharp.Views.Forms.Shared.projitems*{1555d119-8598-4e4d-91ac-d313f94a1673}*SharedItemsImports = 4 - SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Shared\SkiaSharp.Views.Forms.Shared.projitems*{314fb505-9858-4e03-b799-91b0ba627d05}*SharedItemsImports = 13 SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.projitems*{7cad1912-05a5-42e5-b7ba-81bb051f0566}*SharedItemsImports = 4 SkiaSharp.HarfBuzz\SkiaSharp.HarfBuzz.Shared\SkiaSharp.HarfBuzz.Shared.projitems*{c3e63b2d-95d4-4c3f-b10f-7a0aacf94980}*SharedItemsImports = 13 EndGlobalSection @@ -55,10 +47,6 @@ Global {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 - {1555D119-8598-4E4D-91AC-D313F94A1673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1555D119-8598-4E4D-91AC-D313F94A1673}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -69,7 +57,5 @@ Global {C3E63B2D-95D4-4C3F-B10F-7A0AACF94980} = {87D751FF-6347-40FF-8EC5-7CAD06BD5973} {7CAD1912-05A5-42E5-B7BA-81BB051F0566} = {87D751FF-6347-40FF-8EC5-7CAD06BD5973} {89736865-5272-4A42-A7FB-D802C6345502} = {DF72A8D3-0A12-49C9-BBD2-4ACC9EB1A544} - {1555D119-8598-4E4D-91AC-D313F94A1673} = {653002F7-1D82-4A1A-B5BC-9EC83C16C886} - {314FB505-9858-4E03-B799-91B0BA627D05} = {653002F7-1D82-4A1A-B5BC-9EC83C16C886} EndGlobalSection EndGlobal