diff --git a/.appveyor.yml b/.appveyor.yml
index afb3780..08b93d3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -1,3 +1,8 @@
+#---------------------------------#
+#  Build Image                    #
+#---------------------------------#
+image: Visual Studio 2017
+
 #---------------------------------#
 #  Build Script                   #
 #---------------------------------#
diff --git a/setup.cake b/setup.cake
index b777bd8..106def3 100644
--- a/setup.cake
+++ b/setup.cake
@@ -8,7 +8,9 @@ BuildParameters.SetParameters(context: Context,
                             title: "Cake.AppPackager",
                             repositoryOwner: "cake-contrib",
                             repositoryName: "Cake.AppPackager",
-                            appVeyorAccountName: "cake-contrib");
+                            appVeyorAccountName: "cake-contrib",
+                            shouldRunDupFinder: false,
+                            shouldRunInspectCode: false);
 
 BuildParameters.PrintParameters(Context);
 
@@ -18,4 +20,5 @@ ToolSettings.SetToolSettings(context: Context,
                             testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
                             testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
-Build.Run();
\ No newline at end of file
+
+Build.RunDotNetCore();
\ No newline at end of file
diff --git a/src/Cake.AppPackager.Tests/Cake.AppPackager.Tests.csproj b/src/Cake.AppPackager.Tests/Cake.AppPackager.Tests.csproj
index 2c770a8..779599a 100644
--- a/src/Cake.AppPackager.Tests/Cake.AppPackager.Tests.csproj
+++ b/src/Cake.AppPackager.Tests/Cake.AppPackager.Tests.csproj
@@ -1,22 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
-    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.17.0" />
-    <PackageReference Include="Cake.Testing" Version="0.17.0" />
-    <PackageReference Include="NSubstitute" Version="2.0.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <ProjectReference Include="..\Cake.AppPackager\Cake.AppPackager.csproj" />
+    <PackageReference Include="Cake.Testing" Version="0.28.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="NSubstitute" Version="3.1.0" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
-  
+
   <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+    <ProjectReference Include="..\Cake.AppPackager\Cake.AppPackager.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Cake.AppPackager.sln b/src/Cake.AppPackager.sln
index 60cd972..ca3db2e 100644
--- a/src/Cake.AppPackager.sln
+++ b/src/Cake.AppPackager.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.AppPackager", "Cake.AppPackager\Cake.AppPackager.csproj", "{1884E6AA-8468-4C87-8991-FEAC97090BFC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.AppPackager", "Cake.AppPackager\Cake.AppPackager.csproj", "{2DCAB564-8D47-4A49-975C-E365384C5869}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.AppPackager.Tests", "Cake.AppPackager.Tests\Cake.AppPackager.Tests.csproj", "{C915FA69-0024-4BE1-AC61-14882DA98421}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cake.AppPackager.Tests", "Cake.AppPackager.Tests\Cake.AppPackager.Tests.csproj", "{1E9F9295-BF7D-4292-B54D-2A8269548BCB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,16 +13,19 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1884E6AA-8468-4C87-8991-FEAC97090BFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1884E6AA-8468-4C87-8991-FEAC97090BFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1884E6AA-8468-4C87-8991-FEAC97090BFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1884E6AA-8468-4C87-8991-FEAC97090BFC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C915FA69-0024-4BE1-AC61-14882DA98421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C915FA69-0024-4BE1-AC61-14882DA98421}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C915FA69-0024-4BE1-AC61-14882DA98421}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C915FA69-0024-4BE1-AC61-14882DA98421}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DCAB564-8D47-4A49-975C-E365384C5869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DCAB564-8D47-4A49-975C-E365384C5869}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DCAB564-8D47-4A49-975C-E365384C5869}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DCAB564-8D47-4A49-975C-E365384C5869}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1E9F9295-BF7D-4292-B54D-2A8269548BCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1E9F9295-BF7D-4292-B54D-2A8269548BCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1E9F9295-BF7D-4292-B54D-2A8269548BCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1E9F9295-BF7D-4292-B54D-2A8269548BCB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D086C66A-7B96-4403-A627-AF492B7E6983}
+	EndGlobalSection
 EndGlobal
diff --git a/src/Cake.AppPackager/AppPackagerResolver.cs b/src/Cake.AppPackager/AppPackagerResolver.cs
index 8082af6..e6935f4 100644
--- a/src/Cake.AppPackager/AppPackagerResolver.cs
+++ b/src/Cake.AppPackager/AppPackagerResolver.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using Cake.Core;
 using Cake.Core.IO;
 using Cake.Core.Tooling;
 
+[assembly: InternalsVisibleTo("Cake.AppPackager.Tests")]
 namespace Cake.AppPackager {
     internal sealed class AppPackagerResolver : IAppPackagerResolver {
         private readonly IFileSystem _fileSystem;
diff --git a/src/Cake.AppPackager/Cake.AppPackager.csproj b/src/Cake.AppPackager/Cake.AppPackager.csproj
index c1e5133..b9b3925 100644
--- a/src/Cake.AppPackager/Cake.AppPackager.csproj
+++ b/src/Cake.AppPackager/Cake.AppPackager.csproj
@@ -1,24 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net45</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageId>Cake.AppPackager</PackageId>
-    <Version>0.10.0.0</Version>
-    <Title>Cake.AppPackager</Title>
-    <Authors>Jamie Phillips</Authors>
-    <Owners>Jamie Phillips</Owners>
-    <PackageLicenseUrl>https://github.com/phillipsj/Cake.AppPackager</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/phillipsj/Cake.AppPackager</PackageProjectUrl>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Description>Cake Addin for creating UWP packages.</Description>
-    <PackageReleaseNotes>Initial Release</PackageReleaseNotes>
-    <Copyright>Copyright 2016</Copyright>
-    <PackageTags>Cake AppPackager MakeAppX UWP</PackageTags>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.16.2" />
+    <PackageReference Include="Cake.Core" Version="0.28.0" PrivateAssets="All"/>
   </ItemGroup>
 
 </Project>
diff --git a/tools/packages.config b/tools/packages.config
index a4d70bc..0501888 100644
--- 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.19.5" />
+    <package id="Cake" version="0.30.0" />
 </packages>