Re-enable tests and NCrunch with fixes to Core.Native
Rob Mensching committed
Dec 22, 2018 at 13:50 UTC
c82991d4af4ce7fa7330e99e18840ecff4f3fabd
13 files changed
+56
-5
src/WixToolset.BuildTasks/WixToolset.BuildTasks.net461.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file
src/WixToolset.BuildTasks/WixToolset.BuildTasks.netcoreapp2.1.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file
src/WixToolset.MSBuild/WixToolset.MSBuild.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file
src/WixToolset.Tools.Core/WixToolset.Tools.Core.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file
src/dotnet-wix/dotnet-wix.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file
src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+4
-4
@@ -20,7 +20,7 @@ namespace WixToolsetTest.BuildTasks
20
21
private MsbuildRunner MsbuildRunner { get; }
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()
25
{
26
var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
@@ -55,7 +55,7 @@ namespace WixToolsetTest.BuildTasks
55
}
56
}
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()
60
{
61
var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
@@ -80,7 +80,7 @@ namespace WixToolsetTest.BuildTasks
80
}
81
}
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()
85
{
86
var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
@@ -107,7 +107,7 @@ namespace WixToolsetTest.BuildTasks
107
}
108
}
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()
112
{
113
var projectPath = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage\MsiPackage.wixproj");
src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+1
-1
@@ -13,7 +13,7 @@ namespace WixToolsetTest.BuildTasks
13
14
public class WixBuildTaskFixture
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()
18
{
19
var folder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
+1
@@ -1,5 +1,6 @@
1
<ProjectConfiguration>
2
<Settings>
3
<CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
4
+ <HiddenComponentWarnings />
5
</Settings>
6
</ProjectConfiguration>
\ No newline at end of file
src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file
src/wix/wix.net461.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file
src/wix/wix.netcoreapp2.1.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file
src/wixcop/WixCop.net461.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file
src/wixcop/WixCop.netcoreapp2.1.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <HiddenComponentWarnings />
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file