From 44aaa33dc32aa2c5ccf673a71f270125d71084c1 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Thu, 14 Jun 2018 17:11:43 -0500 Subject: [PATCH] Clean up package dependencies. --- Avalonia.sln | 1 - build/Base.props | 2 +- build/Binding.props | 5 +-- build/Markup.props | 14 ------- build/readme.md | 1 - packages.cake | 41 +++++++------------ .../Avalonia.Markup.Xaml.csproj | 1 - .../Avalonia.Controls.UnitTests.csproj | 4 +- .../Avalonia.Markup.UnitTests.csproj | 1 - 9 files changed, 18 insertions(+), 52 deletions(-) delete mode 100644 build/Markup.props diff --git a/Avalonia.sln b/Avalonia.sln index 54f6f5e7e7..fb5f490e42 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -136,7 +136,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{F3AC8BC1 build\JetBrains.Annotations.props = build\JetBrains.Annotations.props build\JetBrains.dotMemoryUnit.props = build\JetBrains.dotMemoryUnit.props build\Magick.NET-Q16-AnyCPU.props = build\Magick.NET-Q16-AnyCPU.props - build\Markup.props = build\Markup.props build\Microsoft.CSharp.props = build\Microsoft.CSharp.props build\Microsoft.Reactive.Testing.props = build\Microsoft.Reactive.Testing.props build\Moq.props = build\Moq.props diff --git a/build/Base.props b/build/Base.props index 78930156e7..e565ab1664 100644 --- a/build/Base.props +++ b/build/Base.props @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/build/Binding.props b/build/Binding.props index a512ee1d9c..7202294929 100644 --- a/build/Binding.props +++ b/build/Binding.props @@ -1,8 +1,5 @@ - - - - + diff --git a/build/Markup.props b/build/Markup.props deleted file mode 100644 index 5be0cfbf0c..0000000000 --- a/build/Markup.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/build/readme.md b/build/readme.md index aed508a508..694018233b 100644 --- a/build/readme.md +++ b/build/readme.md @@ -4,7 +4,6 @@ - diff --git a/packages.cake b/packages.cake index 7e7e722c82..d3b3f09c7e 100644 --- a/packages.cake +++ b/packages.cake @@ -186,9 +186,9 @@ public class Packages }; }); - var win32CoreLibrariesNuSpecContent = coreLibrariesFiles.Select((file) => { + var netFrameworkCoreLibrariesNuSpecContent = coreLibrariesFiles.Select((file) => { return new NuSpecContent { - Source = file.FullPath, Target = "lib/net45" + Source = file.FullPath, Target = "lib/net461" }; }); @@ -198,10 +198,10 @@ public class Packages }; }); - var net45RuntimePlatform = extensionsToPack.Select(libSuffix => { + var netFrameworkRuntimePlatform = extensionsToPack.Select(libSuffix => { return new NuSpecContent { Source = ((FilePath)context.File("./src/Avalonia.DotNetFrameworkRuntime/bin/" + parameters.DirSuffix + "/net461/Avalonia.DotNetFrameworkRuntime" + libSuffix)).FullPath, - Target = "lib/net45" + Target = "lib/net461" }; }); @@ -233,30 +233,19 @@ public class Packages Id = "Avalonia", Dependencies = new DependencyBuilder(this) { - new NuSpecDependency() { Id = "Serilog", Version = SerilogVersion }, - new NuSpecDependency() { Id = "Serilog.Sinks.Debug", Version = SerilogSinksDebugVersion }, - new NuSpecDependency() { Id = "Serilog.Sinks.Trace", Version = SerilogSinksTraceVersion }, - new NuSpecDependency() { Id = "Sprache", Version = SpracheVersion }, - new NuSpecDependency() { Id = "System.Reactive", Version = SystemReactiveVersion }, - new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", Version = parameters.Version }, - new NuSpecDependency() { Id = "System.ComponentModel.Annotations", Version = SystemComponentModelAnnotationsVersion }, - //.NET Core - new NuSpecDependency() { Id = "System.Threading.ThreadPool", TargetFramework = "netcoreapp2.0", Version = "4.3.0" }, - new NuSpecDependency() { Id = "Microsoft.Extensions.DependencyModel", TargetFramework = "netcoreapp2.0", Version = "1.1.0" }, - new NuSpecDependency() { Id = "NETStandard.Library", TargetFramework = "netcoreapp2.0", Version = "1.6.0" }, - new NuSpecDependency() { Id = "Serilog", TargetFramework = "netcoreapp2.0", Version = SerilogVersion }, - new NuSpecDependency() { Id = "Serilog.Sinks.Debug", TargetFramework = "netcoreapp2.0", Version = SerilogSinksDebugVersion }, - new NuSpecDependency() { Id = "Serilog.Sinks.Trace", TargetFramework = "netcoreapp2.0", Version = SerilogSinksTraceVersion }, - new NuSpecDependency() { Id = "Sprache", TargetFramework = "netcoreapp2.0", Version = SpracheVersion }, - new NuSpecDependency() { Id = "System.Reactive", TargetFramework = "netcoreapp2.0", Version = SystemReactiveVersion }, - new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", TargetFramework = "netcoreapp2.0", Version = parameters.Version }, + new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", Version = parameters.Version, TargetFramework="netstandard2.0" }, + new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", Version = parameters.Version, TargetFramework="netcoreapp2.0" }, + new NuSpecDependency() { Id = "Avalonia.Remote.Protocol", Version = parameters.Version, TargetFramework="net461" }, + new NuSpecDependency() { Id = "System.ValueTuple", Version = SystemValueTupleVersion, TargetFramework="net461" }, + new NuSpecDependency() { Id = "NETStandard.Library", Version = "2.0.0", TargetFramework="net461"}, + new NuSpecDependency() { Id = "NETStandard.Library", Version = "2.0.0", TargetFramework="netcoreapp2.0"} } - .Deps(new string[]{null, "netcoreapp2.0"}, - "System.ValueTuple", "System.ComponentModel.TypeConverter", "System.ComponentModel.Primitives", - "System.Runtime.Serialization.Primitives", "System.Xml.XmlDocument", "System.Xml.ReaderWriter") + .Deps(new string[]{"netstandard2.0", "netcoreapp2.0", "net461"}, + "Serilog", "Serilog.Sinks.Debug", "Serilog.Sinks.Trace", "Sprache", + "System.Reactive", "System.ComponentModel.Annotations") .ToArray(), Files = coreLibrariesNuSpecContent - .Concat(win32CoreLibrariesNuSpecContent).Concat(net45RuntimePlatform) + .Concat(netFrameworkCoreLibrariesNuSpecContent).Concat(netFrameworkRuntimePlatform) .Concat(netcoreappCoreLibrariesNuSpecContent).Concat(netCoreRuntimePlatform) .Concat(toolsContent) .ToList(), @@ -462,7 +451,7 @@ public class Packages }, Files = new [] { - new NuSpecContent { Source = "Avalonia.Win32.Interop/bin/" + parameters.DirSuffix + "/Avalonia.Win32.Interop.dll", Target = "lib/net45" } + new NuSpecContent { Source = "Avalonia.Win32.Interop/bin/" + parameters.DirSuffix + "/Avalonia.Win32.Interop.dll", Target = "lib/net461" } }, BasePath = context.Directory("./src/Windows"), OutputDirectory = parameters.NugetRoot diff --git a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj index 9260a0c9a2..3a5135ab92 100644 --- a/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj +++ b/src/Markup/Avalonia.Markup.Xaml/Avalonia.Markup.Xaml.csproj @@ -77,6 +77,5 @@ - \ No newline at end of file diff --git a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj index 3706a50525..b418d56fcd 100644 --- a/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj +++ b/tests/Avalonia.Controls.UnitTests/Avalonia.Controls.UnitTests.csproj @@ -9,9 +9,7 @@ - - - + diff --git a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj index 3307b807ea..1680ecf798 100644 --- a/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj +++ b/tests/Avalonia.Markup.UnitTests/Avalonia.Markup.UnitTests.csproj @@ -8,7 +8,6 @@ -