diff --git a/.appveyor.yml b/.appveyor.yml
index 42efe35..2b5f541 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,3 +1,8 @@
+#---------------------------------#
+# Build Image #
+#---------------------------------#
+image: Visual Studio 2017
+
#---------------------------------#
# Build Script #
#---------------------------------#
diff --git a/global.json b/global.json
index f992be3..c0dbd1a 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "1.0.4"
+ "version": "2.1.400"
}
}
\ No newline at end of file
diff --git a/nuspec/nuget/Cake.Gulp.nuspec b/nuspec/nuget/Cake.Gulp.nuspec
index 9c555e1..9e16f3e 100644
--- a/nuspec/nuget/Cake.Gulp.nuspec
+++ b/nuspec/nuget/Cake.Gulp.nuspec
@@ -13,11 +13,14 @@
Adds Gulp helpers for Cake
A set of aliases for Cake to help with running Gulp scripts as part of a build
Cake Script Build Gulp
- https://github.com/cake-contrib/Cake.Gulp/releases/tag/0.10.0
+ https://github.com/cake-contrib/Cake.Gulp/releases/tag/0.11.0
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj b/src/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj
index 58c7da0..ef2da73 100644
--- a/src/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj
+++ b/src/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj
@@ -1,26 +1,26 @@

- net46
+ netcoreapp2.0
+ 2.0.5
false
false
-
+
+
+
+
+
-
-
-
-
-
-
+
-
+
diff --git a/src/Cake.Gulp.Tests/GulpGlobalRunnerTests.cs b/src/Cake.Gulp.Tests/GulpGlobalRunnerTests.cs
index ae95eda..3fc13e3 100644
--- a/src/Cake.Gulp.Tests/GulpGlobalRunnerTests.cs
+++ b/src/Cake.Gulp.Tests/GulpGlobalRunnerTests.cs
@@ -27,7 +27,7 @@ public void Install_Settings_With_Gulp_File_Should_Add_Gulpfile_Argument()
}
[Fact]
- public void Install_Settings_With_Gulp_File_Ánd_Arguments_Should_Add_Gulp_File_And_Additional_Arguments()
+ public void Install_Settings_With_Gulp_File_And_Arguments_Should_Add_Gulp_File_And_Additional_Arguments()
{
this.fixture.InstallSettings = s => s.WithGulpFile(this.gulpFile).WithArguments("--production");
diff --git a/src/Cake.Gulp.Tests/Properties/AssemblyInfo.cs b/src/Cake.Gulp.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8f798c6..0000000
--- a/src/Cake.Gulp.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Cake.Gulp.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
diff --git a/src/Cake.Gulp.Tests/packages.config b/src/Cake.Gulp.Tests/packages.config
deleted file mode 100644
index d6149ef..0000000
--- a/src/Cake.Gulp.Tests/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Cake.Gulp.sln b/src/Cake.Gulp.sln
index 4db1594..bf6bcf3 100644
--- a/src/Cake.Gulp.sln
+++ b/src/Cake.Gulp.sln
@@ -1,11 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.0
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Gulp", "Cake.Gulp\Cake.Gulp.csproj", "{E10A12F5-7090-4E91-A1AA-F867BDA8A542}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Gulp", "Cake.Gulp\Cake.Gulp.csproj", "{F0492369-BA63-4F0C-B90C-98A972918852}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Gulp.Tests", "Cake.Gulp.Tests\Cake.Gulp.Tests.csproj", "{B24B179E-E3C3-4DF2-90B2-98A7248DEA33}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.Gulp.Tests", "Cake.Gulp.Tests\Cake.Gulp.Tests.csproj", "{402AB8B5-1236-4432-841A-94DFC56D56FB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,16 +13,19 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E10A12F5-7090-4E91-A1AA-F867BDA8A542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E10A12F5-7090-4E91-A1AA-F867BDA8A542}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E10A12F5-7090-4E91-A1AA-F867BDA8A542}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E10A12F5-7090-4E91-A1AA-F867BDA8A542}.Release|Any CPU.Build.0 = Release|Any CPU
- {B24B179E-E3C3-4DF2-90B2-98A7248DEA33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B24B179E-E3C3-4DF2-90B2-98A7248DEA33}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B24B179E-E3C3-4DF2-90B2-98A7248DEA33}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B24B179E-E3C3-4DF2-90B2-98A7248DEA33}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F0492369-BA63-4F0C-B90C-98A972918852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F0492369-BA63-4F0C-B90C-98A972918852}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F0492369-BA63-4F0C-B90C-98A972918852}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F0492369-BA63-4F0C-B90C-98A972918852}.Release|Any CPU.Build.0 = Release|Any CPU
+ {402AB8B5-1236-4432-841A-94DFC56D56FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {402AB8B5-1236-4432-841A-94DFC56D56FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {402AB8B5-1236-4432-841A-94DFC56D56FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {402AB8B5-1236-4432-841A-94DFC56D56FB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {FFC52CB6-6ECE-44DA-A533-7D1F346B41FD}
+ EndGlobalSection
EndGlobal
diff --git a/src/Cake.Gulp/Cake.Gulp.csproj b/src/Cake.Gulp/Cake.Gulp.csproj
index eeba398..a6c8e87 100644
--- a/src/Cake.Gulp/Cake.Gulp.csproj
+++ b/src/Cake.Gulp/Cake.Gulp.csproj
@@ -1,7 +1,7 @@

- net46
+ net461;netstandard2.0
Cake.Gulp
Cake.Gulp
false
@@ -10,16 +10,15 @@
portable
-
- bin\Debug\net46\Cake.Gulp.xml
+
+ bin\Debug\$(TargetFramework)\Cake.Gulp.xml
-
-
- bin\Release\net46\Cake.Gulp.xml
+
+ bin\Release\$(TargetFramework)\Cake.Gulp.xml
-
-
+
+
@@ -28,4 +27,4 @@
-
\ No newline at end of file
+
diff --git a/tests/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj b/tests/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj
deleted file mode 100644
index b8fb833..0000000
--- a/tests/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
- net46;netstandard1.6
- false
- false
- false
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/Cake.Gulp.Tests/Cake.Gulp.Tests.netstandard1.6.v3.ncrunchproject b/tests/Cake.Gulp.Tests/Cake.Gulp.Tests.netstandard1.6.v3.ncrunchproject
deleted file mode 100644
index eacd190..0000000
--- a/tests/Cake.Gulp.Tests/Cake.Gulp.Tests.netstandard1.6.v3.ncrunchproject
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tests/Cake.Gulp.Tests/GulpGlobalRunnerFixture.cs b/tests/Cake.Gulp.Tests/GulpGlobalRunnerFixture.cs
deleted file mode 100644
index 4e739aa..0000000
--- a/tests/Cake.Gulp.Tests/GulpGlobalRunnerFixture.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-
-using Cake.Testing.Fixtures;
-
-namespace Cake.Gulp.Tests {
- public class GulpGlobalRunnerFixture : ToolFixture {
- public GulpGlobalRunnerFixture() : base("gulp") { }
-
- public Action InstallSettings { get; set; }
-
- protected override void RunTool() {
- var tool = new GulpGlobalRunner(FileSystem, Environment, ProcessRunner, Tools);
- tool.Execute(InstallSettings);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/Cake.Gulp.Tests/GulpGlobalRunnerTests.cs b/tests/Cake.Gulp.Tests/GulpGlobalRunnerTests.cs
deleted file mode 100644
index ae95eda..0000000
--- a/tests/Cake.Gulp.Tests/GulpGlobalRunnerTests.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using Cake.Testing;
-
-using Shouldly;
-
-using Xunit;
-
-namespace Cake.Gulp.Tests {
- public class GulpGlobalRunnerTests {
- private readonly GulpGlobalRunnerFixture fixture;
- private readonly string gulpFile;
-
- public GulpGlobalRunnerTests()
- {
- this.fixture = new GulpGlobalRunnerFixture();
- this.gulpFile = "../gulpfile.js";
- this.fixture.FileSystem.CreateFile(this.gulpFile);
- }
-
- [Fact]
- public void Install_Settings_With_Gulp_File_Should_Add_Gulpfile_Argument()
- {
- this.fixture.InstallSettings = s => s.WithGulpFile(this.gulpFile);
-
- var result = this.fixture.Run();
-
- result.Args.ShouldBe("--gulpfile \"../gulpfile.js\"");
- }
-
- [Fact]
- public void Install_Settings_With_Gulp_File_Ánd_Arguments_Should_Add_Gulp_File_And_Additional_Arguments()
- {
- this.fixture.InstallSettings = s => s.WithGulpFile(this.gulpFile).WithArguments("--production");
-
- var result = this.fixture.Run();
-
- result.Args.ShouldBe("--gulpfile \"../gulpfile.js\" --production");
- }
-
- [Fact]
- public void No_Install_Settings_Specified_Should_Execute_Command_Without_Arguments()
- {
- this.fixture.InstallSettings = null;
-
- var result = this.fixture.Run();
-
- result.Args.ShouldBe("");
- }
- }
-}
\ No newline at end of file
diff --git a/tests/Cake.Gulp.Tests/GulpLocalRunnerFixture.cs b/tests/Cake.Gulp.Tests/GulpLocalRunnerFixture.cs
deleted file mode 100644
index e93f916..0000000
--- a/tests/Cake.Gulp.Tests/GulpLocalRunnerFixture.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-
-using Cake.Testing.Fixtures;
-
-namespace Cake.Gulp.Tests {
- public class GulpLocalRunnerFixture : ToolFixture
- {
- public GulpLocalRunnerFixture() : base("node") {}
-
- public Action InstallSettings { get; set; }
-
- protected override void RunTool()
- {
- var tool = new GulpLocalRunner(FileSystem, Environment, ProcessRunner, Tools);
- tool.Execute(InstallSettings);
- }
- }
-}
\ No newline at end of file
diff --git a/tests/Cake.Gulp.Tests/GulpLocalRunnerTests.cs b/tests/Cake.Gulp.Tests/GulpLocalRunnerTests.cs
deleted file mode 100644
index b95b964..0000000
--- a/tests/Cake.Gulp.Tests/GulpLocalRunnerTests.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using Cake.Testing;
-using Shouldly;
-using Xunit;
-
-namespace Cake.Gulp.Tests {
- public class GulpLocalRunnerTests {
- private readonly GulpLocalRunnerFixture _fixture;
- private readonly string _gulpFile;
-
- public GulpLocalRunnerTests()
- {
- this._fixture = new GulpLocalRunnerFixture();
- this._gulpFile = "gulpfile.js";
- const string pathToGulpJs = "node_modules/gulp/bin/gulp.js";
- this._fixture.FileSystem.CreateFile(pathToGulpJs);
- this._fixture.FileSystem.CreateFile("/Working/" +pathToGulpJs);
- this._fixture.FileSystem.CreateFile("/abc");
- this._fixture.FileSystem.CreateFile(this._gulpFile);
- this._fixture.FileSystem.CreateFile("path-to-gulp/gulp.js");
- }
-
- [Fact]
- public void Install_Settings_With_Gulp_File_Should_Add_Gulpfile_Argument()
- {
- this._fixture.InstallSettings = s => s.WithGulpFile(this._gulpFile);
-
- var result = this._fixture.Run();
-
- result.Args.ShouldBe("\"node_modules/gulp/bin/gulp.js\" --gulpfile \"gulpfile.js\"");
- }
-
- [Fact]
- public void No_Install_Settings_Specified_Should_Execute_Command_Without_Arguments()
- {
- this._fixture.InstallSettings = null;
-
- var result = this._fixture.Run();
-
- result.Args.ShouldBe("\"node_modules/gulp/bin/gulp.js\"");
- }
-
- [Fact]
- public void Custom_Gulp_Path()
- {
- this._fixture.InstallSettings = s => s.SetPathToGulpJs("path-to-gulp/gulp.js");
- var result = this._fixture.Run();
-
- result.Args.ShouldBe("\"path-to-gulp/gulp.js\"");
- }
- }
-}
\ No newline at end of file