From a768120e296429ad9c027d79a96386bf3f955a01 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Tue, 8 Feb 2022 12:15:35 -0800 Subject: Re-enable skipped test and minor code clean up --- src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs | 2 +- src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs b/src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs index 8d473d17..709d4b93 100644 --- a/src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs +++ b/src/wix/test/WixToolsetTest.Core.Native/MsmFixture.cs @@ -7,7 +7,7 @@ namespace WixToolsetTest.CoreNative public class MsmFixture { - [Fact(Skip = "Test fails in new repo")] + [Fact] public void CanCreateMsmInterface() { var merge = MsmInterop.GetMsmMerge(); diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs index 3b113242..0bee1b01 100644 --- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs +++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs @@ -332,7 +332,6 @@ namespace WixToolsetTest.Sdk { fs.Initialize(sourceFolder); var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, suppressValidation: false); @@ -367,7 +366,6 @@ namespace WixToolsetTest.Sdk { fs.Initialize(sourceFolder); var baseFolder = fs.BaseFolder; - var binFolder = Path.Combine(baseFolder, @"bin\"); var projectPath = Path.Combine(baseFolder, "MsiPackage.wixproj"); var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[] -- cgit v1.2.3-55-g6feb