From d70e9e5ab5866c8e35b696fd169c9b62c6f5ee74 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 20 Sep 2020 17:09:52 -0400
Subject: Remove 32-bit ARM support.

---
 global.json                       |  2 +-
 src/ca/sqlca.vcxproj              |  8 --------
 src/wixext/SqlCompiler.cs         |  4 ++--
 src/wixlib/SqlExtension.wxi       | 14 +++++++-------
 src/wixlib/SqlExtension.wxs       | 13 ++++++-------
 src/wixlib/SqlExtension_arm.wxs   |  8 --------
 src/wixlib/SqlExtension_arm64.wxs |  3 +--
 src/wixlib/SqlExtension_x64.wxs   |  3 +--
 src/wixlib/SqlExtension_x86.wxs   |  3 +--
 src/wixlib/caDecor.wxi            | 21 ++++++++++-----------
 src/wixlib/caerr.wxi              |  2 +-
 src/wixlib/de-de.wxl              |  3 +--
 src/wixlib/en-us.wxl              |  3 +--
 src/wixlib/es-es.wxl              |  3 +--
 src/wixlib/ja-jp.wxl              |  3 +--
 src/wixlib/pl-pl.wxl              |  3 +--
 src/wixlib/pt-br.wxl              |  3 +--
 src/wixlib/pt-pt.wxl              |  3 +--
 src/wixlib/sql.wixproj            |  7 ++++++-
 19 files changed, 43 insertions(+), 66 deletions(-)
 delete mode 100644 src/wixlib/SqlExtension_arm.wxs

diff --git a/global.json b/global.json
index 7a995d0a..4d9df50b 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "WixToolset.Sdk": "4.0.0-build-0143"
+    "WixToolset.Sdk": "4.0.0-build-0157"
   }
 }
diff --git a/src/ca/sqlca.vcxproj b/src/ca/sqlca.vcxproj
index e1c5beea..112ad18b 100644
--- a/src/ca/sqlca.vcxproj
+++ b/src/ca/sqlca.vcxproj
@@ -22,14 +22,6 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
       <Platform>ARM64</Platform>
diff --git a/src/wixext/SqlCompiler.cs b/src/wixext/SqlCompiler.cs
index 534fcc27..162306b8 100644
--- a/src/wixext/SqlCompiler.cs
+++ b/src/wixext/SqlCompiler.cs
@@ -798,8 +798,8 @@ namespace WixToolset.Sql
 
         private void AddReferenceToInstallSqlData(IntermediateSection section, SourceLineNumber sourceLineNumbers)
         {
-            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallSqlData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
-            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallSqlData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallSqlData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallSqlData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
         }
     }
 }
diff --git a/src/wixlib/SqlExtension.wxi b/src/wixlib/SqlExtension.wxi
index 9d7d2495..c9261f1d 100644
--- a/src/wixlib/SqlExtension.wxi
+++ b/src/wixlib/SqlExtension.wxi
@@ -14,13 +14,13 @@
         </UI>
 
         <!-- The SQL custom actions impersonate the user because the user's credentials are used when connecting to the database if none are provided. -->
-        <CustomAction Id="$(var.Prefix)InstallSqlData$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="InstallSqlData" Execute="immediate" Return="check" />
-        <CustomAction Id="$(var.Prefix)UninstallSqlData$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="UninstallSqlData" Execute="immediate" Return="check" />
-        <CustomAction Id="$(var.Prefix)CreateDatabase$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="CreateDatabase" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" />
-        <CustomAction Id="$(var.Prefix)RollbackCreateDatabase$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="DropDatabase" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" />
-        <CustomAction Id="$(var.Prefix)DropDatabase$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="DropDatabase" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" />
-        <CustomAction Id="$(var.Prefix)ExecuteSqlStrings$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" />
-        <CustomAction Id="$(var.Prefix)RollbackExecuteSqlStrings$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" />
+        <CustomAction Id="$(var.Prefix)InstallSqlData$(var.Suffix)" DllEntry="InstallSqlData" Execute="immediate" Return="check" BinaryRef="SqlCA$(var.Suffix)" />
+        <CustomAction Id="$(var.Prefix)UninstallSqlData$(var.Suffix)" DllEntry="UninstallSqlData" Execute="immediate" Return="check" BinaryRef="SqlCA$(var.Suffix)" />
+        <CustomAction Id="$(var.Prefix)CreateDatabase$(var.Suffix)" DllEntry="CreateDatabase" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
+        <CustomAction Id="$(var.Prefix)RollbackCreateDatabase$(var.Suffix)" DllEntry="DropDatabase" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
+        <CustomAction Id="$(var.Prefix)DropDatabase$(var.Suffix)" DllEntry="DropDatabase" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
+        <CustomAction Id="$(var.Prefix)ExecuteSqlStrings$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
+        <CustomAction Id="$(var.Prefix)RollbackExecuteSqlStrings$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
 
         <InstallExecuteSequence>
             <Custom Action="$(var.Prefix)UninstallSqlData$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="NOT SKIPUNINSTALLSQLDATA AND VersionNT &gt; 400" />
diff --git a/src/wixlib/SqlExtension.wxs b/src/wixlib/SqlExtension.wxs
index 00a6edcb..8b5320fa 100644
--- a/src/wixlib/SqlExtension.wxs
+++ b/src/wixlib/SqlExtension.wxs
@@ -1,16 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?include caerr.wxi ?>
 
     <Fragment>
         <UI>
-            <Error Id="$(var.msierrSQLFailedCreateDatabase)">!(loc.msierrSQLFailedCreateDatabase)</Error>
-            <Error Id="$(var.msierrSQLFailedDropDatabase)">!(loc.msierrSQLFailedDropDatabase)</Error>
-            <Error Id="$(var.msierrSQLFailedConnectDatabase)">!(loc.msierrSQLFailedConnectDatabase)</Error>
-            <Error Id="$(var.msierrSQLFailedExecString)">!(loc.msierrSQLFailedExecString)</Error>
-            <Error Id="$(var.msierrSQLDatabaseAlreadyExists)">!(loc.msierrSQLDatabaseAlreadyExists)</Error>
+            <Error Id="$(var.msierrSQLFailedCreateDatabase)" Message="!(loc.msierrSQLFailedCreateDatabase)" />
+            <Error Id="$(var.msierrSQLFailedDropDatabase)" Message="!(loc.msierrSQLFailedDropDatabase)" />
+            <Error Id="$(var.msierrSQLFailedConnectDatabase)" Message="!(loc.msierrSQLFailedConnectDatabase)" />
+            <Error Id="$(var.msierrSQLFailedExecString)" Message="!(loc.msierrSQLFailedExecString)" />
+            <Error Id="$(var.msierrSQLDatabaseAlreadyExists)" Message="!(loc.msierrSQLDatabaseAlreadyExists)" />
         </UI>
     </Fragment>
 </Wix>
diff --git a/src/wixlib/SqlExtension_arm.wxs b/src/wixlib/SqlExtension_arm.wxs
deleted file mode 100644
index b5f903f6..00000000
--- a/src/wixlib/SqlExtension_arm.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?define platform=arm ?>
-    <?include SqlExtension.wxi ?>
-</Wix>
diff --git a/src/wixlib/SqlExtension_arm64.wxs b/src/wixlib/SqlExtension_arm64.wxs
index 08394685..e8d22f69 100644
--- a/src/wixlib/SqlExtension_arm64.wxs
+++ b/src/wixlib/SqlExtension_arm64.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/SqlExtension_x64.wxs b/src/wixlib/SqlExtension_x64.wxs
index d7ba8e46..e55a14e4 100644
--- a/src/wixlib/SqlExtension_x64.wxs
+++ b/src/wixlib/SqlExtension_x64.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/SqlExtension_x86.wxs b/src/wixlib/SqlExtension_x86.wxs
index 70aae67c..1a51ed91 100644
--- a/src/wixlib/SqlExtension_x86.wxs
+++ b/src/wixlib/SqlExtension_x86.wxs
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi
index 1d00df8f..b1711518 100644
--- a/src/wixlib/caDecor.wxi
+++ b/src/wixlib/caDecor.wxi
@@ -1,40 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
     <?ifdef Prefix ?>
         <?undef Prefix ?>
-    <?endif ?>
+    <?endif?>
 
     <?define Prefix="Wix4" ?>
 
     <?ifndef platform ?>
         <?define platform="x86" ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)="" ?>
         <?undef platform ?>
         <?define platform="x86" ?>
-    <?endif ?>
+    <?endif?>
 
     <?ifdef Suffix ?>
         <?undef Suffix ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)~="x86" ?>
         <?define Suffix="_X86" ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)~="x64" ?>
         <?define Suffix="_X64" ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)~="arm" ?>
         <?define Suffix="_A32" ?>
-    <?endif ?>
+    <?endif?>
 
     <?if $(var.platform)~="arm64" ?>
         <?define Suffix="_A64" ?>
-    <?endif ?>
+    <?endif?>
 </Include>
diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi
index 141942f2..ff7ec121 100644
--- a/src/wixlib/caerr.wxi
+++ b/src/wixlib/caerr.wxi
@@ -1,4 +1,4 @@
-<Include>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?define msierrSecureObjectsFailedCreateSD = 25520?>
   <?define msierrSecureObjectsFailedSet = 25521?>
   <?define msierrSecureObjectsUnknownType = 25522?>
diff --git a/src/wixlib/de-de.wxl b/src/wixlib/de-de.wxl
index 39a73e8c..ed2313a4 100644
--- a/src/wixlib/de-de.wxl
+++ b/src/wixlib/de-de.wxl
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
diff --git a/src/wixlib/en-us.wxl b/src/wixlib/en-us.wxl
index d89b1c6c..d3ffd5eb 100644
--- a/src/wixlib/en-us.wxl
+++ b/src/wixlib/en-us.wxl
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
diff --git a/src/wixlib/es-es.wxl b/src/wixlib/es-es.wxl
index bc5d0582..b2e5d499 100644
--- a/src/wixlib/es-es.wxl
+++ b/src/wixlib/es-es.wxl
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <WixLocalization Culture="es-es" xmlns="http://wixtoolset.org/schemas/v4/wxl">
diff --git a/src/wixlib/ja-jp.wxl b/src/wixlib/ja-jp.wxl
index 23c9aebe..6e35fd17 100644
--- a/src/wixlib/ja-jp.wxl
+++ b/src/wixlib/ja-jp.wxl
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <WixLocalization Culture="ja-jp" xmlns="http://wixtoolset.org/schemas/v4/wxl">
diff --git a/src/wixlib/pl-pl.wxl b/src/wixlib/pl-pl.wxl
index 4f0c7f75..6200e0e9 100644
--- a/src/wixlib/pl-pl.wxl
+++ b/src/wixlib/pl-pl.wxl
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <WixLocalization Culture="pl-pl" xmlns="http://wixtoolset.org/schemas/v4/wxl">
diff --git a/src/wixlib/pt-br.wxl b/src/wixlib/pt-br.wxl
index 63bbc21e..74c53313 100644
--- a/src/wixlib/pt-br.wxl
+++ b/src/wixlib/pt-br.wxl
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <WixLocalization Culture="pt-br" xmlns="http://wixtoolset.org/schemas/v4/wxl">
diff --git a/src/wixlib/pt-pt.wxl b/src/wixlib/pt-pt.wxl
index 28c43878..90d9df4f 100644
--- a/src/wixlib/pt-pt.wxl
+++ b/src/wixlib/pt-pt.wxl
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <WixLocalization Culture="pt-pt" xmlns="http://wixtoolset.org/schemas/v4/wxl">
diff --git a/src/wixlib/sql.wixproj b/src/wixlib/sql.wixproj
index 96673563..7462f684 100644
--- a/src/wixlib/sql.wixproj
+++ b/src/wixlib/sql.wixproj
@@ -7,7 +7,12 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=ARM" />
+    <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
+    <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
+    <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=ARM64" />
     <ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=x86" />
     <ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=x64" />
-- 
cgit v1.2.3-55-g6feb