diff --git a/.appveyor.yml b/.appveyor.yml index c180aec..b182819 100644 --- a/.appveyor.yml +++ b/.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 diff --git a/nuspec/nuget/Cake.Npm.nuspec b/nuspec/nuget/Cake.Npm.nuspec index 6a8541c..552f5d0 100644 --- a/nuspec/nuget/Cake.Npm.nuspec +++ b/nuspec/nuget/Cake.Npm.nuspec @@ -13,13 +13,19 @@ icon.png false - cake npm cake-build cake-contrib - https://github.com/cake-contrib/Cake.Npm/releases/tag/1.0.0 + cake npm cake-addin cake-build cake-contrib + https://github.com/cake-contrib/Cake.Npm/releases/tag/2.0.0 - - - + + + + + + + + + diff --git a/nuspec/nuget/icon.png b/nuspec/nuget/icon.png index 9881edc..84c2a82 100644 Binary files a/nuspec/nuget/icon.png and b/nuspec/nuget/icon.png differ diff --git a/src/Cake.Npm.Tests/Cake.Npm.Tests.csproj b/src/Cake.Npm.Tests/Cake.Npm.Tests.csproj index bd815e1..08b099b 100644 --- a/src/Cake.Npm.Tests/Cake.Npm.Tests.csproj +++ b/src/Cake.Npm.Tests/Cake.Npm.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + netcoreapp3.1;net5.0;net6.0 false false false @@ -10,8 +10,8 @@ - - + + diff --git a/src/Cake.Npm/Cake.Npm.csproj b/src/Cake.Npm/Cake.Npm.csproj index 119580b..d3d6eed 100644 --- a/src/Cake.Npm/Cake.Npm.csproj +++ b/src/Cake.Npm/Cake.Npm.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netcoreapp3.1;net5.0;net6.0 Cake.Npm Cake.Npm false @@ -21,6 +21,6 @@ - + \ No newline at end of file