Merge branch 'release/2.0.0'

.appveyor.yml

@@ -1,15 +1,25 @@
 #---------------------------------#
 #  Build Image                    #
 #---------------------------------#
-image: Visual Studio 2017
+image: Visual Studio 2022
 
 #---------------------------------#
-#  Build Script                   #
+#  Install .NET                   #
 #---------------------------------#
 install:
-  # Update to latest NuGet version since we require 5.3.0 for embedded icon
-  - ps: nuget update -self
+  - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
+  - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
+  - ps: Invoke-WebRequest -Uri "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 2.1.818 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 3.1.414 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 5.0.402 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version 6.0.100 -InstallDir $env:DOTNET_INSTALL_DIR'
+  - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
+  - ps: dotnet --info
 
+#---------------------------------#
+#  Build Script                   #
+#---------------------------------#
 build_script:
   - ps: .\build.ps1 -Target AppVeyor
 

nuspec/nuget/Cake.Npm.nuspec

@@ -13,13 +13,19 @@
     <icon>icon.png</icon>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <repository type="git" url="https://github.com/cake-contrib/Cake.Npm.git"/>
-    <tags>cake npm cake-build cake-contrib</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Npm/releases/tag/1.0.0</releaseNotes>
+    <tags>cake npm cake-addin cake-build cake-contrib</tags>
+    <releaseNotes>https://github.com/cake-contrib/Cake.Npm/releases/tag/2.0.0</releaseNotes>
   </metadata>
   <files>
     <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <file src="netstandard2.0\Cake.Npm.dll" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Npm.pdb" target="lib\netstandard2.0" />
-    <file src="netstandard2.0\Cake.Npm.xml" target="lib\netstandard2.0" />
+    <file src="netcoreapp3.1\Cake.Npm.dll" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Npm.pdb" target="lib\netcoreapp3.1" />
+    <file src="netcoreapp3.1\Cake.Npm.xml" target="lib\netcoreapp3.1" />
+    <file src="net5.0\Cake.Npm.dll" target="lib\net5.0" />
+    <file src="net5.0\Cake.Npm.pdb" target="lib\net5.0" />
+    <file src="net5.0\Cake.Npm.xml" target="lib\net5.0" />
+    <file src="net6.0\Cake.Npm.dll" target="lib\net6.0" />
+    <file src="net6.0\Cake.Npm.pdb" target="lib\net6.0" />
+    <file src="net6.0\Cake.Npm.xml" target="lib\net6.0" />
   </files>
 </package>

src/Cake.Npm.Tests/Cake.Npm.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="1.0.0" />
-    <PackageReference Include="Cake.Testing" Version="1.0.0" />
+    <PackageReference Include="Cake.Core" Version="2.0.0" />
+    <PackageReference Include="Cake.Testing" Version="2.0.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" />

src/Cake.Npm/Cake.Npm.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <AssemblyName>Cake.Npm</AssemblyName>
     <RootNamespace>Cake.Npm</RootNamespace>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
@@ -21,6 +21,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Cake.Core" Version="2.0.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>