diff --git a/CPABuildEvents/BuildEventsPackage.cs b/CPABuildEventShared/BuildEventsPackage.cs
similarity index 100%
rename from CPABuildEvents/BuildEventsPackage.cs
rename to CPABuildEventShared/BuildEventsPackage.cs
diff --git a/CPABuildEvents/BuildEventsPackage.resx b/CPABuildEventShared/BuildEventsPackage.resx
similarity index 100%
rename from CPABuildEvents/BuildEventsPackage.resx
rename to CPABuildEventShared/BuildEventsPackage.resx
diff --git a/CPABuildEventShared/CPABuildEventShared.projitems b/CPABuildEventShared/CPABuildEventShared.projitems
new file mode 100644
index 0000000..8d329d2
--- /dev/null
+++ b/CPABuildEventShared/CPABuildEventShared.projitems
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>4e4604cd-7346-4031-9d37-c01657f45e77</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>CPABuildEventShared</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)BuildEventsPackage.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)BuildEventsPackage.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)RunPSScript.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)Resources\BuildEventsPackage.ico" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/CPABuildEventShared/CPABuildEventShared.shproj b/CPABuildEventShared/CPABuildEventShared.shproj
new file mode 100644
index 0000000..b4ddeb7
--- /dev/null
+++ b/CPABuildEventShared/CPABuildEventShared.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>4e4604cd-7346-4031-9d37-c01657f45e77</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="CPABuildEventShared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/CPABuildEvents/Resources/BuildEventsPackage.ico b/CPABuildEventShared/Resources/BuildEventsPackage.ico
similarity index 100%
rename from CPABuildEvents/Resources/BuildEventsPackage.ico
rename to CPABuildEventShared/Resources/BuildEventsPackage.ico
diff --git a/CPABuildEvents/RunPSScript.cs b/CPABuildEventShared/RunPSScript.cs
similarity index 90%
rename from CPABuildEvents/RunPSScript.cs
rename to CPABuildEventShared/RunPSScript.cs
index 5c844b8..41fe379 100644
--- a/CPABuildEvents/RunPSScript.cs
+++ b/CPABuildEventShared/RunPSScript.cs
@@ -1,13 +1,8 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.VisualStudio.Threading;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
-using System.Linq;
 using System.Management.Automation;
-using System.Text;
 using Task = System.Threading.Tasks.Task;
 
 namespace CPABuildEvents
diff --git a/CPABuildEvents.sln b/CPABuildEvents.sln
index 739f383..77ba846 100644
--- a/CPABuildEvents.sln
+++ b/CPABuildEvents.sln
@@ -1,20 +1,43 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31606.5
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CPABuildEvents", "CPABuildEvents\CPABuildEvents.csproj", "{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CPABuildEventShared", "CPABuildEventShared\CPABuildEventShared.shproj", "{4E4604CD-7346-4031-9D37-C01657F45E77}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CPABuildEvents16", "CPABuildEvents16\CPABuildEvents16.csproj", "{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CPABuildEvents17", "CPABuildEvents17\CPABuildEvents17.csproj", "{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}"
 EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		CPABuildEventShared\CPABuildEventShared.projitems*{2edfee33-2bad-49d3-87ac-c59c42a099d0}*SharedItemsImports = 4
+		CPABuildEventShared\CPABuildEventShared.projitems*{4e4604cd-7346-4031-9d37-c01657f45e77}*SharedItemsImports = 13
+		CPABuildEventShared\CPABuildEventShared.projitems*{6ff2a85f-b5eb-4e8b-8a47-dce44336ee14}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Debug|x86.ActiveCfg = Debug|x86
+		{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Debug|x86.Build.0 = Debug|x86
 		{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Release|x86.ActiveCfg = Release|x86
+		{2EDFEE33-2BAD-49D3-87AC-C59C42A099D0}.Release|x86.Build.0 = Release|x86
+		{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Debug|x86.ActiveCfg = Debug|x86
+		{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Debug|x86.Build.0 = Debug|x86
+		{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Release|x86.ActiveCfg = Release|x86
+		{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/CPABuildEvents/CPABuildEvents.csproj b/CPABuildEvents16/CPABuildEvents16.csproj
similarity index 88%
rename from CPABuildEvents/CPABuildEvents.csproj
rename to CPABuildEvents16/CPABuildEvents16.csproj
index 68edadc..59119f3 100644
--- a/CPABuildEvents/CPABuildEvents.csproj
+++ b/CPABuildEvents16/CPABuildEvents16.csproj
@@ -53,8 +53,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="BuildEventsPackage.cs" />
-    <Compile Include="RunPSScript.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="source.extension.vsixmanifest">
@@ -78,24 +76,16 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.200" ExcludeAssets="runtime">
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="16.0.206" ExcludeAssets="runtime">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.1.3121">
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="16.10.1055">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\BuildEventsPackage.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="BuildEventsPackage.resx">
-      <MergeWithCTO>true</MergeWithCTO>
-      <ManifestResourceName>VSPackage</ManifestResourceName>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
+  <ItemGroup />
+  <Import Project="..\CPABuildEventShared\CPABuildEventShared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/CPABuildEvents/Properties/AssemblyInfo.cs b/CPABuildEvents16/Properties/AssemblyInfo.cs
similarity index 90%
rename from CPABuildEvents/Properties/AssemblyInfo.cs
rename to CPABuildEvents16/Properties/AssemblyInfo.cs
index ee3a1fe..c1e5678 100644
--- a/CPABuildEvents/Properties/AssemblyInfo.cs
+++ b/CPABuildEvents16/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/CPABuildEvents/source.extension.vsixmanifest b/CPABuildEvents16/source.extension.vsixmanifest
similarity index 100%
rename from CPABuildEvents/source.extension.vsixmanifest
rename to CPABuildEvents16/source.extension.vsixmanifest
diff --git a/CPABuildEvents17/CPABuildEvents17.csproj b/CPABuildEvents17/CPABuildEvents17.csproj
new file mode 100644
index 0000000..42c22c1
--- /dev/null
+++ b/CPABuildEvents17/CPABuildEvents17.csproj
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectGuid>{6FF2A85F-B5EB-4E8B-8A47-DCE44336EE14}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CPABuildEvents17</RootNamespace>
+    <AssemblyName>CPABuildEvents17</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <GeneratePkgDefFile>true</GeneratePkgDefFile>
+    <UseCodebase>true</UseCodebase>
+    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <CopyBuildOutputToOutputDirectory>true</CopyBuildOutputToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
+    <StartAction>Program</StartAction>
+    <StartProgram Condition="'$(DevEnvDir)' != ''">$(DevEnvDir)devenv.exe</StartProgram>
+    <StartArguments>/rootsuffix Exp</StartArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="source.extension.vsixmanifest">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.0-previews-3-31605-261" ExcludeAssets="runtime">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.0.3177-preview3" />
+  </ItemGroup>
+  <Import Project="..\CPABuildEventShared\CPABuildEventShared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/CPABuildEvents17/Properties/AssemblyInfo.cs b/CPABuildEvents17/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..8b732c8
--- /dev/null
+++ b/CPABuildEvents17/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+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("CPABuildEvents17")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("CPABuildEvents17")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
diff --git a/CPABuildEvents17/source.extension.vsixmanifest b/CPABuildEvents17/source.extension.vsixmanifest
new file mode 100644
index 0000000..0d7b666
--- /dev/null
+++ b/CPABuildEvents17/source.extension.vsixmanifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+  <Metadata>
+    <Identity Id="CPABuildEvents17.62005f41-c515-459f-9076-8f0d249d2c73" Version="1.0" Language="en-US" Publisher="Daniel Triendl" />
+    <DisplayName>CPABuildEvents17</DisplayName>
+    <Description>Empty VSIX Project.</Description>
+  </Metadata>
+  <Installation>
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0, 18.0)">
+      <ProductArchitecture>amd64</ProductArchitecture>
+    </InstallationTarget>
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+  </Dependencies>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
+  </Prerequisites>
+  <Assets>
+    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+  </Assets>
+</PackageManifest>