diff options
| author | Bob Arnson <bob@firegiant.com> | 2021-01-26 11:49:23 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2021-01-26 11:56:45 -0500 |
| commit | 489fc2afcc38c06f5798d29680d74cfcce4f0b6f (patch) | |
| tree | ce532b120b8140a3b08518143ba130a2d720a094 /src | |
| parent | 61ddcf628b37261f0ef1f3c590915b4906cdcb88 (diff) | |
| download | wix-489fc2afcc38c06f5798d29680d74cfcce4f0b6f.tar.gz wix-489fc2afcc38c06f5798d29680d74cfcce4f0b6f.tar.bz2 wix-489fc2afcc38c06f5798d29680d74cfcce4f0b6f.zip | |
Add DefaultCompressionLevel support.
Diffstat (limited to 'src')
3 files changed, 7 insertions, 3 deletions
diff --git a/src/WixToolset.BuildTasks/WixBuild.cs b/src/WixToolset.BuildTasks/WixBuild.cs index b669c52b..dbff7e81 100644 --- a/src/WixToolset.BuildTasks/WixBuild.cs +++ b/src/WixToolset.BuildTasks/WixBuild.cs | |||
| @@ -59,7 +59,9 @@ namespace WixToolset.BuildTasks | |||
| 59 | public ITaskItem BindBuiltOutputsFile { get; set; } | 59 | public ITaskItem BindBuiltOutputsFile { get; set; } |
| 60 | 60 | ||
| 61 | public string CabinetCachePath { get; set; } | 61 | public string CabinetCachePath { get; set; } |
| 62 | |||
| 62 | public int CabinetCreationThreadCount { get; set; } | 63 | public int CabinetCreationThreadCount { get; set; } |
| 64 | |||
| 63 | public string DefaultCompressionLevel { get; set; } | 65 | public string DefaultCompressionLevel { get; set; } |
| 64 | 66 | ||
| 65 | [Output] | 67 | [Output] |
| @@ -69,7 +71,9 @@ namespace WixToolset.BuildTasks | |||
| 69 | public string[] WixVariables { get; set; } | 71 | public string[] WixVariables { get; set; } |
| 70 | 72 | ||
| 71 | public bool SuppressValidation { get; set; } | 73 | public bool SuppressValidation { get; set; } |
| 74 | |||
| 72 | public string[] SuppressIces { get; set; } | 75 | public string[] SuppressIces { get; set; } |
| 76 | |||
| 73 | public string AdditionalCub { get; set; } | 77 | public string AdditionalCub { get; set; } |
| 74 | 78 | ||
| 75 | protected override string ToolName => "wix.exe"; | 79 | protected override string ToolName => "wix.exe"; |
| @@ -95,6 +99,7 @@ namespace WixToolset.BuildTasks | |||
| 95 | commandLineBuilder.AppendSwitchIfNotNull("-contentsfile ", this.BindContentsFile); | 99 | commandLineBuilder.AppendSwitchIfNotNull("-contentsfile ", this.BindContentsFile); |
| 96 | commandLineBuilder.AppendSwitchIfNotNull("-outputsfile ", this.BindOutputsFile); | 100 | commandLineBuilder.AppendSwitchIfNotNull("-outputsfile ", this.BindOutputsFile); |
| 97 | commandLineBuilder.AppendSwitchIfNotNull("-builtoutputsfile ", this.BindBuiltOutputsFile); | 101 | commandLineBuilder.AppendSwitchIfNotNull("-builtoutputsfile ", this.BindBuiltOutputsFile); |
| 102 | commandLineBuilder.AppendSwitchIfNotNull("-defaultcompressionlevel ", this.DefaultCompressionLevel); | ||
| 98 | 103 | ||
| 99 | base.BuildCommandLine(commandLineBuilder); | 104 | base.BuildCommandLine(commandLineBuilder); |
| 100 | 105 | ||
diff --git a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs index 87382cb8..9d132f66 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs | |||
| @@ -45,6 +45,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 45 | OutputFile = new TaskItem(Path.Combine(baseFolder, @"bin\test.msi")), | 45 | OutputFile = new TaskItem(Path.Combine(baseFolder, @"bin\test.msi")), |
| 46 | PdbType = "Full", | 46 | PdbType = "Full", |
| 47 | PdbFile = new TaskItem(pdbPath), | 47 | PdbFile = new TaskItem(pdbPath), |
| 48 | DefaultCompressionLevel = "nOnE", | ||
| 48 | }; | 49 | }; |
| 49 | 50 | ||
| 50 | var result = task.Execute(); | 51 | var result = task.Execute(); |
diff --git a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs index b900447a..3fd580db 100644 --- a/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs +++ b/src/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/Package.wxs | |||
| @@ -1,12 +1,10 @@ | |||
| 1 | <?define Variable = "Value" ?> | 1 | <?define Variable = "Value" ?> |
| 2 | <?define Variable = "DifferentValue" ?> | 2 | <?define Variable = "DifferentValue" ?> |
| 3 | 3 | ||
| 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
| 5 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200"> | 5 | <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a" Compressed="yes" InstallerVersion="200"> |
| 6 | |||
| 7 | 6 | ||
| 8 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> | 7 | <MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" /> |
| 9 | <MediaTemplate /> | ||
| 10 | 8 | ||
| 11 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> | 9 | <Feature Id="ProductFeature" Title="!(loc.FeatureTitle)"> |
| 12 | <ComponentGroupRef Id="ProductComponents" /> | 10 | <ComponentGroupRef Id="ProductComponents" /> |
