From c82991d4af4ce7fa7330e99e18840ecff4f3fabd Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 22 Dec 2018 13:50:44 -0800 Subject: Re-enable tests and NCrunch with fixes to Core.Native --- src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs | 8 ++++---- src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs | 2 +- .../WixToolsetTest.BuildTasks.v3.ncrunchproject | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src/test/WixToolsetTest.BuildTasks') diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs index db76a119..96f39318 100644 --- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs @@ -20,7 +20,7 @@ namespace WixToolsetTest.BuildTasks private MsbuildRunner MsbuildRunner { get; } - [Fact(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] + [Fact] public void CanBuildSimpleMsiPackage() { var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); @@ -55,7 +55,7 @@ namespace WixToolsetTest.BuildTasks } } - [Fact(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] + [Fact] public void CanBuildSimpleMsiPackageWithWarningSuppressions() { var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); @@ -80,7 +80,7 @@ namespace WixToolsetTest.BuildTasks } } - [Fact(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] + [Fact] public void CanBuildSimpleMsiPackageAsWixipl() { var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); @@ -107,7 +107,7 @@ namespace WixToolsetTest.BuildTasks } } - [Fact(Skip ="Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] + [Fact] public void CanBuildAndCleanSimpleMsiPackage() { var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); diff --git a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs index 93a65ea1..c4a69cdd 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs @@ -13,7 +13,7 @@ namespace WixToolsetTest.BuildTasks public class WixBuildTaskFixture { - [Fact(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] + [Fact] public void CanBuildSimpleMsiPackage() { var folder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject index 7b5b2139..8f3624cb 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject +++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject @@ -1,5 +1,6 @@  True + \ No newline at end of file -- cgit v1.2.3-55-g6feb