diff options
| author | Bob Arnson <bob@firegiant.com> | 2021-01-03 18:05:04 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2021-01-03 18:20:53 -0500 |
| commit | 6a035fa8f14425cb642f03767c29de72d7a75d10 (patch) | |
| tree | 3d371f790eaeb4893abb27a9eb1d1c96ad94d664 /src | |
| parent | da9e593a5c044cf5430b071dd194b9d94877c4e1 (diff) | |
| download | wix-6a035fa8f14425cb642f03767c29de72d7a75d10.tar.gz wix-6a035fa8f14425cb642f03767c29de72d7a75d10.tar.bz2 wix-6a035fa8f14425cb642f03767c29de72d7a75d10.zip | |
Fix x64 Burn stub app manifest (test to come)
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core.Burn/BundleBackend.cs | 1 | ||||
| -rw-r--r-- | src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/WixToolset.Core.Burn/BundleBackend.cs b/src/WixToolset.Core.Burn/BundleBackend.cs index 081e4464..4ca54fae 100644 --- a/src/WixToolset.Core.Burn/BundleBackend.cs +++ b/src/WixToolset.Core.Burn/BundleBackend.cs | |||
| @@ -36,6 +36,7 @@ namespace WixToolset.Core.Burn | |||
| 36 | { | 36 | { |
| 37 | extension.PostBackendBind(result); | 37 | extension.PostBackendBind(result); |
| 38 | } | 38 | } |
| 39 | |||
| 39 | return result; | 40 | return result; |
| 40 | } | 41 | } |
| 41 | 42 | ||
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs index 576ac348..dce28e82 100644 --- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs | |||
| @@ -112,7 +112,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
| 112 | 112 | ||
| 113 | var bundleFileName = Path.GetFileName(outputPath); | 113 | var bundleFileName = Path.GetFileName(outputPath); |
| 114 | var bundleAssemblyVersion = windowsAssemblyVersion.ToString(); | 114 | var bundleAssemblyVersion = windowsAssemblyVersion.ToString(); |
| 115 | var bundlePlatform = bundleSymbol.Platform.ToString().ToLower(); | 115 | var bundlePlatform = bundleSymbol.Platform == Platform.X64 ? "amd64" : bundleSymbol.Platform.ToString().ToLower(); |
| 116 | var bundleDescription = bundleSymbol.Name; | 116 | var bundleDescription = bundleSymbol.Name; |
| 117 | 117 | ||
| 118 | using (var memoryStream = new MemoryStream()) | 118 | using (var memoryStream = new MemoryStream()) |