diff --git a/MarkMpn.Sql4Cds.SSMS.20.Setup/HeatGeneratedFileList.wxs b/MarkMpn.Sql4Cds.SSMS.20.Setup/HeatGeneratedFileList.wxs
index e707457b..0748b698 100644
--- a/MarkMpn.Sql4Cds.SSMS.20.Setup/HeatGeneratedFileList.wxs
+++ b/MarkMpn.Sql4Cds.SSMS.20.Setup/HeatGeneratedFileList.wxs
@@ -50,8 +50,11 @@
             <Component Id="Microsoft.Data.SqlClient.dll" Guid="*">
                 <File Id="Microsoft.Data.SqlClient.dll" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.Data.SqlClient.dll" />
             </Component>
-            <Component Id="Microsoft.Data.SqlClient.pdb" Guid="*">
-                <File Id="Microsoft.Data.SqlClient.pdb" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.Data.SqlClient.pdb" />
+            <Component Id="Microsoft.Data.SqlClient.SNI.arm64.dll" Guid="*">
+                <File Id="Microsoft.Data.SqlClient.SNI.arm64.dll" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.Data.SqlClient.SNI.arm64.dll" />
+            </Component>
+            <Component Id="Microsoft.Data.SqlClient.SNI.arm64.pdb" Guid="*">
+                <File Id="Microsoft.Data.SqlClient.SNI.arm64.pdb" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.Data.SqlClient.SNI.arm64.pdb" />
             </Component>
             <Component Id="Microsoft.Data.SqlClient.SNI.x64.dll" Guid="*">
                 <File Id="Microsoft.Data.SqlClient.SNI.x64.dll" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.Data.SqlClient.SNI.x64.dll" />
@@ -71,6 +74,9 @@
             <Component Id="Microsoft.Identity.Client.Extensions.Msal.dll" Guid="*">
                 <File Id="Microsoft.Identity.Client.Extensions.Msal.dll" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.Identity.Client.Extensions.Msal.dll" />
             </Component>
+            <Component Id="Microsoft.IdentityModel.Abstractions.dll" Guid="*">
+                <File Id="Microsoft.IdentityModel.Abstractions.dll" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.IdentityModel.Abstractions.dll" />
+            </Component>
             <Component Id="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" Guid="*">
                 <File Id="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
             </Component>
@@ -104,6 +110,9 @@
             <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.dll" Guid="*">
                 <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.dll" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.SqlServer.TransactSql.ScriptDom.dll" />
             </Component>
+            <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.pdb" Guid="*">
+                <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.pdb" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.SqlServer.TransactSql.ScriptDom.pdb" />
+            </Component>
             <Component Id="Microsoft.VisualStudio.CoreUtility.dll" Guid="*">
                 <File Id="Microsoft.VisualStudio.CoreUtility.dll" KeyPath="yes" Source="$(var.HarvestPath)\Microsoft.VisualStudio.CoreUtility.dll" />
             </Component>
@@ -194,6 +203,12 @@
             <Component Id="System.IdentityModel.Tokens.Jwt.dll" Guid="*">
                 <File Id="System.IdentityModel.Tokens.Jwt.dll" KeyPath="yes" Source="$(var.HarvestPath)\System.IdentityModel.Tokens.Jwt.dll" />
             </Component>
+            <Component Id="System.IO.FileSystem.AccessControl.dll" Guid="*">
+                <File Id="System.IO.FileSystem.AccessControl.dll" KeyPath="yes" Source="$(var.HarvestPath)\System.IO.FileSystem.AccessControl.dll" />
+            </Component>
+            <Component Id="System.Memory.Data.dll" Guid="*">
+                <File Id="System.Memory.Data.dll" KeyPath="yes" Source="$(var.HarvestPath)\System.Memory.Data.dll" />
+            </Component>
             <Component Id="System.Memory.dll" Guid="*">
                 <File Id="System.Memory.dll" KeyPath="yes" Source="$(var.HarvestPath)\System.Memory.dll" />
             </Component>
@@ -227,7 +242,16 @@
             <Component Id="System.ValueTuple.dll" Guid="*">
                 <File Id="System.ValueTuple.dll" KeyPath="yes" Source="$(var.HarvestPath)\System.ValueTuple.dll" />
             </Component>
+            <Component Id="XPath2.dll" Guid="*">
+                <File Id="XPath2.dll" KeyPath="yes" Source="$(var.HarvestPath)\XPath2.dll" />
+            </Component>
+            <Component Id="XPath2.Extensions.dll" Guid="*">
+                <File Id="XPath2.Extensions.dll" KeyPath="yes" Source="$(var.HarvestPath)\XPath2.Extensions.dll" />
+            </Component>
             <Directory Id="cs" Name="cs">
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" KeyPath="yes" Source="$(var.HarvestPath)\cs\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll" KeyPath="yes" Source="$(var.HarvestPath)\cs\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -239,6 +263,9 @@
                 <Component Id="Microsoft.Data.SqlClient.resources.dll" Guid="*">
                     <File Id="Microsoft.Data.SqlClient.resources.dll" KeyPath="yes" Source="$(var.HarvestPath)\de\Microsoft.Data.SqlClient.resources.dll" />
                 </Component>
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_1" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_1" KeyPath="yes" Source="$(var.HarvestPath)\de\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_1" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_1" KeyPath="yes" Source="$(var.HarvestPath)\de\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -250,6 +277,9 @@
                 <Component Id="Microsoft.Data.SqlClient.resources.dll_1" Guid="*">
                     <File Id="Microsoft.Data.SqlClient.resources.dll_1" KeyPath="yes" Source="$(var.HarvestPath)\es\Microsoft.Data.SqlClient.resources.dll" />
                 </Component>
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_2" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_2" KeyPath="yes" Source="$(var.HarvestPath)\es\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_2" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_2" KeyPath="yes" Source="$(var.HarvestPath)\es\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -261,6 +291,9 @@
                 <Component Id="Microsoft.Data.SqlClient.resources.dll_2" Guid="*">
                     <File Id="Microsoft.Data.SqlClient.resources.dll_2" KeyPath="yes" Source="$(var.HarvestPath)\fr\Microsoft.Data.SqlClient.resources.dll" />
                 </Component>
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_3" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_3" KeyPath="yes" Source="$(var.HarvestPath)\fr\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_3" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_3" KeyPath="yes" Source="$(var.HarvestPath)\fr\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -272,6 +305,9 @@
                 <Component Id="Microsoft.Data.SqlClient.resources.dll_3" Guid="*">
                     <File Id="Microsoft.Data.SqlClient.resources.dll_3" KeyPath="yes" Source="$(var.HarvestPath)\it\Microsoft.Data.SqlClient.resources.dll" />
                 </Component>
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_4" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_4" KeyPath="yes" Source="$(var.HarvestPath)\it\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_4" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_4" KeyPath="yes" Source="$(var.HarvestPath)\it\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -283,6 +319,9 @@
                 <Component Id="Microsoft.Data.SqlClient.resources.dll_4" Guid="*">
                     <File Id="Microsoft.Data.SqlClient.resources.dll_4" KeyPath="yes" Source="$(var.HarvestPath)\ja\Microsoft.Data.SqlClient.resources.dll" />
                 </Component>
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_5" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_5" KeyPath="yes" Source="$(var.HarvestPath)\ja\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_5" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_5" KeyPath="yes" Source="$(var.HarvestPath)\ja\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -294,6 +333,9 @@
                 <Component Id="Microsoft.Data.SqlClient.resources.dll_5" Guid="*">
                     <File Id="Microsoft.Data.SqlClient.resources.dll_5" KeyPath="yes" Source="$(var.HarvestPath)\ko\Microsoft.Data.SqlClient.resources.dll" />
                 </Component>
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_6" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_6" KeyPath="yes" Source="$(var.HarvestPath)\ko\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_6" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_6" KeyPath="yes" Source="$(var.HarvestPath)\ko\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -302,6 +344,9 @@
                 </Component>
             </Directory>
             <Directory Id="pl" Name="pl">
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_7" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_7" KeyPath="yes" Source="$(var.HarvestPath)\pl\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_7" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_7" KeyPath="yes" Source="$(var.HarvestPath)\pl\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -313,6 +358,9 @@
                 <Component Id="Microsoft.Data.SqlClient.resources.dll_6" Guid="*">
                     <File Id="Microsoft.Data.SqlClient.resources.dll_6" KeyPath="yes" Source="$(var.HarvestPath)\pt-BR\Microsoft.Data.SqlClient.resources.dll" />
                 </Component>
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_8" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_8" KeyPath="yes" Source="$(var.HarvestPath)\pt-BR\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_8" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_8" KeyPath="yes" Source="$(var.HarvestPath)\pt-BR\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -324,6 +372,9 @@
                 <Component Id="Microsoft.Data.SqlClient.resources.dll_7" Guid="*">
                     <File Id="Microsoft.Data.SqlClient.resources.dll_7" KeyPath="yes" Source="$(var.HarvestPath)\ru\Microsoft.Data.SqlClient.resources.dll" />
                 </Component>
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_9" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_9" KeyPath="yes" Source="$(var.HarvestPath)\ru\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_9" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_9" KeyPath="yes" Source="$(var.HarvestPath)\ru\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -332,6 +383,9 @@
                 </Component>
             </Directory>
             <Directory Id="tr" Name="tr">
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_10" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_10" KeyPath="yes" Source="$(var.HarvestPath)\tr\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_10" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_10" KeyPath="yes" Source="$(var.HarvestPath)\tr\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -343,6 +397,9 @@
                 <Component Id="Microsoft.Data.SqlClient.resources.dll_8" Guid="*">
                     <File Id="Microsoft.Data.SqlClient.resources.dll_8" KeyPath="yes" Source="$(var.HarvestPath)\zh-Hans\Microsoft.Data.SqlClient.resources.dll" />
                 </Component>
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_11" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_11" KeyPath="yes" Source="$(var.HarvestPath)\zh-Hans\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_11" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_11" KeyPath="yes" Source="$(var.HarvestPath)\zh-Hans\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -354,6 +411,9 @@
                 <Component Id="Microsoft.Data.SqlClient.resources.dll_9" Guid="*">
                     <File Id="Microsoft.Data.SqlClient.resources.dll_9" KeyPath="yes" Source="$(var.HarvestPath)\zh-Hant\Microsoft.Data.SqlClient.resources.dll" />
                 </Component>
+                <Component Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_12" Guid="*">
+                    <File Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_12" KeyPath="yes" Source="$(var.HarvestPath)\zh-Hant\Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
+                </Component>
                 <Component Id="Microsoft.VisualStudio.Threading.resources.dll_12" Guid="*">
                     <File Id="Microsoft.VisualStudio.Threading.resources.dll_12" KeyPath="yes" Source="$(var.HarvestPath)\zh-Hant\Microsoft.VisualStudio.Threading.resources.dll" />
                 </Component>
@@ -381,13 +441,15 @@
             <ComponentRef Id="Microsoft.Bcl.AsyncInterfaces.dll" />
             <ComponentRef Id="Microsoft.Crm.Sdk.Proxy.dll" />
             <ComponentRef Id="Microsoft.Data.SqlClient.dll" />
-            <ComponentRef Id="Microsoft.Data.SqlClient.pdb" />
+            <ComponentRef Id="Microsoft.Data.SqlClient.SNI.arm64.dll" />
+            <ComponentRef Id="Microsoft.Data.SqlClient.SNI.arm64.pdb" />
             <ComponentRef Id="Microsoft.Data.SqlClient.SNI.x64.dll" />
             <ComponentRef Id="Microsoft.Data.SqlClient.SNI.x64.pdb" />
             <ComponentRef Id="Microsoft.Data.SqlClient.SNI.x86.dll" />
             <ComponentRef Id="Microsoft.Data.SqlClient.SNI.x86.pdb" />
             <ComponentRef Id="Microsoft.Identity.Client.dll" />
             <ComponentRef Id="Microsoft.Identity.Client.Extensions.Msal.dll" />
+            <ComponentRef Id="Microsoft.IdentityModel.Abstractions.dll" />
             <ComponentRef Id="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
             <ComponentRef Id="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" />
             <ComponentRef Id="Microsoft.IdentityModel.JsonWebTokens.dll" />
@@ -399,6 +461,7 @@
             <ComponentRef Id="Microsoft.SqlServer.ConnectionInfo.dll" />
             <ComponentRef Id="Microsoft.SqlServer.RegSvrEnum.dll" />
             <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.dll" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.pdb" />
             <ComponentRef Id="Microsoft.VisualStudio.CoreUtility.dll" />
             <ComponentRef Id="Microsoft.VisualStudio.Imaging.dll" />
             <ComponentRef Id="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.dll" />
@@ -429,6 +492,8 @@
             <ComponentRef Id="System.Configuration.ConfigurationManager.dll" />
             <ComponentRef Id="System.Diagnostics.DiagnosticSource.dll" />
             <ComponentRef Id="System.IdentityModel.Tokens.Jwt.dll" />
+            <ComponentRef Id="System.IO.FileSystem.AccessControl.dll" />
+            <ComponentRef Id="System.Memory.Data.dll" />
             <ComponentRef Id="System.Memory.dll" />
             <ComponentRef Id="System.Numerics.Vectors.dll" />
             <ComponentRef Id="System.Runtime.CompilerServices.Unsafe.dll" />
@@ -440,40 +505,55 @@
             <ComponentRef Id="System.Text.Json.dll" />
             <ComponentRef Id="System.Threading.Tasks.Extensions.dll" />
             <ComponentRef Id="System.ValueTuple.dll" />
+            <ComponentRef Id="XPath2.dll" />
+            <ComponentRef Id="XPath2.Extensions.dll" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll" />
             <ComponentRef Id="Microsoft.Data.SqlClient.resources.dll" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_1" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_1" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_1" />
             <ComponentRef Id="Microsoft.Data.SqlClient.resources.dll_1" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_2" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_2" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_2" />
             <ComponentRef Id="Microsoft.Data.SqlClient.resources.dll_2" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_3" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_3" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_3" />
             <ComponentRef Id="Microsoft.Data.SqlClient.resources.dll_3" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_4" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_4" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_4" />
             <ComponentRef Id="Microsoft.Data.SqlClient.resources.dll_4" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_5" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_5" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_5" />
             <ComponentRef Id="Microsoft.Data.SqlClient.resources.dll_5" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_6" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_6" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_6" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_7" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_7" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_7" />
             <ComponentRef Id="Microsoft.Data.SqlClient.resources.dll_6" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_8" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_8" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_8" />
             <ComponentRef Id="Microsoft.Data.SqlClient.resources.dll_7" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_9" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_9" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_9" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_10" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_10" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_10" />
             <ComponentRef Id="Microsoft.Data.SqlClient.resources.dll_8" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_11" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_11" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_11" />
             <ComponentRef Id="Microsoft.Data.SqlClient.resources.dll_9" />
+            <ComponentRef Id="Microsoft.SqlServer.TransactSql.ScriptDom.resources.dll_12" />
             <ComponentRef Id="Microsoft.VisualStudio.Threading.resources.dll_12" />
             <ComponentRef Id="Microsoft.VisualStudio.Validation.resources.dll_12" />
         </ComponentGroup>
diff --git a/MarkMpn.Sql4Cds.SSMS.20.Setup/MarkMpn.Sql4Cds.SSMS.20.Setup.wixproj b/MarkMpn.Sql4Cds.SSMS.20.Setup/MarkMpn.Sql4Cds.SSMS.20.Setup.wixproj
index 183955fc..8a246279 100644
--- a/MarkMpn.Sql4Cds.SSMS.20.Setup/MarkMpn.Sql4Cds.SSMS.20.Setup.wixproj
+++ b/MarkMpn.Sql4Cds.SSMS.20.Setup/MarkMpn.Sql4Cds.SSMS.20.Setup.wixproj
@@ -21,7 +21,7 @@
     <SuppressValidation>True</SuppressValidation>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>HarvestPath=..\MarkMpn.Sql4Cds.SSMS.19\bin\$(Configuration)</DefineConstants>
+    <DefineConstants>HarvestPath=..\MarkMpn.Sql4Cds.SSMS.20\bin\$(Configuration)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
   </PropertyGroup>
@@ -49,6 +49,6 @@
 	</Target>
 	-->
   <Target Name="BeforeBuild">
-    <HeatDirectory Directory="..\MarkMpn.Sql4Cds.SSMS.19\bin\$(Configuration)" PreprocessorVariable="var.HarvestPath" OutputFile="HeatGeneratedFileList.wxs" ComponentGroupName="HeatGenerated" DirectoryRefId="INSTALLFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" SuppressUniqueIds="true" RunAsSeparateProcess="true" />
+    <HeatDirectory Directory="..\MarkMpn.Sql4Cds.SSMS.20\bin\$(Configuration)" PreprocessorVariable="var.HarvestPath" OutputFile="HeatGeneratedFileList.wxs" ComponentGroupName="HeatGenerated" DirectoryRefId="INSTALLFOLDER" AutogenerateGuids="true" ToolPath="$(WixToolPath)" SuppressFragments="true" SuppressRegistry="true" SuppressRootDirectory="true" SuppressUniqueIds="true" RunAsSeparateProcess="true" />
   </Target>
 </Project>
\ No newline at end of file