diff options
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | 24 | ||||
-rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj | 2 |
2 files changed, 22 insertions, 4 deletions
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index 0efe5635..76f57676 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | |||
@@ -409,7 +409,7 @@ namespace WixToolsetTest.CoreIntegration | |||
409 | } | 409 | } |
410 | } | 410 | } |
411 | 411 | ||
412 | [Fact(Skip = "Assembly information not getting gathered yet.")] | 412 | [Fact] |
413 | public void CanBuildWithAssembly() | 413 | public void CanBuildWithAssembly() |
414 | { | 414 | { |
415 | var folder = TestData.Get(@"TestData\Assembly"); | 415 | var folder = TestData.Get(@"TestData\Assembly"); |
@@ -436,7 +436,7 @@ namespace WixToolsetTest.CoreIntegration | |||
436 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); | 436 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb"))); |
437 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\AssemblyMsiPackage\candle.exe"))); | 437 | Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\AssemblyMsiPackage\candle.exe"))); |
438 | 438 | ||
439 | var intermediate = Intermediate.Load(Path.Combine(baseFolder, @"test.wir")); | 439 | var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); |
440 | var section = intermediate.Sections.Single(); | 440 | var section = intermediate.Sections.Single(); |
441 | 441 | ||
442 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); | 442 | var wixFile = section.Tuples.OfType<WixFileTuple>().Single(); |
@@ -444,7 +444,25 @@ namespace WixToolsetTest.CoreIntegration | |||
444 | Assert.Equal(@"candle.exe", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); | 444 | Assert.Equal(@"candle.exe", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path); |
445 | 445 | ||
446 | var msiAssemblyNameTuples = section.Tuples.OfType<MsiAssemblyNameTuple>(); | 446 | var msiAssemblyNameTuples = section.Tuples.OfType<MsiAssemblyNameTuple>(); |
447 | Assert.NotEmpty(msiAssemblyNameTuples); | 447 | Assert.Equal(new[] |
448 | { | ||
449 | "culture", | ||
450 | "fileVersion", | ||
451 | "name", | ||
452 | "processorArchitecture", | ||
453 | "publicKeyToken", | ||
454 | "version" | ||
455 | }, msiAssemblyNameTuples.OrderBy(a => a.Name).Select(a => a.Name).ToArray()); | ||
456 | |||
457 | Assert.Equal(new[] | ||
458 | { | ||
459 | "neutral", | ||
460 | "3.11.11810.0", | ||
461 | "candle", | ||
462 | "x86", | ||
463 | "256B3414DFA97718", | ||
464 | "3.0.0.0" | ||
465 | }, msiAssemblyNameTuples.OrderBy(a => a.Name).Select(a => a.Value).ToArray()); | ||
448 | } | 466 | } |
449 | } | 467 | } |
450 | 468 | ||
diff --git a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj index 9cea0f4c..2a20fcff 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj +++ b/src/test/WixToolsetTest.CoreIntegration/WixToolsetTest.CoreIntegration.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |