In MSBuild tests, default to Release.
Sean Hall committed
May 31, 2020 at 15:04 UTC
2ba71ab83ea951a01344e2851a1f411affc42f38
3 files changed
+27
-26
src/test/WixToolsetTest.MSBuild/MsbuildFixture.cs
+20
-20
@@ -40,8 +40,8 @@ namespace WixToolsetTest.MSBuild
40
.ToArray();
41
Assert.Equal(new[]
42
{
43
- @"bin\x86\Debug\SimpleBundle.exe",
44
- @"bin\x86\Debug\SimpleBundle.wixpdb",
43
+ @"bin\x86\Release\SimpleBundle.exe",
44
+ @"bin\x86\Release\SimpleBundle.wixpdb",
45
}, paths);
46
}
47
}
@@ -75,8 +75,8 @@ namespace WixToolsetTest.MSBuild
75
.ToArray();
76
Assert.Equal(new[]
77
{
78
- @"bin\x86\Debug\SimpleMergeModule.msm",
79
- @"bin\x86\Debug\SimpleMergeModule.wixpdb",
78
+ @"bin\x86\Release\SimpleMergeModule.msm",
79
+ @"bin\x86\Release\SimpleMergeModule.wixpdb",
80
}, paths);
81
}
82
}
@@ -110,9 +110,9 @@ namespace WixToolsetTest.MSBuild
110
.ToArray();
111
Assert.Equal(new[]
112
{
113
- @"bin\x86\Debug\en-US\cab1.cab",
114
- @"bin\x86\Debug\en-US\MsiPackage.msi",
115
- @"bin\x86\Debug\en-US\MsiPackage.wixpdb",
113
+ @"bin\x86\Release\en-US\cab1.cab",
114
+ @"bin\x86\Release\en-US\MsiPackage.msi",
115
+ @"bin\x86\Release\en-US\MsiPackage.wixpdb",
116
}, paths);
117
}
118
}
@@ -143,9 +143,9 @@ namespace WixToolsetTest.MSBuild
143
.ToArray();
144
Assert.Equal(new[]
145
{
146
- @"bin\x86\Debug\cab1.cab",
147
- @"bin\x86\Debug\MergeMsiPackage.msi",
148
- @"bin\x86\Debug\MergeMsiPackage.wixpdb",
146
+ @"bin\x86\Release\cab1.cab",
147
+ @"bin\x86\Release\MergeMsiPackage.msi",
148
+ @"bin\x86\Release\MergeMsiPackage.wixpdb",
149
}, paths);
150
}
151
}
@@ -157,9 +157,9 @@ namespace WixToolsetTest.MSBuild
157
{
158
var expectedOutputs = new[]
159
{
160
- @"bin\x86\Debug\en-US\cab1.cab",
161
- @"bin\x86\Debug\en-US\MsiPackage.msi",
162
- @"bin\x86\Debug\en-US\MsiPackage.wixpdb",
160
+ @"bin\x86\Release\en-US\cab1.cab",
161
+ @"bin\x86\Release\en-US\MsiPackage.msi",
162
+ @"bin\x86\Release\en-US\MsiPackage.wixpdb",
163
};
164
165
this.AssertWixpdb(buildSystem, null, expectedOutputs);
@@ -173,8 +173,8 @@ namespace WixToolsetTest.MSBuild
173
{
174
this.AssertWixpdb(buildSystem, "NONE", new[]
175
{
176
- @"bin\x86\Debug\en-US\cab1.cab",
177
- @"bin\x86\Debug\en-US\MsiPackage.msi",
176
+ @"bin\x86\Release\en-US\cab1.cab",
177
+ @"bin\x86\Release\en-US\MsiPackage.msi",
178
});
179
}
180
@@ -232,9 +232,9 @@ namespace WixToolsetTest.MSBuild
232
.ToArray();
233
Assert.Equal(new[]
234
{
235
- @"bin\x64\Debug\en-US\cab1.cab",
236
- @"bin\x64\Debug\en-US\MsiPackage.msi",
237
- @"bin\x64\Debug\en-US\MsiPackage.wixpdb",
235
+ @"bin\x64\Release\en-US\cab1.cab",
236
+ @"bin\x64\Release\en-US\MsiPackage.msi",
237
+ @"bin\x64\Release\en-US\MsiPackage.wixpdb",
238
}, paths);
239
}
240
}
@@ -309,7 +309,7 @@ namespace WixToolsetTest.MSBuild
309
var path = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
310
.Select(s => s.Substring(baseFolder.Length + 1))
311
.Single();
312
- Assert.Equal(@"bin\x86\Debug\MsiPackage.wixipl", path);
312
+ Assert.Equal(@"bin\x86\Release\MsiPackage.wixipl", path);
313
}
314
}
315
@@ -360,7 +360,7 @@ namespace WixToolsetTest.MSBuild
360
"Package.wxs",
361
"PackageComponents.wxs",
362
@"data\test.txt",
363
- @"obj\x86\Debug\MsiPackage.wixproj.FileListAbsolute.txt",
363
+ @"obj\x86\Release\MsiPackage.wixproj.FileListAbsolute.txt",
364
};
365
366
var remainingPaths = Directory.EnumerateFiles(baseFolder, @"*.*", SearchOption.AllDirectories)
src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs
+5
-5
@@ -37,7 +37,7 @@ namespace WixToolsetTest.MSBuild
37
var warnings = result.Output.Where(line => line.Contains(": warning"));
38
Assert.Empty(warnings);
39
40
- var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Debug", "_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs");
40
+ var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs");
41
Assert.True(File.Exists(generatedFilePath));
42
43
var generatedContents = File.ReadAllText(generatedFilePath);
@@ -57,7 +57,7 @@ namespace WixToolsetTest.MSBuild
57
"</Fragment>" +
58
"</Wix>", testXml);
59
60
- var pdbPath = Path.Combine(binFolder, "x86", "Debug", "HeatFilePackage.wixpdb");
60
+ var pdbPath = Path.Combine(binFolder, "x86", "Release", "HeatFilePackage.wixpdb");
61
Assert.True(File.Exists(pdbPath));
62
63
var intermediate = Intermediate.Load(pdbPath);
@@ -92,7 +92,7 @@ namespace WixToolsetTest.MSBuild
92
var warnings = result.Output.Where(line => line.Contains(": warning"));
93
Assert.Empty(warnings);
94
95
- var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Debug", "_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs");
95
+ var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs");
96
Assert.True(File.Exists(generatedFilePath));
97
98
var generatedContents = File.ReadAllText(generatedFilePath);
@@ -112,7 +112,7 @@ namespace WixToolsetTest.MSBuild
112
"</Fragment>" +
113
"</Wix>", testXml);
114
115
- generatedFilePath = Path.Combine(intermediateFolder, "x86", "Debug", "_JsonProductComponents_INSTALLFOLDER_MyProgram.json_file.wxs");
115
+ generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_JsonProductComponents_INSTALLFOLDER_MyProgram.json_file.wxs");
116
Assert.True(File.Exists(generatedFilePath));
117
118
generatedContents = File.ReadAllText(generatedFilePath);
@@ -132,7 +132,7 @@ namespace WixToolsetTest.MSBuild
132
"</Fragment>" +
133
"</Wix>", testXml);
134
135
- var pdbPath = Path.Combine(binFolder, "x86", "Debug", "HeatFileMultipleFilesSameFileName.wixpdb");
135
+ var pdbPath = Path.Combine(binFolder, "x86", "Release", "HeatFileMultipleFilesSameFileName.wixpdb");
136
Assert.True(File.Exists(pdbPath));
137
138
var intermediate = Intermediate.Load(pdbPath);
src/test/WixToolsetTest.MSBuild/MsbuildUtilities.cs
+2
-1
@@ -17,10 +17,11 @@ namespace WixToolsetTest.MSBuild
17
{
18
public static readonly string WixPropsPath = Path.Combine(new Uri(typeof(MsbuildUtilities).Assembly.CodeBase).AbsolutePath, "..", "..", "publish", "WixToolset.MSBuild", "build", "WixToolset.MSBuild.props");
19
20
- public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, params string[] arguments)
20
+ public static MsbuildRunnerResult BuildProject(BuildSystem buildSystem, string projectPath, string[] arguments = null, string configuration = "Release")
21
{
22
var allArgs = new List<string>
23
{
24
+ $"-p:Configuration={configuration}",
25
$"-p:WixMSBuildProps={MsbuildUtilities.WixPropsPath}",
26
// Node reuse means that child msbuild processes can stay around after the build completes.
27
// Under that scenario, the root msbuild does not reliably close its streams which causes us to hang.