Merge branch 'release/0.11.0'

.appveyor.yml

@@ -1,3 +1,8 @@
+#---------------------------------#
+#  Build Image                    #
+#---------------------------------#
+image: Visual Studio 2017
+
 #---------------------------------#
 #  Build Script                   #
 #---------------------------------#

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "1.0.4"
+    "version": "2.1.400"
   }
 }

nuspec/nuget/Cake.Gulp.nuspec

@@ -13,11 +13,14 @@
     <summary>Adds Gulp helpers for Cake</summary>
     <description>A set of aliases for Cake to help with running Gulp scripts as part of a build</description>
     <tags>Cake Script Build Gulp</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Gulp/releases/tag/0.10.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Gulp/releases/tag/0.11.0</releaseNotes>
   </metadata>
   <files>
-    <file src="net46\Cake.Gulp.dll" target="lib\net46" />
-    <file src="net46\Cake.Gulp.pdb" target="lib\net46" />
-    <file src="net46\Cake.Gulp.xml" target="lib\net46" />
+    <file src="net461\Cake.Gulp.dll" target="lib\net461" />
+    <file src="net461\Cake.Gulp.pdb" target="lib\net461" />
+    <file src="net461\Cake.Gulp.xml" target="lib\net461" />
+    <file src="netstandard2.0\Cake.Gulp.dll" target="lib\netstandard2.0" />
+    <file src="netstandard2.0\Cake.Gulp.pdb" target="lib\netstandard2.0" />
+    <file src="netstandard2.0\Cake.Gulp.xml" target="lib\netstandard2.0" />
   </files>
 </package>

src/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj

@@ -1,26 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeFrameworkVersion>2.0.5</RuntimeFrameworkVersion>
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs" Link="SolutionInfo.cs" />
+    <PackageReference Include="Cake.Core" Version="0.28.0" />
+    <PackageReference Include="Cake.Testing" Version="0.28.0" />
+    <PackageReference Include="Shouldly" Version="3.0.1" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Testing" Version="0.28.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="15.3.0" />
-    <PackageReference Include="Shouldly" Version="2.8.3" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <Compile Include="..\SolutionInfo.cs" Link="SolutionInfo.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Cake.Gulp\Cake.Gulp.csproj" />
+    <ProjectReference Include="..\Cake.Gulp\Cake.Gulp.csproj" />
   </ItemGroup>
 
 </Project>

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");
 

src/Cake.Gulp.sln

@@ -1,28 +1,31 @@
 
 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
 		Debug|Any CPU = Debug|Any CPU
 		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

src/Cake.Gulp/Cake.Gulp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <AssemblyName>Cake.Gulp</AssemblyName>
     <RootNamespace>Cake.Gulp</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -10,16 +10,15 @@
     <DebugType>portable</DebugType>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\net46\Cake.Gulp.xml</DocumentationFile>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DocumentationFile>bin\Debug\$(TargetFramework)\Cake.Gulp.xml</DocumentationFile>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\net46\Cake.Gulp.xml</DocumentationFile>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\$(TargetFramework)\Cake.Gulp.xml</DocumentationFile>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs" Link="SolutionInfo.cs" />
+  <ItemGroup>
+    <Compile Include="..\SolutionInfo.cs" Link="SolutionInfo.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,4 +27,4 @@
     </PackageReference>
   </ItemGroup>
 
-</Project>
+</Project>