diff options
Diffstat (limited to 'src')
3 files changed, 2 insertions, 5 deletions
diff --git a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs index db4fbf0e..67b869e1 100644 --- a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs +++ b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | |||
| @@ -41,7 +41,6 @@ namespace WixToolset.Core.Burn | |||
| 41 | this.Output = context.IntermediateRepresentation; | 41 | this.Output = context.IntermediateRepresentation; |
| 42 | this.OutputPath = context.OutputPath; | 42 | this.OutputPath = context.OutputPath; |
| 43 | this.OutputPdbPath = context.PdbPath; | 43 | this.OutputPdbPath = context.PdbPath; |
| 44 | //this.VariableResolver = context.VariableResolver; | ||
| 45 | 44 | ||
| 46 | this.BackendExtensions = backedExtensions; | 45 | this.BackendExtensions = backedExtensions; |
| 47 | } | 46 | } |
| @@ -74,8 +73,6 @@ namespace WixToolset.Core.Burn | |||
| 74 | 73 | ||
| 75 | private string IntermediateFolder { get; } | 74 | private string IntermediateFolder { get; } |
| 76 | 75 | ||
| 77 | private IVariableResolver VariableResolver { get; } | ||
| 78 | |||
| 79 | public IReadOnlyCollection<IFileTransfer> FileTransfers { get; private set; } | 76 | public IReadOnlyCollection<IFileTransfer> FileTransfers { get; private set; } |
| 80 | 77 | ||
| 81 | public IReadOnlyCollection<ITrackedFile> TrackedFiles { get; private set; } | 78 | public IReadOnlyCollection<ITrackedFile> TrackedFiles { get; private set; } |
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs index 7fe3c4ec..4aed18da 100644 --- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs +++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs | |||
| @@ -192,7 +192,7 @@ namespace WixToolset.Core.Burn.Bundles | |||
| 192 | string dpiAwarenessValue = null; | 192 | string dpiAwarenessValue = null; |
| 193 | string gdiScalingValue = null; | 193 | string gdiScalingValue = null; |
| 194 | 194 | ||
| 195 | switch(bootstrapperApplicationSymbol.DpiAwareness) | 195 | switch (bootstrapperApplicationSymbol.DpiAwareness) |
| 196 | { | 196 | { |
| 197 | case WixBootstrapperApplicationDpiAwarenessType.GdiScaled: | 197 | case WixBootstrapperApplicationDpiAwarenessType.GdiScaled: |
| 198 | gdiScalingValue = "true"; | 198 | gdiScalingValue = "true"; |
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs index 45dc5160..6040e2c4 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleManifestFixture.cs | |||
| @@ -21,7 +21,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 21 | { | 21 | { |
| 22 | var baseFolder = fs.GetFolder(); | 22 | var baseFolder = fs.GetFolder(); |
| 23 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | 23 | var intermediateFolder = Path.Combine(baseFolder, "obj"); |
| 24 | var bundlePath = Path.Combine(baseFolder, @"bin\test.exe"); | 24 | var bundlePath = Path.Combine(baseFolder, "bin", "test.exe"); |
| 25 | var baFolderPath = Path.Combine(baseFolder, "ba"); | 25 | var baFolderPath = Path.Combine(baseFolder, "ba"); |
| 26 | var extractFolderPath = Path.Combine(baseFolder, "extract"); | 26 | var extractFolderPath = Path.Combine(baseFolder, "extract"); |
| 27 | 27 | ||
