aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--global.json2
-rw-r--r--src/ca/dependencyca.vcxproj8
-rw-r--r--src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs2
-rw-r--r--src/wixext/DependencyCompiler.cs4
-rw-r--r--src/wixlib/DependencyExtension.wxs11
-rw-r--r--src/wixlib/DependencyExtension_Platform.wxi21
-rw-r--r--src/wixlib/DependencyExtension_arm.wxs8
-rw-r--r--src/wixlib/DependencyExtension_arm64.wxs3
-rw-r--r--src/wixlib/DependencyExtension_x64.wxs3
-rw-r--r--src/wixlib/DependencyExtension_x86.wxs3
-rw-r--r--src/wixlib/caDecor.wxi21
-rw-r--r--src/wixlib/caerr.wxi2
-rw-r--r--src/wixlib/dependency.wixproj8
-rw-r--r--src/wixlib/en-us.wxl3
14 files changed, 41 insertions, 58 deletions
diff --git a/global.json b/global.json
index 7a995d0a..4d9df50b 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
1{ 1{
2 "msbuild-sdks": { 2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0143" 3 "WixToolset.Sdk": "4.0.0-build-0157"
4 } 4 }
5} 5}
diff --git a/src/ca/dependencyca.vcxproj b/src/ca/dependencyca.vcxproj
index c1dfc0c0..ad01a82f 100644
--- a/src/ca/dependencyca.vcxproj
+++ b/src/ca/dependencyca.vcxproj
@@ -20,14 +20,6 @@
20 <Configuration>Release</Configuration> 20 <Configuration>Release</Configuration>
21 <Platform>x64</Platform> 21 <Platform>x64</Platform>
22 </ProjectConfiguration> 22 </ProjectConfiguration>
23 <ProjectConfiguration Include="Debug|ARM">
24 <Configuration>Debug</Configuration>
25 <Platform>ARM</Platform>
26 </ProjectConfiguration>
27 <ProjectConfiguration Include="Release|ARM">
28 <Configuration>Release</Configuration>
29 <Platform>ARM</Platform>
30 </ProjectConfiguration>
31 <ProjectConfiguration Include="Debug|ARM64"> 23 <ProjectConfiguration Include="Debug|ARM64">
32 <Configuration>Debug</Configuration> 24 <Configuration>Debug</Configuration>
33 <Platform>ARM64</Platform> 25 <Platform>ARM64</Platform>
diff --git a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
index 823532ee..67072e36 100644
--- a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
@@ -19,7 +19,7 @@ namespace WixToolsetTest.Dependency
19 var results = build.BuildAndQuery(Build, "WixDependencyProvider"); 19 var results = build.BuildAndQuery(Build, "WixDependencyProvider");
20 Assert.Equal(new[] 20 Assert.Equal(new[]
21 { 21 {
22 "WixDependencyProvider:depJQsOasf1FRUsKxq8THB9sXk8yws\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t", 22 "WixDependencyProvider:dep74OfIcniaqxA7EprRGBw4Oyy3r8\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
23 }, results); 23 }, results);
24 } 24 }
25 25
diff --git a/src/wixext/DependencyCompiler.cs b/src/wixext/DependencyCompiler.cs
index 36a24c67..4aaa373b 100644
--- a/src/wixext/DependencyCompiler.cs
+++ b/src/wixext/DependencyCompiler.cs
@@ -362,7 +362,7 @@ namespace WixToolset.Dependency
362 362
363 if (PackageType.None == packageType) 363 if (PackageType.None == packageType)
364 { 364 {
365 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyCheck", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 365 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyCheck", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
366 366
367 // Generate registry rows for the provider using binder properties. 367 // Generate registry rows for the provider using binder properties.
368 var keyProvides = String.Concat(DependencyCommon.RegistryRoot, key); 368 var keyProvides = String.Concat(DependencyCommon.RegistryRoot, key);
@@ -568,7 +568,7 @@ namespace WixToolset.Dependency
568 568
569 private void AddReferenceToWixDependencyRequire(IntermediateSection section, SourceLineNumber sourceLineNumbers) 569 private void AddReferenceToWixDependencyRequire(IntermediateSection section, SourceLineNumber sourceLineNumbers)
570 { 570 {
571 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyRequire", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); 571 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyRequire", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
572 } 572 }
573 } 573 }
574} 574}
diff --git a/src/wixlib/DependencyExtension.wxs b/src/wixlib/DependencyExtension.wxs
index 21f863d2..0516b18c 100644
--- a/src/wixlib/DependencyExtension.wxs
+++ b/src/wixlib/DependencyExtension.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0"?> 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<!-- 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 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,16 +6,16 @@
7 6
8 <Fragment> 7 <Fragment>
9 <UI Id="WixDependencyErrors"> 8 <UI Id="WixDependencyErrors">
10 <Error Id="$(var.msierrDependencyMissingDependencies)">!(loc.msierrDependencyMissingDependencies)</Error> 9 <Error Id="$(var.msierrDependencyMissingDependencies)" Message="!(loc.msierrDependencyMissingDependencies)" />
11 <Error Id="$(var.msierrDependencyHasDependents)">!(loc.msierrDependencyHasDependents)</Error> 10 <Error Id="$(var.msierrDependencyHasDependents)" Message="!(loc.msierrDependencyHasDependents)" />
12 </UI> 11 </UI>
13 </Fragment> 12 </Fragment>
14 13
15 <Fragment> 14 <Fragment>
16 <Property Id="DISABLEDEPENDENCYCHECK" Secure="yes" SuppressModularization="yes"/> 15 <Property Id="DISABLEDEPENDENCYCHECK" Secure="yes" SuppressModularization="yes" />
17 </Fragment> 16 </Fragment>
18 17
19 <Fragment> 18 <Fragment>
20 <Property Id="IGNOREDEPENDENCIES" Secure="yes" SuppressModularization="yes"/> 19 <Property Id="IGNOREDEPENDENCIES" Secure="yes" SuppressModularization="yes" />
21 </Fragment> 20 </Fragment>
22</Wix> 21</Wix>
diff --git a/src/wixlib/DependencyExtension_Platform.wxi b/src/wixlib/DependencyExtension_Platform.wxi
index 299a93eb..68dec471 100644
--- a/src/wixlib/DependencyExtension_Platform.wxi
+++ b/src/wixlib/DependencyExtension_Platform.wxi
@@ -1,29 +1,28 @@
1<?xml version="1.0"?> 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<!-- 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 2
4 3
5<Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <?include caDecor.wxi ?> 5 <?include caDecor.wxi ?>
7 6
8 <Fragment> 7 <Fragment>
9 <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" BinaryKey="DependencyCA$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes"/> 8 <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
10 <InstallExecuteSequence> 9 <InstallExecuteSequence>
11 <Custom Action="$(var.Prefix)DependencyRequire$(var.Suffix)" Before="WixDependencyCheck$(var.Suffix)" Overridable="yes"><![CDATA[NOT DISABLEDEPENDENCYCHECK]]></Custom> 10 <Custom Action="$(var.Prefix)DependencyRequire$(var.Suffix)" Before="WixDependencyCheck$(var.Suffix)" Overridable="yes" Condition="NOT DISABLEDEPENDENCYCHECK" />
12 </InstallExecuteSequence> 11 </InstallExecuteSequence>
13 <UIRef Id="WixDependencyErrors"/> 12 <UIRef Id="WixDependencyErrors" />
14 <PropertyRef Id="DISABLEDEPENDENCYCHECK"/> 13 <PropertyRef Id="DISABLEDEPENDENCYCHECK" />
15 </Fragment> 14 </Fragment>
16 15
17 <Fragment> 16 <Fragment>
18 <CustomAction Id="$(var.Prefix)DependencyCheck$(var.Suffix)" BinaryKey="DependencyCA$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes"/> 17 <CustomAction Id="$(var.Prefix)DependencyCheck$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
19 <InstallExecuteSequence> 18 <InstallExecuteSequence>
20 <Custom Action="$(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes"><![CDATA[(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES="ALL")]]></Custom> 19 <Custom Action="$(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes" Condition="(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES=&quot;ALL&quot;)" />
21 </InstallExecuteSequence> 20 </InstallExecuteSequence>
22 <UIRef Id="WixDependencyErrors"/> 21 <UIRef Id="WixDependencyErrors" />
23 <PropertyRef Id="IGNOREDEPENDENCIES"/> 22 <PropertyRef Id="IGNOREDEPENDENCIES" />
24 </Fragment> 23 </Fragment>
25 24
26 <Fragment> 25 <Fragment>
27 <Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll"/> 26 <Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll" />
28 </Fragment> 27 </Fragment>
29</Include> 28</Include>
diff --git a/src/wixlib/DependencyExtension_arm.wxs b/src/wixlib/DependencyExtension_arm.wxs
deleted file mode 100644
index d4ba33a3..00000000
--- a/src/wixlib/DependencyExtension_arm.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
1<?xml version="1.0"?>
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 DependencyExtension_Platform.wxi ?>
8</Wix>
diff --git a/src/wixlib/DependencyExtension_arm64.wxs b/src/wixlib/DependencyExtension_arm64.wxs
index 36e023e7..958650e6 100644
--- a/src/wixlib/DependencyExtension_arm64.wxs
+++ b/src/wixlib/DependencyExtension_arm64.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0"?> 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<!-- 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 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/DependencyExtension_x64.wxs b/src/wixlib/DependencyExtension_x64.wxs
index 8298bce6..4fe458e8 100644
--- a/src/wixlib/DependencyExtension_x64.wxs
+++ b/src/wixlib/DependencyExtension_x64.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0"?> 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<!-- 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 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
diff --git a/src/wixlib/DependencyExtension_x86.wxs b/src/wixlib/DependencyExtension_x86.wxs
index 715eba02..d8ac6785 100644
--- a/src/wixlib/DependencyExtension_x86.wxs
+++ b/src/wixlib/DependencyExtension_x86.wxs
@@ -1,5 +1,4 @@
1<?xml version="1.0"?> 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<!-- 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 2
4 3
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<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 @@
1<?xml version="1.0" encoding="utf-8"?> 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<!-- 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 2
4 3
5<Include xmlns="http://schemas.microsoft.com/wix/2006/wi"> 4<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <?ifdef Prefix ?> 5 <?ifdef Prefix ?>
7 <?undef Prefix ?> 6 <?undef Prefix ?>
8 <?endif ?> 7 <?endif?>
9 8
10 <?define Prefix="Wix4" ?> 9 <?define Prefix="Wix4" ?>
11 10
12 <?ifndef platform ?> 11 <?ifndef platform ?>
13 <?define platform="x86" ?> 12 <?define platform="x86" ?>
14 <?endif ?> 13 <?endif?>
15 14
16 <?if $(var.platform)="" ?> 15 <?if $(var.platform)="" ?>
17 <?undef platform ?> 16 <?undef platform ?>
18 <?define platform="x86" ?> 17 <?define platform="x86" ?>
19 <?endif ?> 18 <?endif?>
20 19
21 <?ifdef Suffix ?> 20 <?ifdef Suffix ?>
22 <?undef Suffix ?> 21 <?undef Suffix ?>
23 <?endif ?> 22 <?endif?>
24 23
25 <?if $(var.platform)~="x86" ?> 24 <?if $(var.platform)~="x86" ?>
26 <?define Suffix="_X86" ?> 25 <?define Suffix="_X86" ?>
27 <?endif ?> 26 <?endif?>
28 27
29 <?if $(var.platform)~="x64" ?> 28 <?if $(var.platform)~="x64" ?>
30 <?define Suffix="_X64" ?> 29 <?define Suffix="_X64" ?>
31 <?endif ?> 30 <?endif?>
32 31
33 <?if $(var.platform)~="arm" ?> 32 <?if $(var.platform)~="arm" ?>
34 <?define Suffix="_A32" ?> 33 <?define Suffix="_A32" ?>
35 <?endif ?> 34 <?endif?>
36 35
37 <?if $(var.platform)~="arm64" ?> 36 <?if $(var.platform)~="arm64" ?>
38 <?define Suffix="_A64" ?> 37 <?define Suffix="_A64" ?>
39 <?endif ?> 38 <?endif?>
40</Include> 39</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 @@
1<Include> 1<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <?define msierrSecureObjectsFailedCreateSD = 25520?> 2 <?define msierrSecureObjectsFailedCreateSD = 25520?>
3 <?define msierrSecureObjectsFailedSet = 25521?> 3 <?define msierrSecureObjectsFailedSet = 25521?>
4 <?define msierrSecureObjectsUnknownType = 25522?> 4 <?define msierrSecureObjectsUnknownType = 25522?>
diff --git a/src/wixlib/dependency.wixproj b/src/wixlib/dependency.wixproj
index f7ba0f79..b978a34e 100644
--- a/src/wixlib/dependency.wixproj
+++ b/src/wixlib/dependency.wixproj
@@ -4,12 +4,18 @@
4 <PropertyGroup> 4 <PropertyGroup>
5 <OutputType>Library</OutputType> 5 <OutputType>Library</OutputType>
6 <BindFiles>true</BindFiles> 6 <BindFiles>true</BindFiles>
7 <!-- PropertyModularizationSuppressed -->
7 <SuppressSpecificWarnings>1086</SuppressSpecificWarnings> 8 <SuppressSpecificWarnings>1086</SuppressSpecificWarnings>
8 <Cultures>en-us</Cultures> 9 <Cultures>en-us</Cultures>
9 </PropertyGroup> 10 </PropertyGroup>
10 11
11 <ItemGroup> 12 <ItemGroup>
12 <ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=ARM" /> 13 <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
14 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
15 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
16 </ItemGroup>
17
18 <ItemGroup>
13 <ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=ARM64" /> 19 <ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=ARM64" />
14 <ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=x86" /> 20 <ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=x86" />
15 <ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=x64" /> 21 <ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=x64" />
diff --git a/src/wixlib/en-us.wxl b/src/wixlib/en-us.wxl
index ce29a153..6ad7d63d 100644
--- a/src/wixlib/en-us.wxl
+++ b/src/wixlib/en-us.wxl
@@ -1,5 +1,4 @@
1<?xml version="1.0" encoding="utf-8"?> 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<!-- 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 2
4 3
5<WixLocalization Culture="en-US" xmlns="http://wixtoolset.org/schemas/v4/wxl"> 4<WixLocalization Culture="en-US" xmlns="http://wixtoolset.org/schemas/v4/wxl">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-24 02:44:32 +0000