From 7966e8c0c738c077730a585ff652eb4b12edd0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Sun, 2 Apr 2017 13:06:50 +0200 Subject: [PATCH 1/3] Added Avalonia.LinuxFramebuffer NuGet package --- packages.cake | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/packages.cake b/packages.cake index c3d0eb0bab..b4b08f886f 100644 --- a/packages.cake +++ b/packages.cake @@ -460,6 +460,29 @@ public class Packages }, BasePath = context.Directory("./"), OutputDirectory = parameters.NugetRoot + }, + /////////////////////////////////////////////////////////////////////////////// + // Avalonia.LinuxFramebuffer + /////////////////////////////////////////////////////////////////////////////// + new NuGetPackSettings() + { + Id = "Avalonia.LinuxFramebuffer", + Dependencies = new [] + { + new NuSpecDependency() { Id = "Avalonia", Version = parameters.Version }, + new NuSpecDependency() { Id = "Avalonia.Skia.Desktop", Version = parameters.Version }, + //netstandard1.3 + new NuSpecDependency() { Id = "Avalonia", TargetFramework = "netstandard1.3", Version = parameters.Version }, + new NuSpecDependency() { Id = "Avalonia.Skia.Desktop", TargetFramework = "netstandard1.3", Version = parameters.Version }, + new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netstandard1.3", Version = "1.6.0" }, + new NuSpecDependency() { Id = "Microsoft.NETCore.Portable.Compatibility", TargetFramework = "netstandard1.3", Version = "1.0.1" } + }, + Files = new [] + { + new NuSpecContent { Source = "Avalonia.LinuxFramebuffer/bin/" + parameters.DirSuffix + "/netstandard1.3/Avalonia.LinuxFramebuffer.dll", Target = "lib/netstandard1.3" } + }, + BasePath = context.Directory("./src/Linux/"), + OutputDirectory = parameters.NugetRoot } }; From bd2b35cc42f9eb7db30d2ecc7a9d9c0a40aee70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Sun, 2 Apr 2017 20:28:37 +0200 Subject: [PATCH 2/3] Remove unnecessary package dependencies --- packages.cake | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages.cake b/packages.cake index b4b08f886f..eb7defce7f 100644 --- a/packages.cake +++ b/packages.cake @@ -198,7 +198,6 @@ public class Packages new NuSpecDependency() { Id = "System.Threading.ThreadPool", TargetFramework = "netcoreapp1.0", Version = "4.3.0" }, new NuSpecDependency() { Id = "Microsoft.Extensions.DependencyModel", TargetFramework = "netcoreapp1.0", Version = "1.1.0" }, new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netcoreapp1.0", Version = "1.6.0" }, - new NuSpecDependency() { Id = "Microsoft.NETCore.Portable.Compatibility", TargetFramework = "netcoreapp1.0", Version = "1.0.1" }, new NuSpecDependency() { Id = "Splat", TargetFramework = "netcoreapp1.0", Version = SplatVersion }, new NuSpecDependency() { Id = "Serilog", TargetFramework = "netcoreapp1.0", Version = SerilogVersion }, new NuSpecDependency() { Id = "Sprache", TargetFramework = "netcoreapp1.0", Version = SpracheVersion }, @@ -429,8 +428,7 @@ public class Packages //netstandard1.3 new NuSpecDependency() { Id = "Avalonia", TargetFramework = "netstandard1.3", Version = parameters.Version }, new NuSpecDependency() { Id = "SkiaSharp", TargetFramework = "netstandard1.3", Version = SkiaSharpVersion }, - new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netstandard1.3", Version = "1.6.0" }, - new NuSpecDependency() { Id = "Microsoft.NETCore.Portable.Compatibility", TargetFramework = "netstandard1.3", Version = "1.0.1" } + new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netstandard1.3", Version = "1.6.0" } }, Files = new [] { @@ -473,9 +471,7 @@ public class Packages new NuSpecDependency() { Id = "Avalonia.Skia.Desktop", Version = parameters.Version }, //netstandard1.3 new NuSpecDependency() { Id = "Avalonia", TargetFramework = "netstandard1.3", Version = parameters.Version }, - new NuSpecDependency() { Id = "Avalonia.Skia.Desktop", TargetFramework = "netstandard1.3", Version = parameters.Version }, - new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netstandard1.3", Version = "1.6.0" }, - new NuSpecDependency() { Id = "Microsoft.NETCore.Portable.Compatibility", TargetFramework = "netstandard1.3", Version = "1.0.1" } + new NuSpecDependency() { Id = "Avalonia.Skia.Desktop", TargetFramework = "netstandard1.3", Version = parameters.Version } }, Files = new [] { From cc4150db28943e505d3e8125d73cfad21e3fcc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Mon, 3 Apr 2017 00:21:50 +0200 Subject: [PATCH 3/3] Removed duplicate dependencies --- packages.cake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages.cake b/packages.cake index eb7defce7f..f030c73a06 100644 --- a/packages.cake +++ b/packages.cake @@ -468,10 +468,7 @@ public class Packages Dependencies = new [] { new NuSpecDependency() { Id = "Avalonia", Version = parameters.Version }, - new NuSpecDependency() { Id = "Avalonia.Skia.Desktop", Version = parameters.Version }, - //netstandard1.3 - new NuSpecDependency() { Id = "Avalonia", TargetFramework = "netstandard1.3", Version = parameters.Version }, - new NuSpecDependency() { Id = "Avalonia.Skia.Desktop", TargetFramework = "netstandard1.3", Version = parameters.Version } + new NuSpecDependency() { Id = "Avalonia.Skia.Desktop", Version = parameters.Version } }, Files = new [] {