diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-12-22 13:50:44 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-12-22 13:50:44 -0800 |
| commit | c82991d4af4ce7fa7330e99e18840ecff4f3fabd (patch) | |
| tree | 7d717931c0a19529126b43b535c8ea7ad628dc2e /src | |
| parent | 6135ca6f532668ae953a738a3925f4da32b3ae25 (diff) | |
| download | wix-c82991d4af4ce7fa7330e99e18840ecff4f3fabd.tar.gz wix-c82991d4af4ce7fa7330e99e18840ecff4f3fabd.tar.bz2 wix-c82991d4af4ce7fa7330e99e18840ecff4f3fabd.zip | |
Re-enable tests and NCrunch with fixes to Core.Native
Diffstat (limited to 'src')
13 files changed, 56 insertions, 5 deletions
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.net461.v3.ncrunchproject b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.net461.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.net461.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.netcoreapp2.1.v3.ncrunchproject b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.netcoreapp2.1.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.netcoreapp2.1.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.v3.ncrunchproject b/src/WixToolset.MSBuild/WixToolset.MSBuild.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.v3.ncrunchproject b/src/WixToolset.Tools.Core/WixToolset.Tools.Core.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/WixToolset.Tools.Core/WixToolset.Tools.Core.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/dotnet-wix/dotnet-wix.v3.ncrunchproject b/src/dotnet-wix/dotnet-wix.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/dotnet-wix/dotnet-wix.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
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 | |||
| 20 | 20 | ||
| 21 | private MsbuildRunner MsbuildRunner { get; } | 21 | private MsbuildRunner MsbuildRunner { get; } |
| 22 | 22 | ||
| 23 | [Fact(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] | 23 | [Fact] |
| 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(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] | 58 | [Fact] |
| 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(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] | 83 | [Fact] |
| 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(Skip ="Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] | 110 | [Fact] |
| 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 93a65ea1..c4a69cdd 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(Skip = "Re-enable when our assemblies are correctly copied together so they can be loaded by MSBuild via wix.targets")] | 16 | [Fact] |
| 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"); |
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 @@ | |||
| 1 | <ProjectConfiguration> | 1 | <ProjectConfiguration> |
| 2 | <Settings> | 2 | <Settings> |
| 3 | <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace> | 3 | <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace> |
| 4 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | 5 | </Settings> |
| 5 | </ProjectConfiguration> \ No newline at end of file | 6 | </ProjectConfiguration> \ No newline at end of file |
diff --git a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/wix/wix.net461.v3.ncrunchproject b/src/wix/wix.net461.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/wix/wix.net461.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/wix/wix.netcoreapp2.1.v3.ncrunchproject b/src/wix/wix.netcoreapp2.1.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/wix/wix.netcoreapp2.1.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/wixcop/WixCop.net461.v3.ncrunchproject b/src/wixcop/WixCop.net461.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/wixcop/WixCop.net461.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/wixcop/WixCop.netcoreapp2.1.v3.ncrunchproject b/src/wixcop/WixCop.netcoreapp2.1.v3.ncrunchproject new file mode 100644 index 00000000..cf22dfa9 --- /dev/null +++ b/src/wixcop/WixCop.netcoreapp2.1.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <HiddenComponentWarnings /> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
