diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-10-04 13:55:44 -0700 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2018-10-04 18:20:52 -0400 |
| commit | 917bfd43985af3afaac0b3a1d97a89a58bde1f2f (patch) | |
| tree | b5740f71067a9090780aa73bdf07c7138d61959c /src | |
| parent | 36a0bfb5a30a8786794cb41db46ee206435981d3 (diff) | |
| download | wix-917bfd43985af3afaac0b3a1d97a89a58bde1f2f.tar.gz wix-917bfd43985af3afaac0b3a1d97a89a58bde1f2f.tar.bz2 wix-917bfd43985af3afaac0b3a1d97a89a58bde1f2f.zip | |
Skip some MSBuild tests until we can execute tests with out of proc MSBuild
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs | 8 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs index 96f39318..db76a119 100644 --- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs | |||
| @@ -20,7 +20,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 20 | 20 | ||
| 21 | private MsbuildRunner MsbuildRunner { get; } | 21 | private MsbuildRunner MsbuildRunner { get; } |
| 22 | 22 | ||
| 23 | [Fact] | 23 | [Fact(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] |
| 24 | public void CanBuildSimpleMsiPackage() | 24 | public void CanBuildSimpleMsiPackage() |
| 25 | { | 25 | { |
| 26 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | 26 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); |
| @@ -55,7 +55,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 55 | } | 55 | } |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | [Fact] | 58 | [Fact(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] |
| 59 | public void CanBuildSimpleMsiPackageWithWarningSuppressions() | 59 | public void CanBuildSimpleMsiPackageWithWarningSuppressions() |
| 60 | { | 60 | { |
| 61 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | 61 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); |
| @@ -80,7 +80,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 80 | } | 80 | } |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | [Fact] | 83 | [Fact(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] |
| 84 | public void CanBuildSimpleMsiPackageAsWixipl() | 84 | public void CanBuildSimpleMsiPackageAsWixipl() |
| 85 | { | 85 | { |
| 86 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | 86 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); |
| @@ -107,7 +107,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 107 | } | 107 | } |
| 108 | } | 108 | } |
| 109 | 109 | ||
| 110 | [Fact] | 110 | [Fact(Skip ="Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] |
| 111 | public void CanBuildAndCleanSimpleMsiPackage() | 111 | public void CanBuildAndCleanSimpleMsiPackage() |
| 112 | { | 112 | { |
| 113 | var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj"); | 113 | 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 c4a69cdd..93a65ea1 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs | |||
| @@ -13,7 +13,7 @@ namespace WixToolsetTest.BuildTasks | |||
| 13 | 13 | ||
| 14 | public class WixBuildTaskFixture | 14 | public class WixBuildTaskFixture |
| 15 | { | 15 | { |
| 16 | [Fact] | 16 | [Fact(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] |
| 17 | public void CanBuildSimpleMsiPackage() | 17 | public void CanBuildSimpleMsiPackage() |
| 18 | { | 18 | { |
| 19 | var folder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); | 19 | var folder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); |