diff options
-rw-r--r-- | src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs | 8 | ||||
-rw-r--r-- | src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs index cd41f16e..87382cb8 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs | |||
@@ -8,7 +8,7 @@ namespace WixToolsetTest.BuildTasks | |||
8 | using WixBuildTools.TestSupport; | 8 | using WixBuildTools.TestSupport; |
9 | using WixToolset.BuildTasks; | 9 | using WixToolset.BuildTasks; |
10 | using WixToolset.Data; | 10 | using WixToolset.Data; |
11 | using WixToolset.Data.Tuples; | 11 | using WixToolset.Data.Symbols; |
12 | using Xunit; | 12 | using Xunit; |
13 | 13 | ||
14 | public class WixBuildTaskFixture | 14 | public class WixBuildTaskFixture |
@@ -57,9 +57,9 @@ namespace WixToolsetTest.BuildTasks | |||
57 | var intermediate = Intermediate.Load(pdbPath); | 57 | var intermediate = Intermediate.Load(pdbPath); |
58 | var section = intermediate.Sections.Single(); | 58 | var section = intermediate.Sections.Single(); |
59 | 59 | ||
60 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 60 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); |
61 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path); | 61 | Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileSymbol[FileSymbolFields.Source].AsPath().Path); |
62 | Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); | 62 | Assert.Equal(@"test.txt", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); |
63 | } | 63 | } |
64 | } | 64 | } |
65 | } | 65 | } |
diff --git a/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs index 3b4457be..b5b97649 100644 --- a/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs +++ b/src/test/WixToolsetTest.MSBuild/MsbuildHeatFixture.cs | |||
@@ -9,7 +9,7 @@ namespace WixToolsetTest.MSBuild | |||
9 | using WixBuildTools.TestSupport; | 9 | using WixBuildTools.TestSupport; |
10 | using WixToolset.Core.TestPackage; | 10 | using WixToolset.Core.TestPackage; |
11 | using WixToolset.Data; | 11 | using WixToolset.Data; |
12 | using WixToolset.Data.Tuples; | 12 | using WixToolset.Data.Symbols; |
13 | using Xunit; | 13 | using Xunit; |
14 | 14 | ||
15 | public class MsbuildHeatFixture | 15 | public class MsbuildHeatFixture |
@@ -65,8 +65,8 @@ namespace WixToolsetTest.MSBuild | |||
65 | var intermediate = Intermediate.Load(pdbPath); | 65 | var intermediate = Intermediate.Load(pdbPath); |
66 | var section = intermediate.Sections.Single(); | 66 | var section = intermediate.Sections.Single(); |
67 | 67 | ||
68 | var fileTuple = section.Tuples.OfType<FileTuple>().Single(); | 68 | var fileSymbol = section.Symbols.OfType<FileSymbol>().Single(); |
69 | Assert.Equal(@"SourceDir\HeatFilePackage.wixproj", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); | 69 | Assert.Equal(@"SourceDir\HeatFilePackage.wixproj", fileSymbol[FileSymbolFields.Source].PreviousValue.AsPath().Path); |
70 | } | 70 | } |
71 | } | 71 | } |
72 | 72 | ||
@@ -141,9 +141,9 @@ namespace WixToolsetTest.MSBuild | |||
141 | var intermediate = Intermediate.Load(pdbPath); | 141 | var intermediate = Intermediate.Load(pdbPath); |
142 | var section = intermediate.Sections.Single(); | 142 | var section = intermediate.Sections.Single(); |
143 | 143 | ||
144 | var fileTuples = section.Tuples.OfType<FileTuple>().ToArray(); | 144 | var fileSymbols = section.Symbols.OfType<FileSymbol>().ToArray(); |
145 | Assert.Equal(@"SourceDir\MyProgram.txt", fileTuples[0][FileTupleFields.Source].PreviousValue.AsPath().Path); | 145 | Assert.Equal(@"SourceDir\MyProgram.txt", fileSymbols[0][FileSymbolFields.Source].PreviousValue.AsPath().Path); |
146 | Assert.Equal(@"SourceDir\MyProgram.json", fileTuples[1][FileTupleFields.Source].PreviousValue.AsPath().Path); | 146 | Assert.Equal(@"SourceDir\MyProgram.json", fileSymbols[1][FileSymbolFields.Source].PreviousValue.AsPath().Path); |
147 | } | 147 | } |
148 | } | 148 | } |
149 | } | 149 | } |