diff --git a/build.cake b/build.cake index 2d388006..12119f40 100644 --- a/build.cake +++ b/build.cake @@ -151,6 +151,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/"); CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.watchOS/bin/Release/SkiaSharp.Views.watchOS.dll", "./output/watchos/"); + CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.Gtk/bin/Release/SkiaSharp.Views.Gtk.dll", "./output/gtk/"); // SkiaSharp.Views.Forms 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/"); @@ -158,6 +159,8 @@ Task ("libs") } else if (IsRunningOnLinux ()) { RunNuGetRestore ("./source/SkiaSharpSource.Linux.sln"); RunMSBuild ("./source/SkiaSharpSource.Linux.sln"); + // SkiaSharp.Views + CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.Gtk/bin/Release/SkiaSharp.Views.Gtk.dll", "./output/gtk/"); } // SkiaSharp CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.dll", "./output/desktop/"); @@ -166,7 +169,6 @@ Task ("libs") CopyFileToDirectory ("./binding/SkiaSharp.Portable/bin/Release/SkiaSharp.dll", "./output/portable/"); // SkiaSharp.Views CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.Desktop/bin/Release/SkiaSharp.Views.Desktop.dll", "./output/desktop/"); - CopyFileToDirectory ("./source/SkiaSharp.Views/SkiaSharp.Views.Gtk/bin/Release/SkiaSharp.Views.Gtk.dll", "./output/gtk/"); // SkiaSharp.Views.Forms CopyFileToDirectory ("./source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/bin/Release/SkiaSharp.Views.Forms.dll", "./output/portable/"); // HarfBuzzSharp @@ -400,7 +402,6 @@ Task ("update-docs") if (IsRunningOnWindows ()) { assemblies = assemblies.Union (new FilePath [] { "./output/desktop/SkiaSharp.Views.Desktop.dll", - "./output/gtk/SkiaSharp.Views.Gtk.dll", "./output/wpf/SkiaSharp.Views.WPF.dll", "./output/android/SkiaSharp.Views.Android.dll", "./output/ios/SkiaSharp.Views.iOS.dll", diff --git a/nuget/SkiaSharp.Views.Windows.nuspec b/nuget/SkiaSharp.Views.Windows.nuspec index 503fe8ca..aadc5193 100644 --- a/nuget/SkiaSharp.Views.Windows.nuspec +++ b/nuget/SkiaSharp.Views.Windows.nuspec @@ -22,8 +22,6 @@ - - diff --git a/source/SkiaSharpSource.Windows.sln b/source/SkiaSharpSource.Windows.sln index 38cc5291..c105ab3a 100644 --- a/source/SkiaSharpSource.Windows.sln +++ b/source/SkiaSharpSource.Windows.sln @@ -55,8 +55,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Workbooks", "Skia EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HarfBuzzSharp.UWP", "..\binding\HarfBuzzSharp.UWP\HarfBuzzSharp.UWP.csproj", "{6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkiaSharp.Views.Gtk", "SkiaSharp.Views\SkiaSharp.Views.Gtk\SkiaSharp.Views.Gtk.csproj", "{67A502A4-E8B2-419A-811E-5A634B29C8D7}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution SkiaSharp.Views.Forms\SkiaSharp.Views.Forms.Shared\SkiaSharp.Views.Forms.Shared.projitems*{1555d119-8598-4e4d-91ac-d313f94a1673}*SharedItemsImports = 4 @@ -138,10 +136,6 @@ Global {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 {6D1E1F39-EF70-4211-A518-BBBAF02D6FFF}.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 - {67A502A4-E8B2-419A-811E-5A634B29C8D7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -167,7 +161,6 @@ Global {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} - {67A502A4-E8B2-419A-811E-5A634B29C8D7} = {F19E1537-81B2-4D4F-A69E-78DC73ACC141} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {63A8C36E-4917-46DB-9AAD-522B8EC00C23}