Remove 32-bit ARM support.
Bob Arnson committed
Sep 20, 2020 at 17:09 UTC
d70e9e5ab5866c8e35b696fd169c9b62c6f5ee74
19 files changed
+43
-66
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0143"
3
+ "WixToolset.Sdk": "4.0.0-build-0157"
4
}
5
}
src/ca/sqlca.vcxproj
-8
@@ -22,14 +22,6 @@
22
<Configuration>Release</Configuration>
23
<Platform>x64</Platform>
24
</ProjectConfiguration>
25
- <ProjectConfiguration Include="Debug|ARM">
26
- <Configuration>Debug</Configuration>
27
- <Platform>ARM</Platform>
28
- </ProjectConfiguration>
29
- <ProjectConfiguration Include="Release|ARM">
30
- <Configuration>Release</Configuration>
31
- <Platform>ARM</Platform>
32
- </ProjectConfiguration>
25
<ProjectConfiguration Include="Debug|ARM64">
26
<Configuration>Debug</Configuration>
27
<Platform>ARM64</Platform>
src/wixext/SqlCompiler.cs
+2
-2
@@ -798,8 +798,8 @@ namespace WixToolset.Sql
798
799
private void AddReferenceToInstallSqlData(IntermediateSection section, SourceLineNumber sourceLineNumbers)
800
{
801
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallSqlData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
802
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallSqlData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
801
+ this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallSqlData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
802
+ this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallSqlData", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
803
}
804
}
805
}
src/wixlib/SqlExtension.wxi
+7
-7
@@ -14,13 +14,13 @@
14
</UI>
15
16
<!-- The SQL custom actions impersonate the user because the user's credentials are used when connecting to the database if none are provided. -->
17
- <CustomAction Id="$(var.Prefix)InstallSqlData$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="InstallSqlData" Execute="immediate" Return="check" />
18
- <CustomAction Id="$(var.Prefix)UninstallSqlData$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="UninstallSqlData" Execute="immediate" Return="check" />
19
- <CustomAction Id="$(var.Prefix)CreateDatabase$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="CreateDatabase" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" />
20
- <CustomAction Id="$(var.Prefix)RollbackCreateDatabase$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="DropDatabase" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" />
21
- <CustomAction Id="$(var.Prefix)DropDatabase$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="DropDatabase" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" />
22
- <CustomAction Id="$(var.Prefix)ExecuteSqlStrings$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" />
23
- <CustomAction Id="$(var.Prefix)RollbackExecuteSqlStrings$(var.Suffix)" BinaryKey="SqlCA$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" />
17
+ <CustomAction Id="$(var.Prefix)InstallSqlData$(var.Suffix)" DllEntry="InstallSqlData" Execute="immediate" Return="check" BinaryRef="SqlCA$(var.Suffix)" />
18
+ <CustomAction Id="$(var.Prefix)UninstallSqlData$(var.Suffix)" DllEntry="UninstallSqlData" Execute="immediate" Return="check" BinaryRef="SqlCA$(var.Suffix)" />
19
+ <CustomAction Id="$(var.Prefix)CreateDatabase$(var.Suffix)" DllEntry="CreateDatabase" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
20
+ <CustomAction Id="$(var.Prefix)RollbackCreateDatabase$(var.Suffix)" DllEntry="DropDatabase" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
21
+ <CustomAction Id="$(var.Prefix)DropDatabase$(var.Suffix)" DllEntry="DropDatabase" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
22
+ <CustomAction Id="$(var.Prefix)ExecuteSqlStrings$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="deferred" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
23
+ <CustomAction Id="$(var.Prefix)RollbackExecuteSqlStrings$(var.Suffix)" DllEntry="ExecuteSqlStrings" Execute="rollback" Return="check" HideTarget="yes" SuppressModularization="yes" TerminalServerAware="yes" BinaryRef="SqlCA$(var.Suffix)" />
24
25
<InstallExecuteSequence>
26
<Custom Action="$(var.Prefix)UninstallSqlData$(var.Suffix)" Before="RemoveFiles" Overridable="yes" Condition="NOT SKIPUNINSTALLSQLDATA AND VersionNT > 400" />
src/wixlib/SqlExtension.wxs
+6
-7
@@ -1,16 +1,15 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
4
<?include caerr.wxi ?>
5
6
<Fragment>
7
<UI>
9
- <Error Id="$(var.msierrSQLFailedCreateDatabase)">!(loc.msierrSQLFailedCreateDatabase)</Error>
10
- <Error Id="$(var.msierrSQLFailedDropDatabase)">!(loc.msierrSQLFailedDropDatabase)</Error>
11
- <Error Id="$(var.msierrSQLFailedConnectDatabase)">!(loc.msierrSQLFailedConnectDatabase)</Error>
12
- <Error Id="$(var.msierrSQLFailedExecString)">!(loc.msierrSQLFailedExecString)</Error>
13
- <Error Id="$(var.msierrSQLDatabaseAlreadyExists)">!(loc.msierrSQLDatabaseAlreadyExists)</Error>
8
+ <Error Id="$(var.msierrSQLFailedCreateDatabase)" Message="!(loc.msierrSQLFailedCreateDatabase)" />
9
+ <Error Id="$(var.msierrSQLFailedDropDatabase)" Message="!(loc.msierrSQLFailedDropDatabase)" />
10
+ <Error Id="$(var.msierrSQLFailedConnectDatabase)" Message="!(loc.msierrSQLFailedConnectDatabase)" />
11
+ <Error Id="$(var.msierrSQLFailedExecString)" Message="!(loc.msierrSQLFailedExecString)" />
12
+ <Error Id="$(var.msierrSQLDatabaseAlreadyExists)" Message="!(loc.msierrSQLDatabaseAlreadyExists)" />
13
</UI>
14
</Fragment>
15
</Wix>
src/wixlib/SqlExtension_arm.wxs
deleted
-8
@@ -1,8 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8" ?>
2
-<!-- 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. -->
3
-
4
-
5
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6
- <?define platform=arm ?>
7
- <?include SqlExtension.wxi ?>
8
-</Wix>
src/wixlib/SqlExtension_arm64.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8" ?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
src/wixlib/SqlExtension_x64.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8" ?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
src/wixlib/SqlExtension_x86.wxs
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8" ?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
src/wixlib/caDecor.wxi
+10
-11
@@ -1,40 +1,39 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
5
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
4
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
<?ifdef Prefix ?>
6
<?undef Prefix ?>
8
- <?endif ?>
7
+ <?endif?>
8
9
<?define Prefix="Wix4" ?>
10
11
<?ifndef platform ?>
12
<?define platform="x86" ?>
14
- <?endif ?>
13
+ <?endif?>
14
15
<?if $(var.platform)="" ?>
16
<?undef platform ?>
17
<?define platform="x86" ?>
19
- <?endif ?>
18
+ <?endif?>
19
20
<?ifdef Suffix ?>
21
<?undef Suffix ?>
23
- <?endif ?>
22
+ <?endif?>
23
24
<?if $(var.platform)~="x86" ?>
25
<?define Suffix="_X86" ?>
27
- <?endif ?>
26
+ <?endif?>
27
28
<?if $(var.platform)~="x64" ?>
29
<?define Suffix="_X64" ?>
31
- <?endif ?>
30
+ <?endif?>
31
32
<?if $(var.platform)~="arm" ?>
33
<?define Suffix="_A32" ?>
35
- <?endif ?>
34
+ <?endif?>
35
36
<?if $(var.platform)~="arm64" ?>
37
<?define Suffix="_A64" ?>
39
- <?endif ?>
38
+ <?endif?>
39
</Include>
src/wixlib/caerr.wxi
+1
-1
@@ -1,4 +1,4 @@
1
-<Include>
1
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
<?define msierrSecureObjectsFailedCreateSD = 25520?>
3
<?define msierrSecureObjectsFailedSet = 25521?>
4
<?define msierrSecureObjectsUnknownType = 25522?>
src/wixlib/de-de.wxl
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
src/wixlib/en-us.wxl
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<WixLocalization Culture="en-us" xmlns="http://wixtoolset.org/schemas/v4/wxl">
src/wixlib/es-es.wxl
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<WixLocalization Culture="es-es" xmlns="http://wixtoolset.org/schemas/v4/wxl">
src/wixlib/ja-jp.wxl
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<WixLocalization Culture="ja-jp" xmlns="http://wixtoolset.org/schemas/v4/wxl">
src/wixlib/pl-pl.wxl
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<WixLocalization Culture="pl-pl" xmlns="http://wixtoolset.org/schemas/v4/wxl">
src/wixlib/pt-br.wxl
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<WixLocalization Culture="pt-br" xmlns="http://wixtoolset.org/schemas/v4/wxl">
src/wixlib/pt-pt.wxl
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<WixLocalization Culture="pt-pt" xmlns="http://wixtoolset.org/schemas/v4/wxl">
src/wixlib/sql.wixproj
+6
-1
@@ -7,7 +7,12 @@
7
</PropertyGroup>
8
9
<ItemGroup>
10
- <ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=ARM" />
10
+ <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
11
+ <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
12
+ <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
13
+ </ItemGroup>
14
+
15
+ <ItemGroup>
16
<ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=ARM64" />
17
<ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=x86" />
18
<ProjectReference Include="..\ca\sqlca.vcxproj" Properties="Platform=x64" />