Merge branch 'release/0.17.0'

cake-contrib · Apr 22, 2019 · 646de43 · 646de43
2 parents d23715b + 109c8cc
commit 646de43
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 23 deletions.
diff --git a/nuspec/nuget/Cake.Npm.nuspec b/nuspec/nuget/Cake.Npm.nuspec
@@ -8,12 +8,13 @@
     <owners>philo, pascalberger, cake-contrib</owners>
     <summary>A set of aliases for Cake to help with running Npm (Node Package Manager) commands</summary>
     <description>A set of aliases for Cake to help with running Npm (Node Package Manager) commands</description>
-    <licenseUrl>https://github.com/cake-contrib/cake-npm/blob/master/LICENSE</licenseUrl>
+    <license type="expression">MIT</license>
     <projectUrl>https://github.com/cake-contrib/cake-npm</projectUrl>
     <iconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics@a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <repository type="git" url="https://github.com/cake-contrib/Cake.Npm"/>
     <tags>cake npm cake-build cake-contrib</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Npm/releases/tag/0.16.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Npm/releases/tag/0.17.0</releaseNotes>
   </metadata>
   <files>
     <file src="netstandard2.0\Cake.Npm.dll" target="lib\netstandard2.0" />

diff --git a/setup.cake b/setup.cake
@@ -3,7 +3,7 @@
 Environment.SetVariableNames();
 
 BuildParameters.SetParameters(
-    context: Context, 
+    context: Context,
     buildSystem: BuildSystem,
     sourceDirectoryPath: "./src",
     title: "Cake.Npm",
@@ -18,7 +18,7 @@ BuildParameters.PrintParameters(Context);
 ToolSettings.SetToolSettings(
     context: Context,
     dupFinderExcludePattern: new string[] { BuildParameters.RootDirectoryPath + "/src/Cake.Npm.Tests/*.cs", BuildParameters.RootDirectoryPath + "/src/Cake.Npm*/**/*.AssemblyInfo.cs" },
-    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
+    testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Shouldly]*",
     testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
     testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 

diff --git a/src/Cake.Npm.Tests/Cake.Npm.Tests.csproj b/src/Cake.Npm.Tests/Cake.Npm.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>    
+  <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
@@ -10,12 +10,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.28.0" />
-    <PackageReference Include="Cake.Testing" Version="0.28.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="Shouldly" Version="3.0.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Cake.Core" Version="0.33.0" />
+    <PackageReference Include="Cake.Testing" Version="0.33.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Cake.Npm/Cake.Npm.csproj b/src/Cake.Npm/Cake.Npm.csproj
@@ -10,17 +10,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageId>Cake.Npm</PackageId>
     <Authors>Phil Oyston, Pascal Berger, Cake-Contrib</Authors>
     <Company>Cake-Contrib</Company>
     <Description>A set of aliases for Cake to help with running Npm (Node Package Manager) commands</Description>
-    <PackageIconUrl>https://cdn.rawgit.com/cake-contrib/graphics/a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/cake-contrib/cake-npm</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/cake-contrib/cake-npm/blob/master/LICENSE</PackageLicenseUrl>
-    <PackageTags>cake npm cake-build cake-contrib</PackageTags>
-    <IncludeSymbols>true</IncludeSymbols>
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -29,8 +21,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.28.0">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Cake.Core" Version="0.33.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/tools/packages.config b/tools/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-    <package id="Cake" version="0.30.0" />
+    <package id="Cake" version="0.32.1" />
 </packages>