diff --git a/.appveyor.yml b/.appveyor.yml
index c180aec..06c5830 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,15 +1,11 @@
 #---------------------------------#
 #  Build Image                    #
 #---------------------------------#
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 #---------------------------------#
 #  Build Script                   #
 #---------------------------------#
-install:
-  # Update to latest NuGet version since we require 5.3.0 for embedded icon
-  - ps: nuget update -self
-
 build_script:
   - ps: .\build.ps1 -Target AppVeyor
 
diff --git a/global.json b/global.json
index 21e27ce..52599fd 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,6 @@
 {
   "sdk": {
-    "version": "2.1.500"
+    "version": "5.0.100",
+    "rollForward": "latestFeature"
   }
 }
\ No newline at end of file
diff --git a/nuspec/nuget/Cake.Gulp.nuspec b/nuspec/nuget/Cake.Gulp.nuspec
deleted file mode 100644
index 7485cb1..0000000
--- a/nuspec/nuget/Cake.Gulp.nuspec
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>Cake.Gulp</id>
-    <title>Cake.Gulp</title>
-    <authors>Phil Oyston</authors>
-    <owners>philo, pascalberger, cake-contrib</owners>
-    <license type="expression">MIT</license>
-    <projectUrl>https://github.com/cake-contrib/Cake.Gulp</projectUrl>
-    <icon>icon.png</icon>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <repository type="git" url="https://github.com/cake-contrib/Cake.Gulp.git"/>
-    <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 cake-addin build gulp</tags>
-    <releaseNotes>https://github.com/cake-contrib/Cake.Gulp/releases/tag/1.0.0</releaseNotes>
-  </metadata>
-  <files>
-    <file src="..\..\..\..\nuspec\nuget\icon.png" target="" />
-    <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>
diff --git a/nuspec/nuget/icon.png b/nuspec/nuget/icon.png
deleted file mode 100644
index 9881edc..0000000
Binary files a/nuspec/nuget/icon.png and /dev/null differ
diff --git a/recipe.cake b/recipe.cake
index b4ee5eb..24445df 100644
--- a/recipe.cake
+++ b/recipe.cake
@@ -10,7 +10,8 @@ BuildParameters.SetParameters(context: Context,
                             repositoryName: "Cake.Gulp",
                             appVeyorAccountName: "cakecontrib",
                             shouldRunDupFinder: false,
-                            shouldRunInspectCode: false);
+                            shouldRunInspectCode: false,
+                            shouldRunDotNetCorePack: true);
 
 
 BuildParameters.PrintParameters(Context);
diff --git a/src/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj b/src/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj
index 3c19fa1..98c48d8 100644
--- a/src/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj
+++ b/src/Cake.Gulp.Tests/Cake.Gulp.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
@@ -14,10 +14,6 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs" Link="SolutionInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Cake.Gulp\Cake.Gulp.csproj" />
   </ItemGroup>
diff --git a/src/Cake.Gulp/Cake.Gulp.csproj b/src/Cake.Gulp/Cake.Gulp.csproj
index afe9292..34129f5 100644
--- a/src/Cake.Gulp/Cake.Gulp.csproj
+++ b/src/Cake.Gulp/Cake.Gulp.csproj
@@ -4,25 +4,39 @@
     <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
     <AssemblyName>Cake.Gulp</AssemblyName>
     <RootNamespace>Cake.Gulp</RootNamespace>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PlatformTarget>anycpu</PlatformTarget>
     <DebugType>portable</DebugType>
+    <Company>Cake Contributions - Phil Oyston</Company>
+    <Product>Cake.Gulp</Product>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
+  
+  <PropertyGroup>
+    <StartYear>2016</StartYear>
+    <EndYear>$([System.DateTime]::Today.Year)</EndYear>
+    <FullYear Condition="'$(StartYear)'=='$(EndYear)'">$(StartYear)</FullYear>
+    <FullYear Condition="'$(StartYear)'!='$(EndYear)'">$(StartYear)-$(EndYear)</FullYear>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>bin\Debug\$(TargetFramework)\Cake.Gulp.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <DocumentationFile>bin\Release\$(TargetFramework)\Cake.Gulp.xml</DocumentationFile>
+    <!-- Properties related to packaging -->
+    <Authors>Phil Oyston</Authors>
+    <Copyright>Copyright © Cake Contributions $(FullYear)</Copyright>
+    <Description>Provides a wrapper around Gulp functionality within a Cake build script</Description>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageProjectUrl>https://github.com/cake-contrib/Cake.Gulp</PackageProjectUrl>
+    <PackageTags>cake;cake-addin;build;gulp;cake-build;script;addin</PackageTags>
+    <RepositoryUrl>https://github.com/cake-contrib/Cake.Gulp.git</RepositoryUrl>
+    <PackageReleaseNotes>https://github.com/cake-contrib/Cake.Gulp/releases</PackageReleaseNotes>
+    <RootNamespace>Cake.Gulp</RootNamespace>
+    <Version>0.0.1</Version>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\SolutionInfo.cs" Link="SolutionInfo.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Cake.Core" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="CakeContrib.Guidelines" Version="1.3.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/src/Cake.Gulp/Properties/AssemblyInfo.cs b/src/Cake.Gulp/Properties/AssemblyInfo.cs
deleted file mode 100644
index 6752949..0000000
--- a/src/Cake.Gulp/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Cake.Gulp")]
-[assembly: AssemblyDescription("Provides a wrapper around Gulp functionality within a Cake build script")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: ComVisible(false)]
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
deleted file mode 100644
index c65d528..0000000
--- a/src/SolutionInfo.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by Cake.
-// </auto-generated>
-//------------------------------------------------------------------------------
-using System.Reflection;
-
-[assembly: AssemblyCompany("Cake Contributions - Phil Oyston")]
-[assembly: AssemblyProduct("Cake.Gulp")]
-[assembly: AssemblyVersion("0.1.0")]
-[assembly: AssemblyFileVersion("0.1.0")]
-[assembly: AssemblyInformationalVersion("0.1.0")]
-[assembly: AssemblyCopyright("Copyright © Cake Contributions 2017 - Present")]