diff --git a/build.cake b/build.cake index 02f1f54f..8fec89b7 100644 --- a/build.cake +++ b/build.cake @@ -24,10 +24,14 @@ Task("Build") { var settings = new DotNetCoreBuildSettings { - Framework = "netcoreapp2.0", + Framework = "netstandard1.0", Configuration = "Release" }; - DotNetCoreBuild("./tests/SharpCompress.Test/SharpCompress.Test.csproj", settings); + + DotNetCoreBuild("./src/SharpCompress/SharpCompress.csproj", settings); + + settings.Framework = "netstandard2.0"; + DotNetCoreBuild("./src/SharpCompress/SharpCompress.csproj", settings); } }); @@ -35,19 +39,16 @@ Task("Test") .IsDependentOn("Build") .Does(() => { - if (!bool.Parse(EnvironmentVariable("APPVEYOR") ?? "false") - && !bool.Parse(EnvironmentVariable("TRAVIS") ?? "false")) + var files = GetFiles("tests/**/*.csproj"); + foreach(var file in files) { - var files = GetFiles("tests/**/*.csproj"); - foreach(var file in files) + var settings = new DotNetCoreTestSettings { - var settings = new DotNetCoreTestSettings - { - Configuration = "Release", - Framework = "netcoreapp2.0" - }; + Configuration = "Release", + Framework = "netcoreapp2.0" + }; - DotNetCoreTest(file.ToString(), settings); + DotNetCoreTest(file.ToString(), settings); settings = new DotNetCoreTestSettings @@ -57,11 +58,6 @@ Task("Test") }; DotNetCoreTest(file.ToString(), settings); - } - } - else - { - Information("Skipping tests as this is AppVeyor or Travis CI"); } }); diff --git a/src/SharpCompress/SharpCompress.csproj b/src/SharpCompress/SharpCompress.csproj index a8669110..7892a43b 100644 --- a/src/SharpCompress/SharpCompress.csproj +++ b/src/SharpCompress/SharpCompress.csproj @@ -6,7 +6,7 @@ 0.18.2.0 0.18.2.0 Adam Hathcock - net45;net35;netstandard2.0 + net45;net35;netstandard1.0;netstandard2.0 true true SharpCompress @@ -21,4 +21,7 @@ false SharpCompress is a compression library for NET Standard 1.0 that can unrar, decompress 7zip, decompress xz, zip/unzip, tar/untar lzip/unlzip, bzip2/unbzip2 and gzip/ungzip with forward-only reading and file random access APIs. Write support for zip/tar/bzip2/gzip is implemented. + + $(DefineConstants);NO_FILE;NO_CRYPTO;SILVERLIGHT + \ No newline at end of file diff --git a/tests/SharpCompress.Test/SharpCompress.Test.csproj b/tests/SharpCompress.Test/SharpCompress.Test.csproj index 8dbcecb1..a8651e7c 100644 --- a/tests/SharpCompress.Test/SharpCompress.Test.csproj +++ b/tests/SharpCompress.Test/SharpCompress.Test.csproj @@ -1,6 +1,6 @@  - netcoreapp1.1;netcoreapp2.0 + netcoreapp2.0 SharpCompress.Test ../../SharpCompress.snk true