From 267adbf809c96b37e40a883a6b5241179de876d3 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 3 Jan 2021 14:26:52 -0600 Subject: Update to latest Core. --- src/WixToolset.BuildTasks/ToolsetTask.cs | 4 ++-- 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 protected virtual void BuildCommandLine(WixCommandLineBuilder commandLineBuilder) { commandLineBuilder.AppendIfTrue("-nologo", this.NoLogo); - commandLineBuilder.AppendArrayIfNotNull("-sw ", this.SuppressSpecificWarnings); + commandLineBuilder.AppendArrayIfNotNull("-sw", this.SuppressSpecificWarnings); commandLineBuilder.AppendIfTrue("-sw", this.SuppressAllWarnings); commandLineBuilder.AppendIfTrue("-v", this.VerboseOutput); - commandLineBuilder.AppendArrayIfNotNull("-wx ", this.TreatSpecificWarningsAsErrors); + commandLineBuilder.AppendArrayIfNotNull("-wx", this.TreatSpecificWarningsAsErrors); commandLineBuilder.AppendIfTrue("-wx", this.TreatWarningsAsErrors); } 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 } } - [Theory(Skip = "Currently fails")] //https://github.com/wixtoolset/issues/issues/5946 + [Theory(Skip = "https://github.com/wixtoolset/issues/issues/5946")] [InlineData(BuildSystem.DotNetCoreSdk)] [InlineData(BuildSystem.MSBuild)] [InlineData(BuildSystem.MSBuild64)] -- cgit v1.2.3-55-g6feb