summaryrefslogtreecommitdiff
path: root/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs')
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
index 8b2e8e3d..cb14bc43 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
@@ -36,15 +36,15 @@ namespace WixToolsetTest.Sdk
36 var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true); 36 var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true);
37 Assert.Single(heatCommandLines); 37 Assert.Single(heatCommandLines);
38 38
39 var warnings = result.Output.Where(line => line.Contains(": warning")); 39 var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
40 Assert.Empty(warnings); 40 WixAssert.StringCollectionEmpty(warnings);
41 41
42 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs"); 42 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ProductComponents_INSTALLFOLDER_HeatFilePackage.wixproj_file.wxs");
43 Assert.True(File.Exists(generatedFilePath)); 43 Assert.True(File.Exists(generatedFilePath));
44 44
45 var generatedContents = File.ReadAllText(generatedFilePath); 45 var generatedContents = File.ReadAllText(generatedFilePath);
46 var testXml = generatedContents.GetTestXml(); 46 var testXml = generatedContents.GetTestXml();
47 Assert.Equal(@"<Wix>" + 47 WixAssert.StringEqual(@"<Wix>" +
48 "<Fragment>" + 48 "<Fragment>" +
49 "<DirectoryRef Id='INSTALLFOLDER'>" + 49 "<DirectoryRef Id='INSTALLFOLDER'>" +
50 "<Component Id='HeatFilePackage.wixproj' Guid='*'>" + 50 "<Component Id='HeatFilePackage.wixproj' Guid='*'>" +
@@ -92,15 +92,15 @@ namespace WixToolsetTest.Sdk
92 var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true); 92 var heatCommandLines = MsbuildUtilities.GetToolCommandLines(result, "heat", "file", buildSystem, true);
93 Assert.Equal(2, heatCommandLines.Count()); 93 Assert.Equal(2, heatCommandLines.Count());
94 94
95 var warnings = result.Output.Where(line => line.Contains(": warning")); 95 var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
96 Assert.Empty(warnings); 96 WixAssert.StringCollectionEmpty(warnings);
97 97
98 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs"); 98 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_TxtProductComponents_INSTALLFOLDER_MyProgram.txt_file.wxs");
99 Assert.True(File.Exists(generatedFilePath)); 99 Assert.True(File.Exists(generatedFilePath));
100 100
101 var generatedContents = File.ReadAllText(generatedFilePath); 101 var generatedContents = File.ReadAllText(generatedFilePath);
102 var testXml = generatedContents.GetTestXml(); 102 var testXml = generatedContents.GetTestXml();
103 Assert.Equal("<Wix>" + 103 WixAssert.StringEqual("<Wix>" +
104 "<Fragment>" + 104 "<Fragment>" +
105 "<DirectoryRef Id='INSTALLFOLDER'>" + 105 "<DirectoryRef Id='INSTALLFOLDER'>" +
106 "<Component Id='MyProgram.txt' Guid='*'>" + 106 "<Component Id='MyProgram.txt' Guid='*'>" +
@@ -120,7 +120,7 @@ namespace WixToolsetTest.Sdk
120 120
121 generatedContents = File.ReadAllText(generatedFilePath); 121 generatedContents = File.ReadAllText(generatedFilePath);
122 testXml = generatedContents.GetTestXml(); 122 testXml = generatedContents.GetTestXml();
123 Assert.Equal("<Wix>" + 123 WixAssert.StringEqual("<Wix>" +
124 "<Fragment>" + 124 "<Fragment>" +
125 "<DirectoryRef Id='INSTALLFOLDER'>" + 125 "<DirectoryRef Id='INSTALLFOLDER'>" +
126 "<Component Id='MyProgram.json' Guid='*'>" + 126 "<Component Id='MyProgram.json' Guid='*'>" +
@@ -184,15 +184,15 @@ namespace WixToolsetTest.Sdk
184 Assert.DoesNotContain("-usetoolsversion", heatCommandLine); 184 Assert.DoesNotContain("-usetoolsversion", heatCommandLine);
185 } 185 }
186 186
187 var warnings = result.Output.Where(line => line.Contains(": warning")); 187 var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
188 Assert.Empty(warnings); 188 WixAssert.StringCollectionEmpty(warnings);
189 189
190 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ToolsVersion4Cs.wxs"); 190 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_ToolsVersion4Cs.wxs");
191 Assert.True(File.Exists(generatedFilePath)); 191 Assert.True(File.Exists(generatedFilePath));
192 192
193 var generatedContents = File.ReadAllText(generatedFilePath); 193 var generatedContents = File.ReadAllText(generatedFilePath);
194 var testXml = generatedContents.GetTestXml(); 194 var testXml = generatedContents.GetTestXml();
195 Assert.Equal(@"<Wix>" + 195 WixAssert.StringEqual(@"<Wix>" +
196 "<Fragment>" + 196 "<Fragment>" +
197 "<DirectoryRef Id='ToolsVersion4Cs.Binaries'>" + 197 "<DirectoryRef Id='ToolsVersion4Cs.Binaries'>" +
198 "<Component Id='ToolsVersion4Cs.Binaries.ToolsVersion4Cs.dll' Guid='*'>" + 198 "<Component Id='ToolsVersion4Cs.Binaries.ToolsVersion4Cs.dll' Guid='*'>" +
@@ -253,7 +253,7 @@ namespace WixToolsetTest.Sdk
253 var section = intermediate.Sections.Single(); 253 var section = intermediate.Sections.Single();
254 254
255 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); 255 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
256 Assert.Equal(Path.Combine(fs.BaseFolder, "ToolsVersion4Cs", "bin", "Release\\\\ToolsVersion4Cs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path); 256 WixAssert.StringEqual(Path.Combine(fs.BaseFolder, "ToolsVersion4Cs", "bin", "Release\\\\ToolsVersion4Cs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path);
257 } 257 }
258 } 258 }
259 259
@@ -301,15 +301,15 @@ namespace WixToolsetTest.Sdk
301 Assert.DoesNotContain("-usetoolsversion", heatCommandLine); 301 Assert.DoesNotContain("-usetoolsversion", heatCommandLine);
302 } 302 }
303 303
304 var warnings = result.Output.Where(line => line.Contains(": warning")); 304 var warnings = result.Output.Where(line => line.Contains(": warning")).ToArray();
305 Assert.Empty(warnings); 305 WixAssert.StringCollectionEmpty(warnings);
306 306
307 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_SdkStyleCs.wxs"); 307 var generatedFilePath = Path.Combine(intermediateFolder, "x86", "Release", "_SdkStyleCs.wxs");
308 Assert.True(File.Exists(generatedFilePath)); 308 Assert.True(File.Exists(generatedFilePath));
309 309
310 var generatedContents = File.ReadAllText(generatedFilePath); 310 var generatedContents = File.ReadAllText(generatedFilePath);
311 var testXml = generatedContents.GetTestXml(); 311 var testXml = generatedContents.GetTestXml();
312 Assert.Equal(@"<Wix>" + 312 WixAssert.StringEqual(@"<Wix>" +
313 "<Fragment>" + 313 "<Fragment>" +
314 "<DirectoryRef Id='SdkStyleCs.Binaries'>" + 314 "<DirectoryRef Id='SdkStyleCs.Binaries'>" +
315 "<Component Id='SdkStyleCs.Binaries.SdkStyleCs.dll' Guid='*'>" + 315 "<Component Id='SdkStyleCs.Binaries.SdkStyleCs.dll' Guid='*'>" +
@@ -368,7 +368,7 @@ namespace WixToolsetTest.Sdk
368 var section = intermediate.Sections.Single(); 368 var section = intermediate.Sections.Single();
369 369
370 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); 370 var fileSymbol = section.Symbols.OfType<FileSymbol>().Single();
371 Assert.Equal(Path.Combine(fs.BaseFolder, "SdkStyleCs", "bin", "Release", "netstandard2.0\\\\SdkStyleCs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path); 371 WixAssert.StringEqual(Path.Combine(fs.BaseFolder, "SdkStyleCs", "bin", "Release", "netstandard2.0\\\\SdkStyleCs.dll"), fileSymbol[FileSymbolFields.Source].AsPath()?.Path);
372 } 372 }
373 } 373 }
374 } 374 }