diff options
author | Bob Arnson <bob@firegiant.com> | 2024-03-17 12:10:29 -0400 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2024-03-18 14:38:06 -0400 |
commit | db7727a8b38e9ca118792c1f22835b3291314869 (patch) | |
tree | 2055ca1287ca24e44bbcbfc89f65d01385a10329 /src/internal | |
parent | 3b842aeea892c9dae01e5167e5f2e35c448f5bda (diff) | |
download | wix-db7727a8b38e9ca118792c1f22835b3291314869.tar.gz wix-db7727a8b38e9ca118792c1f22835b3291314869.tar.bz2 wix-db7727a8b38e9ca118792c1f22835b3291314869.zip |
Fix Profile column definition.
It's a formatted field but was too short.
Fixes https://github.com/wixtoolset/issues/issues/8043.
Diffstat (limited to 'src/internal')
-rw-r--r-- | src/internal/WixInternal.TestSupport/Builder.cs | 15 | ||||
-rw-r--r-- | src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs | 1 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/internal/WixInternal.TestSupport/Builder.cs b/src/internal/WixInternal.TestSupport/Builder.cs index 51b7bb0a..eec51797 100644 --- a/src/internal/WixInternal.TestSupport/Builder.cs +++ b/src/internal/WixInternal.TestSupport/Builder.cs | |||
@@ -100,7 +100,7 @@ namespace WixInternal.TestSupport | |||
100 | } | 100 | } |
101 | } | 101 | } |
102 | 102 | ||
103 | public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[]> decompileFunc, string decompilePath) | 103 | public void BuildAndDecompileAndBuild(Action<string[]> buildFunc, Action<string[]> decompileFunc, string decompilePath, bool validate = false) |
104 | { | 104 | { |
105 | var sourceFiles = Directory.GetFiles(this.SourceFolder, "*.wxs"); | 105 | var sourceFiles = Directory.GetFiles(this.SourceFolder, "*.wxs"); |
106 | var wxlFiles = Directory.GetFiles(this.SourceFolder, "*.wxl"); | 106 | var wxlFiles = Directory.GetFiles(this.SourceFolder, "*.wxl"); |
@@ -145,6 +145,19 @@ namespace WixInternal.TestSupport | |||
145 | 145 | ||
146 | buildFunc(firstBuildArgs.ToArray()); | 146 | buildFunc(firstBuildArgs.ToArray()); |
147 | 147 | ||
148 | if (validate) | ||
149 | { | ||
150 | firstBuildArgs = new List<string> | ||
151 | { | ||
152 | "msi", | ||
153 | "validate", | ||
154 | "-intermediateFolder", intermediateFolder, | ||
155 | outputPath, | ||
156 | }; | ||
157 | |||
158 | buildFunc(firstBuildArgs.ToArray()); | ||
159 | } | ||
160 | |||
148 | // Decompile built output. | 161 | // Decompile built output. |
149 | var decompileArgs = new List<string> | 162 | var decompileArgs = new List<string> |
150 | { | 163 | { |
diff --git a/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs index 1df98d3b..5ac28de1 100644 --- a/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs +++ b/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs | |||
@@ -4,7 +4,6 @@ namespace WixInternal.TestSupport | |||
4 | { | 4 | { |
5 | using System; | 5 | using System; |
6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
7 | using System.IO; | ||
8 | using System.Linq; | 7 | using System.Linq; |
9 | using System.Text; | 8 | using System.Text; |
10 | using System.Xml.Linq; | 9 | using System.Xml.Linq; |