diff options
| author | Bob Arnson <bob@firegiant.com> | 2023-07-21 19:56:59 -0400 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2023-07-21 20:52:25 -0400 |
| commit | 1c50eb8ac6d693b910eb2bd1d44526d9e3f10c50 (patch) | |
| tree | 656a6709bbd4cd119379347236e14f12c2ac30a3 /src | |
| parent | e0641f1479c6f67f6ec119d448b66a74ad5d6b88 (diff) | |
| download | wix-1c50eb8ac6d693b910eb2bd1d44526d9e3f10c50.tar.gz wix-1c50eb8ac6d693b910eb2bd1d44526d9e3f10c50.tar.bz2 wix-1c50eb8ac6d693b910eb2bd1d44526d9e3f10c50.zip | |
Fix mentions of dark.exe.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs | 2 | ||||
| -rw-r--r-- | src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs b/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs index 69cd8fa6..3b2ecdd7 100644 --- a/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs +++ b/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs | |||
| @@ -8,7 +8,7 @@ namespace WixToolset.Core.Burn | |||
| 8 | { | 8 | { |
| 9 | public static Message AttachedContainerPayloadCollision(SourceLineNumber sourceLineNumbers, string payloadId, string payloadName) | 9 | public static Message AttachedContainerPayloadCollision(SourceLineNumber sourceLineNumbers, string payloadId, string payloadName) |
| 10 | { | 10 | { |
| 11 | return Message(sourceLineNumbers, Ids.AttachedContainerPayloadCollision, "The Payload '{0}' has a duplicate Name '{1}' in the attached container. When extracting the bundle with dark.exe, the file will get overwritten.", payloadId, payloadName); | 11 | return Message(sourceLineNumbers, Ids.AttachedContainerPayloadCollision, "The Payload '{0}' has a duplicate Name '{1}' in the attached container. When extracting the bundle with `wix burn extract`, the file will get overwritten.", payloadId, payloadName); |
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | public static Message AttachedContainerPayloadCollision2(SourceLineNumber sourceLineNumbers) | 14 | public static Message AttachedContainerPayloadCollision2(SourceLineNumber sourceLineNumbers) |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 1b64e36c..840334b1 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs | |||
| @@ -611,7 +611,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 611 | .ToArray(); | 611 | .ToArray(); |
| 612 | WixAssert.CompareLineByLine(new string[] | 612 | WixAssert.CompareLineByLine(new string[] |
| 613 | { | 613 | { |
| 614 | "The Payload 'Auto2' has a duplicate Name 'burn.exe' in the attached container. When extracting the bundle with dark.exe, the file will get overwritten.", | 614 | "The Payload 'Auto2' has a duplicate Name 'burn.exe' in the attached container. When extracting the bundle with `wix burn extract`, the file will get overwritten.", |
| 615 | }, attachedContainerWarnings); | 615 | }, attachedContainerWarnings); |
| 616 | 616 | ||
| 617 | var baContainerErrors = result.Messages.Where(m => m.Id == 8002) | 617 | var baContainerErrors = result.Messages.Where(m => m.Id == 8002) |