diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-01-03 14:26:52 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-01-03 16:04:35 -0600 |
commit | 267adbf809c96b37e40a883a6b5241179de876d3 (patch) | |
tree | fcf69daae9af0dd0d6f10f7f3acdbee1d9dc0038 | |
parent | d718243dfbb41f28aa8030939595b6493f4a78f0 (diff) | |
download | wix-267adbf809c96b37e40a883a6b5241179de876d3.tar.gz wix-267adbf809c96b37e40a883a6b5241179de876d3.tar.bz2 wix-267adbf809c96b37e40a883a6b5241179de876d3.zip |
Update to latest Core.
-rw-r--r-- | src/WixToolset.BuildTasks/ToolsetTask.cs | 4 | ||||
-rw-r--r-- | src/test/WixToolsetTest.Sdk/MsbuildFixture.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/WixToolset.BuildTasks/ToolsetTask.cs b/src/WixToolset.BuildTasks/ToolsetTask.cs index 6b171eb0..d48f2a20 100644 --- a/src/WixToolset.BuildTasks/ToolsetTask.cs +++ b/src/WixToolset.BuildTasks/ToolsetTask.cs | |||
@@ -112,10 +112,10 @@ namespace WixToolset.BuildTasks | |||
112 | protected virtual void BuildCommandLine(WixCommandLineBuilder commandLineBuilder) | 112 | protected virtual void BuildCommandLine(WixCommandLineBuilder commandLineBuilder) |
113 | { | 113 | { |
114 | commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo); | 114 | commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo); |
115 | commandLineBuilder.AppendArrayIfNotNull("-sw ", this.SuppressSpecificWarnings); | 115 | commandLineBuilder.AppendArrayIfNotNull("-sw", this.SuppressSpecificWarnings); |
116 | commandLineBuilder.AppendIfTrue("-sw", this.SuppressAllWarnings); | 116 | commandLineBuilder.AppendIfTrue("-sw", this.SuppressAllWarnings); |
117 | commandLineBuilder.AppendIfTrue("-v", this.VerboseOutput); | 117 | commandLineBuilder.AppendIfTrue("-v", this.VerboseOutput); |
118 | commandLineBuilder.AppendArrayIfNotNull("-wx ", this.TreatSpecificWarningsAsErrors); | 118 | commandLineBuilder.AppendArrayIfNotNull("-wx", this.TreatSpecificWarningsAsErrors); |
119 | commandLineBuilder.AppendIfTrue("-wx", this.TreatWarningsAsErrors); | 119 | commandLineBuilder.AppendIfTrue("-wx", this.TreatWarningsAsErrors); |
120 | } | 120 | } |
121 | 121 | ||
diff --git a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs index 051d33fd..f505dbb5 100644 --- a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs | |||
@@ -240,7 +240,7 @@ namespace WixToolsetTest.Sdk | |||
240 | } | 240 | } |
241 | } | 241 | } |
242 | 242 | ||
243 | [Theory(Skip = "Currently fails")] //https://github.com/wixtoolset/issues/issues/5946 | 243 | [Theory(Skip = "https://github.com/wixtoolset/issues/issues/5946")] |
244 | [InlineData(BuildSystem.DotNetCoreSdk)] | 244 | [InlineData(BuildSystem.DotNetCoreSdk)] |
245 | [InlineData(BuildSystem.MSBuild)] | 245 | [InlineData(BuildSystem.MSBuild)] |
246 | [InlineData(BuildSystem.MSBuild64)] | 246 | [InlineData(BuildSystem.MSBuild64)] |