diff --git a/.gitignore b/.gitignore
index 8f45742..1480d2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -289,8 +289,5 @@ __pycache__/
 
 # Deployment Framework for BizTalk
 VSIX/
-src/AddIn.VS2010/ProjectTemplates/DFBTProject.zip
-src/AddIn.VS2013/ProjectTemplates/DFBTProject.zip
-src/AddIn.VS2012/ProjectTemplates/DFBTProject.zip
-src/AddIn.VS2015/ProjectTemplates/DFBTProject.zip
+src/AddIn.VS2019/ProjectTemplates/DFBTProject.zip
 src/Addin/ProjectTemplates/DFBTProject.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 713bcc9..218be10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 2.2.0 [Release] (1/20/2026)
+
+* Add support for BizTalk 2020 (#4)
+* Drop support for BizTalk 2016 (#6)
+
 ### 2.1.0 [Release] (1/18/2026)
 
 * Remove support for BizTalk 2010, 2013 R1 and R2 (#3)
diff --git a/References/Microsoft.VisualStudio.Shell.12.0.dll b/References/Microsoft.VisualStudio.Shell.12.0.dll
deleted file mode 100644
index 13c8e77..0000000
Binary files a/References/Microsoft.VisualStudio.Shell.12.0.dll and /dev/null differ
diff --git a/ToolsForVisualStudio.targets b/ToolsForVisualStudio.targets
index 3ed3296..21058bf 100644
--- a/ToolsForVisualStudio.targets
+++ b/ToolsForVisualStudio.targets
@@ -4,9 +4,9 @@
   Copyright (C) 2008-Present Thomas F. Abraham. All Rights Reserved.
   Licensed under the MIT License. See License.txt in the project root.
 -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0" DefaultTargets="Build">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0" DefaultTargets="Build">
   <PropertyGroup>
-   <VsixVersion>2.1.0.0</VsixVersion>
+   <VsixVersion>2.2.0.0</VsixVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -37,14 +37,14 @@
   </Target>
 
   <Target Name="BuildAddin">
-    <WriteXmlValue XmlFilename="src\Addin.VS2015\source.extension.vsixmanifest" XPath="//ns:Metadata/ns:Identity/@Version" Namespace="http://schemas.microsoft.com/developer/vsx-schema/2011" Value="$(VsixVersion)" />
+    <WriteXmlValue XmlFilename="src\Addin.VS2019\source.extension.vsixmanifest" XPath="//ns:Metadata/ns:Identity/@Version" Namespace="http://schemas.microsoft.com/developer/vsx-schema/2011" Value="$(VsixVersion)" />
 
     <MSBuild Projects="src\DeploymentFrameworkForBizTalkAddin.sln" Properties="Configuration=Release;Platform=Any CPU" Targets="Rebuild" />
   </Target>
 
   <Target Name="CopyAddin">
     <ItemGroup>
-      <VsixFile Include="src\AddIn.VS2015\bin\release\DeploymentFrameworkForBizTalkToolsForVS2015.vsix" />
+      <VsixFile Include="src\AddIn.VS2019\bin\release\DeploymentFrameworkForBizTalkToolsForVS2019.vsix" />
     </ItemGroup>
 
     <RemoveDir Directories="VSIX" />
diff --git a/src/AddIn.ProjectTemplate/DFBT.vstemplate b/src/AddIn.ProjectTemplate/DFBT.vstemplate
index 1f12b69..35b811f 100644
--- a/src/AddIn.ProjectTemplate/DFBT.vstemplate
+++ b/src/AddIn.ProjectTemplate/DFBT.vstemplate
@@ -14,7 +14,7 @@
   <TemplateContent>
   </TemplateContent>
   <WizardExtension>
-    <Assembly>DeploymentFxForBizTalkAddin.ProjectWizard, Version=2.1.0.0, Culture=neutral, PublicKeyToken=e748234cd372cc72</Assembly>
+    <Assembly>DeploymentFxForBizTalkAddin.ProjectWizard, Version=2.2.0.0, Culture=neutral, PublicKeyToken=e748234cd372cc72</Assembly>
     <FullClassName>DeploymentFramework.VisualStudioAddIn.ProjectWizard.AddProjectWizard</FullClassName>
   </WizardExtension>
 </VSTemplate>
diff --git a/src/AddIn.ProjectWizard.Test/DeploymentFrameworkForBizTalkAddin.ProjectWizard.Test.csproj b/src/AddIn.ProjectWizard.Test/DeploymentFrameworkForBizTalkAddin.ProjectWizard.Test.csproj
index e9b93c5..6361ecc 100644
--- a/src/AddIn.ProjectWizard.Test/DeploymentFrameworkForBizTalkAddin.ProjectWizard.Test.csproj
+++ b/src/AddIn.ProjectWizard.Test/DeploymentFrameworkForBizTalkAddin.ProjectWizard.Test.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>VisualStudioAddIn.ProjectWizard.Test</RootNamespace>
     <AssemblyName>DeploymentFxForBizTalkAddin.ProjectWizard.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/src/AddIn.ProjectWizard/AddProjectWizard.cs b/src/AddIn.ProjectWizard/AddProjectWizard.cs
index b693aa8..0e4a6bf 100644
--- a/src/AddIn.ProjectWizard/AddProjectWizard.cs
+++ b/src/AddIn.ProjectWizard/AddProjectWizard.cs
@@ -2,18 +2,18 @@
 // Copyright (C) 2008-Present Thomas F. Abraham. All Rights Reserved.
 // Licensed under the MIT License. See License.txt in the project root.
 
+using EnvDTE80;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.TemplateWizard;
+using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
+using System.Reflection;
 using System.Text;
 using System.Windows.Forms;
 using System.Xml;
-using EnvDTE;
-using EnvDTE80;
-using Microsoft.VisualStudio.TemplateWizard;
-using Microsoft.Win32;
-using System.Reflection;
-using System.ComponentModel;
 
 namespace DeploymentFramework.VisualStudioAddIn.ProjectWizard
 {
@@ -39,103 +39,107 @@ public void RunFinished()
 
         public void RunStarted(object automationObject, Dictionary<string, string> replacementsDictionary, WizardRunKind runKind, object[] customParams)
         {
-            DTE2 dte = automationObject as DTE2;
+            ThreadHelper.JoinableTaskFactory.Run(async delegate {
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
 
-            if (dte == null)
-            {
-                MessageBox.Show(
-                    "Cannot convert automation object to DTE2.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
+                DTE2 dte = automationObject as DTE2;
 
-            if (!dte.Solution.IsOpen)
-            {
-                MessageBox.Show(
-                    "Please open your BizTalk solution, then use the Add New Project dialog on the solution to add this project.",
-                    "Error",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                return;
-            }
+                if (dte == null)
+                {
+                    MessageBox.Show(
+                        "Cannot convert automation object to DTE2.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
 
-            string destinationPath = replacementsDictionary["$destinationdirectory$"];
+                if (!dte.Solution.IsOpen)
+                {
+                    MessageBox.Show(
+                        "Please open your BizTalk solution, then use the Add New Project dialog on the solution to add this project.",
+                        "Error",
+                        MessageBoxButtons.OK,
+                        MessageBoxIcon.Error);
+                    return;
+                }
 
-            if (string.IsNullOrEmpty(destinationPath))
-            {
-                MessageBox.Show(
-                    "Cannot determine destination directory ($destinationdirectory$ is missing).",
-                    "Error",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                return;
-            }
+                string destinationPath = replacementsDictionary["$destinationdirectory$"];
 
-            string btdfInstallDir =
-                (string)Registry.GetValue(@"HKEY_LOCAL_MACHINE\Software\DeploymentFrameworkForBizTalk", "InstallPath", null);
+                if (string.IsNullOrEmpty(destinationPath))
+                {
+                    MessageBox.Show(
+                        "Cannot determine destination directory ($destinationdirectory$ is missing).",
+                        "Error",
+                        MessageBoxButtons.OK,
+                        MessageBoxIcon.Error);
+                    return;
+                }
 
-            if (string.IsNullOrEmpty(btdfInstallDir))
-            {
-                MessageBox.Show(
-                    "Cannot find Deployment Framework registry key.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
+                string btdfInstallDir =
+                    (string)Registry.GetValue(@"HKEY_LOCAL_MACHINE\Software\DeploymentFrameworkForBizTalk", "InstallPath", null);
 
-            DeploymentOptions options = new DeploymentOptions();
+                if (string.IsNullOrEmpty(btdfInstallDir))
+                {
+                    MessageBox.Show(
+                        "Cannot find Deployment Framework registry key. Please install the Deployment Framework for BizTalk MSI.", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
+                }
 
-            OptionsForm optionsFrm = new OptionsForm(options);
-            if (optionsFrm.ShowDialog() != DialogResult.OK)
-            {
-                return;
-            }
+                DeploymentOptions options = new DeploymentOptions();
+
+                OptionsForm optionsFrm = new OptionsForm(options);
+                if (optionsFrm.ShowDialog() != DialogResult.OK)
+                {
+                    return;
+                }
 
-            string templateDir = Path.Combine(btdfInstallDir, @"Developer\ProjectTemplate");
+                string templateDir = Path.Combine(btdfInstallDir, @"Developer\ProjectTemplate");
 
-            string[] templateFiles = Directory.GetFiles(templateDir, "*.*", SearchOption.AllDirectories);
+                string[] templateFiles = Directory.GetFiles(templateDir, "*.*", SearchOption.AllDirectories);
 
-            try
-            {
-                CopyDirectory(templateDir, destinationPath);
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show(
-                    "Failed to copy Deployment Framework template files to destination folder: " + ex.Message,
-                    "Error",
-                    MessageBoxButtons.OK,
-                    MessageBoxIcon.Error);
-                return;
-            }
+                try
+                {
+                    CopyDirectory(templateDir, destinationPath);
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(
+                        "Failed to copy Deployment Framework template files to destination folder: " + ex.Message,
+                        "Error",
+                        MessageBoxButtons.OK,
+                        MessageBoxIcon.Error);
+                    return;
+                }
 
-            string solutionName = Path.GetFileNameWithoutExtension(dte.Solution.FileName);
-            string projectFileName = "Deployment.btdfproj";
-            string projectFilePath = Path.Combine(destinationPath, projectFileName);
+                string solutionName = Path.GetFileNameWithoutExtension(dte.Solution.FileName);
+                string projectFileName = "Deployment.btdfproj";
+                string projectFilePath = Path.Combine(destinationPath, projectFileName);
 
-            Dictionary<string, string> replacements = new Dictionary<string, string>();
-            replacements.Add("[PROJECTNAME]", solutionName);
+                Dictionary<string, string> replacements = new Dictionary<string, string>();
+                replacements.Add("[PROJECTNAME]", solutionName);
 
-            ReplaceInTextFile(destinationPath, "InstallWizard.xml", replacements, Encoding.UTF8);
-            ReplaceInTextFile(destinationPath, "UnInstallWizard.xml", replacements, Encoding.UTF8);
+                ReplaceInTextFile(destinationPath, "InstallWizard.xml", replacements, Encoding.UTF8);
+                ReplaceInTextFile(destinationPath, "UnInstallWizard.xml", replacements, Encoding.UTF8);
 
-            replacements.Add("[GUID1]", Guid.NewGuid().ToString());
-            replacements.Add("[GUID2]", Guid.NewGuid().ToString());
-            ReplaceInTextFile(destinationPath, projectFileName, replacements, Encoding.UTF8);
+                replacements.Add("[GUID1]", Guid.NewGuid().ToString());
+                replacements.Add("[GUID2]", Guid.NewGuid().ToString());
+                ReplaceInTextFile(destinationPath, projectFileName, replacements, Encoding.UTF8);
 
-            UpdateProjectFile(projectFilePath, options, optionsFrm.WritePropertiesOnlyWhenNonDefault);
+                UpdateProjectFile(projectFilePath, options, optionsFrm.WritePropertiesOnlyWhenNonDefault);
 
-            try
-            {
-                dte.ExecuteCommand("File.OpenFile", '"' + projectFilePath + '"');
-            }
-            catch (Exception)
-            {
-                MessageBox.Show("Failed to open .btdfproj file in editor.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);                
-            }
+                try
+                {
+                    dte.ExecuteCommand("File.OpenFile", '"' + projectFilePath + '"');
+                }
+                catch (Exception)
+                {
+                    MessageBox.Show("Failed to open .btdfproj file in editor.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                }
 
-            MessageBox.Show(
-                "A default Deployment Framework for BizTalk project has been configured in " + destinationPath + ". You must edit " + projectFileName + " to configure your specific deployment requirements.",
-                "Project Created",
-                MessageBoxButtons.OK,
-                MessageBoxIcon.Information);
+                MessageBox.Show(
+                    "A default Deployment Framework for BizTalk project has been configured in " + destinationPath + ". You must edit " + projectFileName + " to configure your specific deployment requirements.",
+                    "Project Created",
+                    MessageBoxButtons.OK,
+                    MessageBoxIcon.Information);
+            });
         }
 
         public bool ShouldAddProjectItem(string filePath)
diff --git a/src/AddIn.ProjectWizard/DeploymentFrameworkForBizTalkAddin.ProjectWizard.csproj b/src/AddIn.ProjectWizard/DeploymentFrameworkForBizTalkAddin.ProjectWizard.csproj
index 6ec4c04..1d99cc7 100644
--- a/src/AddIn.ProjectWizard/DeploymentFrameworkForBizTalkAddin.ProjectWizard.csproj
+++ b/src/AddIn.ProjectWizard/DeploymentFrameworkForBizTalkAddin.ProjectWizard.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,11 +10,13 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DeploymentFramework.VisualStudioAddIn.ProjectWizard</RootNamespace>
     <AssemblyName>DeploymentFxForBizTalkAddin.ProjectWizard</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\DeploymentFrameworkForBizTalkAddin.snk</AssemblyOriginatorKeyFile>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,53 +38,15 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.VisualStudio.TemplateWizardInterface, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
+    <Reference Include="netstandard" />
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="EnvDTE">
-      <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE100">
-      <Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>
-      <VersionMajor>10</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE80">
-      <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE90">
-      <Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>
-      <VersionMajor>9</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\CommonAssemblyInfo.cs">
       <Link>CommonAssemblyInfo.cs</Link>
@@ -107,6 +71,14 @@
       <Link>DeploymentFrameworkForBizTalkAddin.snk</Link>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.SDK">
+      <Version>16.10.31321.278</Version>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.TemplateWizardInterface">
+      <Version>16.10.31320.204</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- 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.
diff --git a/src/AddIn.VS2015/BTDFTVS2015Logo.png b/src/AddIn.VS2015/BTDFTVS2015Logo.png
deleted file mode 100644
index f89bae8..0000000
Binary files a/src/AddIn.VS2015/BTDFTVS2015Logo.png and /dev/null differ
diff --git a/src/AddIn.VS2019/BTDFTVS2019Logo.png b/src/AddIn.VS2019/BTDFTVS2019Logo.png
new file mode 100644
index 0000000..afde72a
Binary files /dev/null and b/src/AddIn.VS2019/BTDFTVS2019Logo.png differ
diff --git a/src/AddIn.VS2015/DeploymentFrameworkForBizTalkAddin.VS2015.csproj b/src/AddIn.VS2019/DeploymentFrameworkForBizTalkAddin.VS2019.csproj
similarity index 82%
rename from src/AddIn.VS2015/DeploymentFrameworkForBizTalkAddin.VS2015.csproj
rename to src/AddIn.VS2019/DeploymentFrameworkForBizTalkAddin.VS2019.csproj
index e004724..71e7f66 100644
--- a/src/AddIn.VS2015/DeploymentFrameworkForBizTalkAddin.VS2015.csproj
+++ b/src/AddIn.VS2019/DeploymentFrameworkForBizTalkAddin.VS2019.csproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -12,18 +13,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ProjectGuid>{95E4F473-D363-4CF5-9448-94D3D73A5F6C}</ProjectGuid>
+	<ProjectGuid>{28B899C3-C2BB-49FC-907D-E3AEEDB2AC8F}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DeploymentFxForBizTalkToolsForVS.VS2015</RootNamespace>
-    <AssemblyName>DeploymentFrameworkForBizTalkToolsForVS2015</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <RootNamespace>DeploymentFxForBizTalkToolsForVS.VS2019</RootNamespace>
+    <AssemblyName>DeploymentFrameworkForBizTalkToolsForVS2019</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
     <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
     <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
     <CopyOutputSymbolsToOutputDirectory>false</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>
@@ -53,7 +57,7 @@
       <Link>LICENSE.txt</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="BTDFTVS2015Logo.png">
+    <Content Include="BTDFTVS2019Logo.png">
       <IncludeInVSIX>true</IncludeInVSIX>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -79,6 +83,13 @@
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VSSDK.BuildTools">
+      <Version>16.10.1055</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup>
diff --git a/src/AddIn.VS2015/Properties/AssemblyInfo.cs b/src/AddIn.VS2019/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/AddIn.VS2015/Properties/AssemblyInfo.cs
rename to src/AddIn.VS2019/Properties/AssemblyInfo.cs
diff --git a/src/AddIn.VS2015/source.extension.vsixmanifest b/src/AddIn.VS2019/source.extension.vsixmanifest
similarity index 77%
rename from src/AddIn.VS2015/source.extension.vsixmanifest
rename to src/AddIn.VS2019/source.extension.vsixmanifest
index 137a7cb..135ddee 100644
--- a/src/AddIn.VS2015/source.extension.vsixmanifest
+++ b/src/AddIn.VS2019/source.extension.vsixmanifest
@@ -1,26 +1,29 @@
 <?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="DeploymentFrameworkForBizTalk.ToolsForVS2015" Version="2.1.0.0" Language="en-US" Publisher="Deployment Framework for BizTalk Team" />
-    <DisplayName>Deployment Framework for BizTalk Tools for VS 2015</DisplayName>
+    <Identity Id="DeploymentFrameworkForBizTalk.ToolsForVS2019" Version="2.2.0.0" Language="en-US" Publisher="Deployment Framework for BizTalk Team" />
+    <DisplayName>Deployment Framework for BizTalk Tools for VS 2019</DisplayName>
     <Description xml:space="preserve">Visual Studio Tools for the Deployment Framework for BizTalk - a powerful framework that eliminates the pain associated with BizTalk application deployments, and goes far beyond BizTalk’s out-of-the-box deployment functionality.</Description>
     <MoreInfo>https://github.com/BTDF/ToolsForVisualStudio</MoreInfo>
     <License>LICENSE.txt</License>
-    <Icon>BTDFTVS2015Logo.png</Icon>
-    <PreviewImage>BTDFTVS2015Logo.png</PreviewImage>
+    <Icon>BTDFTVS2019Logo.png</Icon>
+    <PreviewImage>BTDFTVS2019Logo.png</PreviewImage>
     <Tags>BTDF, BizTalk, Deployment Framework for BizTalk</Tags>
   </Metadata>
   <Installation>
-    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[14.0]" />
-    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
-    <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[14.0]" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[16.0, 17.0)" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />
+    <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[16.0, 17.0)" />
   </Installation>
   <Dependencies>
-    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.7,)" />
   </Dependencies>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0, 17.0)" />
+  </Prerequisites>
   <Assets>
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="DeploymentFrameworkForBizTalkAddin" Path="|DeploymentFrameworkForBizTalkAddin;PkgdefProjectOutputGroup|" />
     <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="DeploymentFrameworkForBizTalkAddin.ProjectWizard" Path="|DeploymentFrameworkForBizTalkAddin.ProjectWizard|" AssemblyName="|DeploymentFrameworkForBizTalkAddin.ProjectWizard;AssemblyName|" />
     <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="File" Path="ProjectTemplates" d:TargetPath="ProjectTemplates\DFBTProject.zip" />
   </Assets>
-</PackageManifest>
\ No newline at end of file
+</PackageManifest>
diff --git a/src/Addin/AddinPackage.cs b/src/Addin/AddinPackage.cs
index bbbfeeb..dcf9aca 100644
--- a/src/Addin/AddinPackage.cs
+++ b/src/Addin/AddinPackage.cs
@@ -2,20 +2,18 @@
 // Copyright (C) 2008-Present Thomas F. Abraham. All Rights Reserved.
 // Licensed under the MIT License. See License.txt in the project root.
 
-using System;
-using System.ComponentModel.Design;
-using System.Diagnostics;
-using System.Globalization;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
 using DeploymentFrameworkForBizTalk.Addin.Implementation;
 using EnvDTE;
 using EnvDTE80;
 using Microsoft.VisualStudio;
-using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
-using Microsoft.Win32;
+using System;
+using System.ComponentModel.Design;
+using System.Diagnostics;
+using System.Globalization;
+using System.Runtime.InteropServices;
+using System.Threading;
 
 namespace DeploymentFrameworkForBizTalk.Addin
 {
@@ -27,14 +25,14 @@ namespace DeploymentFrameworkForBizTalk.Addin
     /// and its components with the shell.
     /// </summary>
     // This attribute tells the PkgDef creation utility (CreatePkgDef.exe) that this class is a package.
-    [PackageRegistration(UseManagedResourcesOnly = true)]
+    [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
     // This attribute is used to register the informations needed to show the this package in the Help/About dialog of Visual Studio.
     [InstalledProductRegistration("#110", "#112", "5.x", IconResourceID = 400)]
     // This attribute is needed to let the shell know that this package exposes some menus.
     [ProvideMenuResource("Menus.ctmenu", 1)]
-    [ProvideAutoLoad("{f1536ef8-92ec-443c-9ed7-fdadf150da82}")]
+    [ProvideAutoLoad(VSConstants.UICONTEXT.SolutionExistsAndFullyLoaded_string, PackageAutoLoadFlags.BackgroundLoad)]
     [Guid(GuidList.guidAddinPkgString)]
-    public sealed class AddinPackage : Package
+    public sealed class AddinPackage : AsyncPackage
     {
         private CommandManager _cmdManager;
 
@@ -48,21 +46,22 @@ public AddinPackage()
         }
 
         /// <summary>
-        /// Initialization of the package; this method is called right after the package is sited, so this is the place
-        /// where you can put the initialization code that relies on services provided by Visual Studio.
+        /// Initialization of the package; this method is called right after the package is sited, so this is where to put initialization code that relies on services provided by Visual Studio
         /// </summary>
-        protected override void Initialize()
+        protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
             Trace.WriteLine (string.Format(CultureInfo.CurrentCulture, "Entering Initialize() of: {0}", this.ToString()));
-            base.Initialize();
 
-            DTE2 applicationObject = (DTE2)GetService(typeof(DTE));
-            IVsOutputWindow outputWindow = (IVsOutputWindow)GetService(typeof(SVsOutputWindow));
+            // Switches to the UI thread in order to consume some services used in command initialization
+            await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+
+            DTE2 applicationObject = (DTE2) await GetServiceAsync(typeof(DTE));
+            IVsOutputWindow outputWindow = (IVsOutputWindow) await GetServiceAsync(typeof(SVsOutputWindow));
 
             _cmdManager = new CommandManager(new CommandRunner(applicationObject, outputWindow), applicationObject, this);
 
             // Add our command handlers for menu (commands must exist in the .vsct file)
-            OleMenuCommandService mcs = GetService(typeof(IMenuCommandService)) as OleMenuCommandService;
+            OleMenuCommandService mcs = await GetServiceAsync(typeof(IMenuCommandService)) as OleMenuCommandService;
             if ( null != mcs )
             {
                 MenuCommandRegistrar registrar = new MenuCommandRegistrar(mcs, _cmdManager);
diff --git a/src/Addin/DeploymentFrameworkForBizTalkAddin.csproj b/src/Addin/DeploymentFrameworkForBizTalkAddin.csproj
index 7f47a6e..5610bc0 100644
--- a/src/Addin/DeploymentFrameworkForBizTalkAddin.csproj
+++ b/src/Addin/DeploymentFrameworkForBizTalkAddin.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,9 +13,13 @@
     <AssemblyName>DeploymentFxForBizTalkToolsForVS</AssemblyName>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\DeploymentFrameworkForBizTalkAddin.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -43,82 +47,16 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\References\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />
-    <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Design" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
   </ItemGroup>
-  <ItemGroup>
-    <COMReference Include="EnvDTE">
-      <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE100">
-      <Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>
-      <VersionMajor>10</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE80">
-      <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE90">
-      <Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>
-      <VersionMajor>9</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="Microsoft.VisualStudio.CommandBars">
-      <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="stdole">
-      <Guid>{00020430-0000-0000-C000-000000000046}</Guid>
-      <VersionMajor>2</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\CommonAssemblyInfo.cs">
       <Link>CommonAssemblyInfo.cs</Link>
@@ -168,6 +106,11 @@
   <ItemGroup>
     <Content Include="Resources\Package.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.SDK">
+      <Version>16.10.31321.278</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>
   </PropertyGroup>
diff --git a/src/Addin/Implementation/CommandManager.cs b/src/Addin/Implementation/CommandManager.cs
index 9144d87..ca6fda8 100644
--- a/src/Addin/Implementation/CommandManager.cs
+++ b/src/Addin/Implementation/CommandManager.cs
@@ -2,14 +2,11 @@
 // Copyright (C) 2008-Present Thomas F. Abraham. All Rights Reserved.
 // Licensed under the MIT License. See License.txt in the project root.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using EnvDTE;
 using EnvDTE80;
-using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+using System;
 
 namespace DeploymentFrameworkForBizTalk.Addin.Implementation
 {
@@ -19,7 +16,6 @@ internal class CommandManager
         private DTE2 _applicationObject;
         private SolutionEvents _solutionEvents;
         private IServiceProvider _pkg;
-        private IVsUIShell _uiShell;
         private string _msbuildPath;
         private string _gacUtilPath;
 
@@ -32,10 +28,7 @@ internal CommandManager(CommandRunner runner, DTE2 application, IServiceProvider
             _msbuildPath = Util.GetMsBuildPath();
             _gacUtilPath = Util.GetGacUtilPath();
 
-            _uiShell = (IVsUIShell)_pkg.GetService(typeof(SVsUIShell));
-
             _solutionEvents = ((Events2)application.Events).SolutionEvents;
-            //_solutionEvents.Opened += _solutionEvents_Opened;
             _solutionEvents.AfterClosing += _solutionEvents_AfterClosing;
         }
 
@@ -103,13 +96,20 @@ internal void OnGacProjectOutputCommand(object sender, EventArgs e)
         {
             Array projects = (Array)_applicationObject.ActiveSolutionProjects;
 
-            if (projects.Length > 0)
+            if (projects.Length == 0)
             {
-                if (projects.Length > 1)
-                {
-                    ShowMessageBox("Please select only one project.", OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGICON.OLEMSGICON_WARNING);
-                    return;
-                }
+                return;
+            }
+
+            if (projects.Length > 1)
+            {
+                ShowMessageBox("Please select only one project.", OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGICON.OLEMSGICON_WARNING);
+                return;
+            }
+
+            ThreadHelper.JoinableTaskFactory.Run(async delegate
+            {
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
 
                 Project proj = projects.GetValue(0) as Project;
 
@@ -125,7 +125,7 @@ internal void OnGacProjectOutputCommand(object sender, EventArgs e)
 
                 string arguments = string.Format("/i \"{0}\" /f", System.IO.Path.GetFullPath(path.LocalPath));
                 _commandRunner.ExecuteBuild(_gacUtilPath, arguments);
-            }
+            });
         }
 
         internal void OnBeforeQueryStatus(object sender, EventArgs e)
@@ -139,16 +139,6 @@ internal void OnBeforeQueryStatus(object sender, EventArgs e)
             }
         }
 
-        private string GetActiveSolutionConfiguration()
-        {
-            return _applicationObject.Solution.SolutionBuild.ActiveConfiguration.Name;
-        }
-
-        private string GetActiveSolutionFileName()
-        {
-            return _applicationObject.Solution.FileName;
-        }
-
         private void ExecuteMSBuildTarget(string targetName)
         {
             ExecuteMSBuildTarget(targetName, null);
@@ -156,45 +146,59 @@ private void ExecuteMSBuildTarget(string targetName)
 
         private void ExecuteMSBuildTarget(string targetName, string addlProperties)
         {
-            string activeSolutionConfiguration = GetActiveSolutionConfiguration();
-            string solutionFilename = GetActiveSolutionFileName();
-            string projectPath = Util.GetDeploymentProjectPath(solutionFilename);
-            string arguments = string.Format("\"{0}\" /nologo /t:{1} /p:Configuration={2}", projectPath, targetName, activeSolutionConfiguration);
-
-            if (!string.IsNullOrWhiteSpace(addlProperties))
+            ThreadHelper.JoinableTaskFactory.Run(async delegate
             {
-                arguments += " /p:" + addlProperties;
-            }
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+
+                string activeSolutionConfiguration = _applicationObject.Solution.SolutionBuild.ActiveConfiguration.Name;
+                string solutionFilename = _applicationObject.Solution.FileName;
+                string projectPath = Util.GetDeploymentProjectPath(solutionFilename);
+                string arguments = string.Format("\"{0}\" /nologo /t:{1} /p:Configuration={2}", projectPath, targetName, activeSolutionConfiguration);
 
-            _commandRunner.ExecuteBuild(_msbuildPath, arguments);
+                if (!string.IsNullOrWhiteSpace(addlProperties))
+                {
+                    arguments += " /p:" + addlProperties;
+                }
+
+                _commandRunner.ExecuteBuild(_msbuildPath, arguments);
+            });
         }
 
         private void ShowMessageBox(string msg, OLEMSGBUTTON buttonType, OLEMSGICON iconType)
         {
-            Guid clsid = Guid.Empty;
-            int result;
-            Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(
-                _uiShell.ShowMessageBox(
-                    0,
-                    ref clsid,
-                    "Deployment Framework for BizTalk",
-                    msg,
-                    string.Empty,
-                    0,
-                    buttonType,
-                    OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST,
-                    iconType,
-                    0,        // false
-                    out result));
-        }
-
-        //private void _solutionEvents_Opened()
-        //{
-        //}
+            ThreadHelper.JoinableTaskFactory.Run(async delegate
+            {
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+
+                Guid clsid = Guid.Empty;
+                int result;
+
+                IVsUIShell uiShell = (IVsUIShell)_pkg.GetService(typeof(SVsUIShell));
+
+                Microsoft.VisualStudio.ErrorHandler.ThrowOnFailure(
+                    uiShell.ShowMessageBox(
+                        0,
+                        ref clsid,
+                        "Deployment Framework for BizTalk",
+                        msg,
+                        string.Empty,
+                        0,
+                        buttonType,
+                        OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST,
+                        iconType,
+                        0,        // false
+                        out result));
+            });
+        }
 
         private void _solutionEvents_AfterClosing()
         {
-            _commandRunner.OnCloseSolution();
+            ThreadHelper.JoinableTaskFactory.Run(async delegate
+            {
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+
+                _commandRunner.OnCloseSolution();
+            });
         }
     }
 }
diff --git a/src/Addin/Implementation/CommandRunner.cs b/src/Addin/Implementation/CommandRunner.cs
index 9585c54..e926f51 100644
--- a/src/Addin/Implementation/CommandRunner.cs
+++ b/src/Addin/Implementation/CommandRunner.cs
@@ -2,14 +2,13 @@
 // Copyright (C) 2008-Present Thomas F. Abraham. All Rights Reserved.
 // Licensed under the MIT License. See License.txt in the project root.
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-using System.Windows.Forms;
 using EnvDTE;
 using EnvDTE80;
+using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
+using System;
+using System.Threading;
+using System.Windows.Forms;
 
 namespace DeploymentFrameworkForBizTalk.Addin.Implementation
 {
@@ -21,6 +20,7 @@ internal class CommandRunner
 
         private DTE2 _applicationObject;
         private IVsOutputWindow _vsOutputWindow;
+        private OutputWindowPane _owP;
 
         private delegate void RunHandler(string exePath, string arguments);
 
@@ -32,41 +32,28 @@ internal CommandRunner(DTE2 applicationObject, IVsOutputWindow outputWindow)
 
         internal void ExecuteBuild(string exePath, string arguments)
         {
-            if (SetBusy() == 1)
+            if (Interlocked.CompareExchange(ref IsBusy, 1, 0) == 1)
             {
                 return;
             }
 
-            OutputWindow ow = _applicationObject.ToolWindows.OutputWindow;
-            OutputWindowPane owP = GetOutputWindowPane();
-
-            owP.Clear();
-            owP.Activate();
-            ow.Parent.Activate();
-
-            RunHandler rh = new RunHandler(Run);
+            RunHandler rh = new RunHandler(RunProcess);
             AsyncCallback callback = new AsyncCallback(RunCallback);
             rh.BeginInvoke(exePath, arguments, callback, rh);
         }
 
-        internal void OnOpenSolution()
-        {
-            GetOutputWindowPane();
-        }
-
         internal void OnCloseSolution()
         {
-            RemoveOutputWindowPane();
-        }
-
-        private int SetBusy()
-        {
-            return Interlocked.CompareExchange(ref IsBusy, 1, 0);
-        }
+            OutputWindow ow = _applicationObject.ToolWindows.OutputWindow;
 
-        private void SetFree()
-        {
-            Interlocked.CompareExchange(ref IsBusy, 0, 1);
+            foreach (OutputWindowPane owp in ow.OutputWindowPanes)
+            {
+                if (string.Compare(owp.Name, ToolWindowName, true) == 0)
+                {
+                    _vsOutputWindow.DeletePane(Guid.Parse(owp.Guid));
+                    return;
+                }
+            }
         }
 
         private void RunCallback(IAsyncResult result)
@@ -83,32 +70,35 @@ private void RunCallback(IAsyncResult result)
             }
             finally
             {
-                SetFree();
+                Interlocked.CompareExchange(ref IsBusy, 0, 1);
             }
         }
 
-        private void proc_OutputDataReceived(object sender, System.Diagnostics.DataReceivedEventArgs e)
-        {
-            WriteToOutputWindow(e.Data);
-        }
-
-        private void WriteToOutputWindow(string message)
+        private void OutputDataReceived(object sender, System.Diagnostics.DataReceivedEventArgs e)
         {
-            OutputWindowPane owP = GetOutputWindowPane();
-            owP.OutputString(message);
-            owP.OutputString("\r\n");
-        }
+            ThreadHelper.JoinableTaskFactory.Run(async delegate
+            {
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
 
-        private void Run(string exePath, string arguments)
-        {
-            RunProcess(exePath, arguments);
+                _owP.OutputString(e.Data + "\r\n");
+            });
         }
 
         private void RunProcess(string exePath, string arguments)
         {
-            WriteToOutputWindow("Starting build...");
-            WriteToOutputWindow(exePath + " " + arguments);
-            WriteToOutputWindow(string.Empty);
+            ThreadHelper.JoinableTaskFactory.Run(async delegate
+            {
+                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+
+                _owP = GetOutputWindowPane();
+                _owP.Clear();
+                _owP.Activate();
+                _applicationObject.ToolWindows.OutputWindow.Parent.Activate();
+
+                _owP.OutputString("Starting build...\r\n");
+                _owP.OutputString(exePath + " " + arguments + "\r\n");
+                _owP.OutputString(string.Empty);
+            });
 
             using (System.Diagnostics.Process proc = new System.Diagnostics.Process())
             {
@@ -118,12 +108,14 @@ private void RunProcess(string exePath, string arguments)
                 proc.StartInfo.CreateNoWindow = true;
                 proc.StartInfo.RedirectStandardOutput = true;
 
-                proc.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(proc_OutputDataReceived);
+                proc.OutputDataReceived += new System.Diagnostics.DataReceivedEventHandler(OutputDataReceived);
                 proc.Start();
 
                 proc.BeginOutputReadLine();
                 proc.WaitForExit();
             }
+
+            _owP = null;
         }
 
         private OutputWindowPane GetOutputWindowPane()
@@ -140,19 +132,5 @@ private OutputWindowPane GetOutputWindowPane()
 
             return ow.OutputWindowPanes.Add(ToolWindowName);
         }
-
-        private void RemoveOutputWindowPane()
-        {
-            OutputWindow ow = _applicationObject.ToolWindows.OutputWindow;
-
-            foreach (OutputWindowPane owp in ow.OutputWindowPanes)
-            {
-                if (string.Compare(owp.Name, ToolWindowName, true) == 0)
-                {
-                    _vsOutputWindow.DeletePane(Guid.Parse(owp.Guid));
-                    return;
-                }
-            }
-        }
     }
 }
diff --git a/src/Addin/Implementation/MenuCommandRegistrar.cs b/src/Addin/Implementation/MenuCommandRegistrar.cs
index 2803e8c..4f2669b 100644
--- a/src/Addin/Implementation/MenuCommandRegistrar.cs
+++ b/src/Addin/Implementation/MenuCommandRegistrar.cs
@@ -2,12 +2,9 @@
 // Copyright (C) 2008-Present Thomas F. Abraham. All Rights Reserved.
 // Licensed under the MIT License. See License.txt in the project root.
 
+using Microsoft.VisualStudio.Shell;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.Design;
-using System.Linq;
-using System.Text;
-using Microsoft.VisualStudio.Shell;
 
 namespace DeploymentFrameworkForBizTalk.Addin.Implementation
 {
diff --git a/src/Addin/Implementation/Util.cs b/src/Addin/Implementation/Util.cs
index d2e4e1c..06453e4 100644
--- a/src/Addin/Implementation/Util.cs
+++ b/src/Addin/Implementation/Util.cs
@@ -2,12 +2,9 @@
 // Copyright (C) 2008-Present Thomas F. Abraham. All Rights Reserved.
 // Licensed under the MIT License. See License.txt in the project root.
 
-using System;
-using System.Collections.Generic;
+using Microsoft.Win32;
 using System.IO;
-using System.Text;
 using System.Windows.Forms;
-using Microsoft.Win32;
 
 namespace DeploymentFrameworkForBizTalk.Addin.Implementation
 {
diff --git a/src/DeploymentFrameworkForBizTalkAddin.sln b/src/DeploymentFrameworkForBizTalkAddin.sln
index aa80e32..16e612b 100644
--- a/src/DeploymentFrameworkForBizTalkAddin.sln
+++ b/src/DeploymentFrameworkForBizTalkAddin.sln
@@ -14,7 +14,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeploymentFrameworkForBizTa
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeploymentFrameworkForBizTalkAddin.ProjectWizard.Test", "AddIn.ProjectWizard.Test\DeploymentFrameworkForBizTalkAddin.ProjectWizard.Test.csproj", "{3B7DD033-BE61-4C6D-99FD-1A6F4EBDEF53}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeploymentFrameworkForBizTalkAddin.VS2015", "AddIn.VS2015\DeploymentFrameworkForBizTalkAddin.VS2015.csproj", "{95E4F473-D363-4CF5-9448-94D3D73A5F6C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeploymentFrameworkForBizTalkAddin.VS2019", "AddIn.VS2019\DeploymentFrameworkForBizTalkAddin.VS2019.csproj", "{28B899C3-C2BB-49FC-907D-E3AEEDB2AC8F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,10 +34,10 @@ Global
 		{3B7DD033-BE61-4C6D-99FD-1A6F4EBDEF53}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3B7DD033-BE61-4C6D-99FD-1A6F4EBDEF53}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3B7DD033-BE61-4C6D-99FD-1A6F4EBDEF53}.Release|Any CPU.Build.0 = Release|Any CPU
-		{95E4F473-D363-4CF5-9448-94D3D73A5F6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{95E4F473-D363-4CF5-9448-94D3D73A5F6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{95E4F473-D363-4CF5-9448-94D3D73A5F6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{95E4F473-D363-4CF5-9448-94D3D73A5F6C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28B899C3-C2BB-49FC-907D-E3AEEDB2AC8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28B899C3-C2BB-49FC-907D-E3AEEDB2AC8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28B899C3-C2BB-49FC-907D-E3AEEDB2AC8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28B899C3-C2BB-49FC-907D-E3AEEDB2AC8F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE