From d0462be8000f18aa7dc0791d02142f000bb19fbf Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Wed, 22 May 2019 00:58:13 -0700 Subject: Integrate latest changes to tuple definitions --- src/test/Example.Extension/Data/example.wir | Bin 534 -> 398 bytes src/test/Example.Extension/ExampleCompilerExtension.cs | 4 ++-- .../WixToolsetTest.CoreIntegration/ExtensionFixture.cs | 2 +- src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs | 2 +- .../WixToolsetTest.CoreIntegration/WixiplFixture.cs | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/test') diff --git a/src/test/Example.Extension/Data/example.wir b/src/test/Example.Extension/Data/example.wir index 674f63fc..ba8ccbbe 100644 Binary files a/src/test/Example.Extension/Data/example.wir and b/src/test/Example.Extension/Data/example.wir differ diff --git a/src/test/Example.Extension/ExampleCompilerExtension.cs b/src/test/Example.Extension/ExampleCompilerExtension.cs index cd9e1fb9..5efb428f 100644 --- a/src/test/Example.Extension/ExampleCompilerExtension.cs +++ b/src/test/Example.Extension/ExampleCompilerExtension.cs @@ -1,4 +1,4 @@ -// 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. +// 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. namespace Example.Extension { @@ -73,7 +73,7 @@ namespace Example.Extension if (!this.Messaging.EncounteredError) { - var tuple = this.ParseHelper.CreateRow(section, sourceLineNumbers, "Example", id); + var tuple = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Example", id); tuple.Set(1, value); } } diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index 8e4bcd54..37ff1839 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs @@ -98,7 +98,7 @@ namespace WixToolsetTest.CoreIntegration var section = intermediate.Sections.Single(); var property = section.Tuples.OfType().Where(p => p.Id.Id == "ExampleProperty").Single(); - Assert.Equal("ExampleProperty", property.Property); + Assert.Equal("ExampleProperty", property.Id.Id); Assert.Equal("test", property.Value); } } diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs index 0aabc5a9..f28ec7ce 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiFixture.cs @@ -534,7 +534,7 @@ namespace WixToolsetTest.CoreIntegration var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir")); var section = intermediate.Sections.Single(); - var platformSummary = section.Tuples.OfType<_SummaryInformationTuple>().Single(s => s.PropertyId == 7); + var platformSummary = section.Tuples.OfType().Single(s => s.PropertyId == SumaryInformationType.PlatformAndLanguage); Assert.Equal("x64;1033", platformSummary.Value); } } diff --git a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs index 391b7021..d915d02b 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs @@ -130,7 +130,7 @@ namespace WixToolsetTest.CoreIntegration var path = binary[BinaryTupleFields.Data].AsPath().Path; Assert.Contains("Example.Extension", path); Assert.EndsWith(@"\0", path); - Assert.Equal(@"BinFromWir", binary[BinaryTupleFields.Name].AsString()); + Assert.Equal(@"BinFromWir", binary.Id.Id); } } } @@ -185,7 +185,7 @@ namespace WixToolsetTest.CoreIntegration var path = binary[BinaryTupleFields.Data].AsPath().Path; Assert.Contains("Example.Extension", path); Assert.EndsWith(@"\0", path); - Assert.Equal(@"BinFromWir", binary[BinaryTupleFields.Name].AsString()); + Assert.Equal(@"BinFromWir", binary.Id.Id); } } } -- cgit v1.2.3-55-g6feb