From 11112ebcdf97d4fa53e34d9dfe48410ff2378435 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 3 Apr 2020 11:38:20 +1000 Subject: Use TupleIdIsPrimaryKey. --- .../Bind/CreateOutputFromIRCommand.cs | 24 ++-------------------- .../WindowsInstallerBackendHelper.cs | 6 ++---- .../Example.Extension/ExampleCompilerExtension.cs | 5 ++--- src/test/Example.Extension/ExampleTuple.cs | 3 +-- .../Example.Extension/ExampleTupleDefinitions.cs | 1 - .../ExtensionFixture.cs | 5 ++--- .../WixlibFixture.cs | 10 ++++----- 7 files changed, 13 insertions(+), 41 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs index 3a165582..79b7b67b 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs @@ -64,10 +64,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.AddAssemblyTuple((AssemblyTuple)tuple); break; - case TupleDefinitionType.Binary: - this.AddTupleDefaultly(tuple, idIsPrimaryKey: true); - break; - case TupleDefinitionType.BBControl: this.AddBBControlTuple((BBControlTuple)tuple); break; @@ -112,10 +108,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.AddFileTuple((FileTuple)tuple); break; - case TupleDefinitionType.Icon: - this.AddTupleDefaultly(tuple, idIsPrimaryKey: true); - break; - case TupleDefinitionType.IniFile: this.AddIniFileTuple((IniFileTuple)tuple); break; @@ -144,10 +136,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.AddMsiServiceConfigFailureActionsTuple((MsiServiceConfigFailureActionsTuple)tuple); break; - case TupleDefinitionType.MsiShortcutProperty: - this.AddTupleDefaultly(tuple, idIsPrimaryKey: true); - break; - case TupleDefinitionType.MoveFile: this.AddMoveFileTuple((MoveFileTuple)tuple); break; @@ -177,10 +165,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind this.AddRemoveRegistryTuple((RemoveRegistryTuple)tuple); break; - case TupleDefinitionType.ReserveCost: - this.AddTupleDefaultly(tuple, idIsPrimaryKey: true); - break; - case TupleDefinitionType.ServiceControl: this.AddServiceControlTuple((ServiceControlTuple)tuple); break; @@ -192,10 +176,6 @@ namespace WixToolset.Core.WindowsInstaller.Bind case TupleDefinitionType.Shortcut: this.AddShortcutTuple((ShortcutTuple)tuple); break; - - case TupleDefinitionType.Signature: - this.AddTupleDefaultly(tuple, idIsPrimaryKey: true); - break; case TupleDefinitionType.SummaryInformation: this.AddTupleDefaultly(tuple, tableName: "_SummaryInformation"); @@ -1070,7 +1050,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind } } - private void AddTupleDefaultly(IntermediateTuple tuple, bool idIsPrimaryKey = false, string tableName = null) + private void AddTupleDefaultly(IntermediateTuple tuple, string tableName = null) { if (!this.TableDefinitions.TryGet(tableName ?? tuple.Definition.Name, out var tableDefinition)) { @@ -1080,7 +1060,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind var row = this.CreateRow(tuple, tableDefinition); var rowOffset = 0; - if (idIsPrimaryKey) + if (tableDefinition.TupleIdIsPrimaryKey) { row[0] = tuple.Id.Id; rowOffset = 1; diff --git a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs index 34efe8e3..80179d1c 100644 --- a/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs +++ b/src/WixToolset.Core/ExtensibilityServices/WindowsInstallerBackendHelper.cs @@ -10,9 +10,7 @@ namespace WixToolset.Core.ExtensibilityServices internal class WindowsInstallerBackendHelper : IWindowsInstallerBackendHelper { - public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, IEnumerable tableDefinitions) => this.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, tableDefinitions, false); - - public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, IEnumerable tableDefinitions, bool columnZeroIsId) + public bool TryAddTupleToOutputMatchingTableDefinitions(IntermediateTuple tuple, WindowsInstallerData output, IEnumerable tableDefinitions) { var tableDefinition = tableDefinitions.FirstOrDefault(t => t.TupleDefinitionName == tuple.Definition.Name); @@ -25,7 +23,7 @@ namespace WixToolset.Core.ExtensibilityServices var row = table.CreateRow(tuple.SourceLineNumbers); var rowOffset = 0; - if (columnZeroIsId) + if (tableDefinition.TupleIdIsPrimaryKey) { row[0] = tuple.Id.Id; rowOffset = 1; diff --git a/src/test/Example.Extension/ExampleCompilerExtension.cs b/src/test/Example.Extension/ExampleCompilerExtension.cs index 52168adc..e821b7b6 100644 --- a/src/test/Example.Extension/ExampleCompilerExtension.cs +++ b/src/test/Example.Extension/ExampleCompilerExtension.cs @@ -88,9 +88,8 @@ namespace Example.Extension if (!this.Messaging.EncounteredError) { - var tuple = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Example"); - tuple.Set(0, id.Id); - tuple.Set(1, value); + var tuple = this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Example", id); + tuple.Set(0, value); } } diff --git a/src/test/Example.Extension/ExampleTuple.cs b/src/test/Example.Extension/ExampleTuple.cs index 0fc0d82c..f2bcb925 100644 --- a/src/test/Example.Extension/ExampleTuple.cs +++ b/src/test/Example.Extension/ExampleTuple.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 { @@ -6,7 +6,6 @@ namespace Example.Extension public enum ExampleTupleFields { - Example, Value, } diff --git a/src/test/Example.Extension/ExampleTupleDefinitions.cs b/src/test/Example.Extension/ExampleTupleDefinitions.cs index a9771509..dd8b5bbf 100644 --- a/src/test/Example.Extension/ExampleTupleDefinitions.cs +++ b/src/test/Example.Extension/ExampleTupleDefinitions.cs @@ -13,7 +13,6 @@ namespace Example.Extension ExampleName, new[] { - new IntermediateFieldDefinition(nameof(ExampleTupleFields.Example), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(ExampleTupleFields.Value), IntermediateFieldType.String), }, typeof(ExampleTuple)); diff --git a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs index b75e8ad9..3103f94f 100644 --- a/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/ExtensionFixture.cs @@ -63,9 +63,8 @@ namespace WixToolsetTest.CoreIntegration Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); - Assert.Null(example.Id?.Id); - Assert.Equal("Foo", example[0].AsString()); - Assert.Equal("Bar", example[1].AsString()); + Assert.Equal("Foo", example.Id?.Id); + Assert.Equal("Bar", example[0].AsString()); } } diff --git a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs index c7af6439..0e740554 100644 --- a/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs @@ -168,9 +168,8 @@ namespace WixToolsetTest.CoreIntegration Assert.Equal(@"example.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path); var example = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).Single(); - Assert.Null(example.Id?.Id); - Assert.Equal("Foo", example[0].AsString()); - Assert.Equal("Bar", example[1].AsString()); + Assert.Equal("Foo", example.Id?.Id); + Assert.Equal("Bar", example[0].AsString()); } } @@ -232,9 +231,8 @@ namespace WixToolsetTest.CoreIntegration Assert.Equal(@"other.txt", fileTuples[1][FileTupleFields.Source].PreviousValue.AsPath().Path); var examples = section.Tuples.Where(t => t.Definition.Type == TupleDefinitionType.MustBeFromAnExtension).ToArray(); - Assert.Equal(new string[] { null, null }, examples.Select(t => t.Id?.Id).ToArray()); - Assert.Equal(new[] { "Foo", "Other" }, examples.Select(t => t.AsString(0)).ToArray()); - Assert.Equal(new[] { "Bar", "Value" }, examples.Select(t => t[1].AsString()).ToArray()); + Assert.Equal(new string[] { "Foo", "Other" }, examples.Select(t => t.Id?.Id).ToArray()); + Assert.Equal(new[] { "Bar", "Value" }, examples.Select(t => t[0].AsString()).ToArray()); } } } -- cgit v1.2.3-55-g6feb