From c22120fa0311033b06e2cbc78190fc9066e86e42 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 23 May 2019 15:34:42 -0700 Subject: Rename MsiAssemblyTuple to AssemblyTuple --- src/WixToolset.Data/Tuples/AssemblyTuple.cs | 96 +++++++++++++++++++++++++ src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs | 99 -------------------------- src/WixToolset.Data/Tuples/TupleDefinitions.cs | 6 +- 3 files changed, 99 insertions(+), 102 deletions(-) create mode 100644 src/WixToolset.Data/Tuples/AssemblyTuple.cs delete mode 100644 src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs (limited to 'src') diff --git a/src/WixToolset.Data/Tuples/AssemblyTuple.cs b/src/WixToolset.Data/Tuples/AssemblyTuple.cs new file mode 100644 index 00000000..15367cc3 --- /dev/null +++ b/src/WixToolset.Data/Tuples/AssemblyTuple.cs @@ -0,0 +1,96 @@ +// 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 WixToolset.Data +{ + using WixToolset.Data.Tuples; + + public static partial class TupleDefinitions + { + public static readonly IntermediateTupleDefinition Assembly = new IntermediateTupleDefinition( + TupleDefinitionType.Assembly, + new[] + { + new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ComponentRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(AssemblyTupleFields.FeatureRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ManifestFileRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ApplicationFileRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(AssemblyTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(AssemblyTupleFields.ProcessorArchitecture), IntermediateFieldType.String), + }, + typeof(AssemblyTuple)); + } +} + +namespace WixToolset.Data.Tuples +{ + public enum AssemblyTupleFields + { + ComponentRef, + FeatureRef, + ManifestFileRef, + ApplicationFileRef, + Attributes, + ProcessorArchitecture, + } + + public enum AssemblyType + { + /// File is not an assembly. + NotAnAssembly, + + /// File is a Common Language Runtime Assembly. + DotNetAssembly, + + /// File is Win32 SxS assembly. + Win32Assembly, + } + + public class AssemblyTuple : IntermediateTuple + { + public AssemblyTuple() : base(TupleDefinitions.Assembly, null, null) + { + } + + public AssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.Assembly, sourceLineNumber, id) + { + } + + public IntermediateField this[AssemblyTupleFields index] => this.Fields[(int)index]; + + public string ComponentRef + { + get => (string)this.Fields[(int)AssemblyTupleFields.ComponentRef]; + set => this.Set((int)AssemblyTupleFields.ComponentRef, value); + } + + public string FeatureRef + { + get => (string)this.Fields[(int)AssemblyTupleFields.FeatureRef]; + set => this.Set((int)AssemblyTupleFields.FeatureRef, value); + } + + public string ManifestFileRef + { + get => (string)this.Fields[(int)AssemblyTupleFields.ManifestFileRef]; + set => this.Set((int)AssemblyTupleFields.ManifestFileRef, value); + } + + public string ApplicationFileRef + { + get => (string)this.Fields[(int)AssemblyTupleFields.ApplicationFileRef]; + set => this.Set((int)AssemblyTupleFields.ApplicationFileRef, value); + } + + public AssemblyType Type + { + get => (AssemblyType)this.Fields[(int)AssemblyTupleFields.Attributes].AsNumber(); + set => this.Set((int)AssemblyTupleFields.Attributes, (int)value); + } + + public string ProcessorArchitecture + { + get => (string)this.Fields[(int)AssemblyTupleFields.ProcessorArchitecture]; + set => this.Set((int)AssemblyTupleFields.ProcessorArchitecture, value); + } + } +} diff --git a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs deleted file mode 100644 index 57750bb9..00000000 --- a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs +++ /dev/null @@ -1,99 +0,0 @@ -// 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 WixToolset.Data -{ - using WixToolset.Data.Tuples; - - public static partial class TupleDefinitions - { - public static readonly IntermediateTupleDefinition MsiAssembly = new IntermediateTupleDefinition( - TupleDefinitionType.MsiAssembly, - new[] - { - new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ComponentRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.FeatureRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ManifestFileRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ApplicationFileRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.Attributes), IntermediateFieldType.Number), - //new IntermediateFieldDefinition(nameof(MsiAssemblyTupleFields.ProcessorArchitecture), IntermediateFieldType.String), - }, - typeof(MsiAssemblyTuple)); - } -} - -namespace WixToolset.Data.Tuples -{ - public enum MsiAssemblyTupleFields - { - ComponentRef, - FeatureRef, - ManifestFileRef, - ApplicationFileRef, - Attributes, - //ProcessorArchitecture, - } - - /// - /// Every file row has an assembly type. - /// - public enum AssemblyType - { - /// File is not an assembly. - NotAnAssembly, - - /// File is a Common Language Runtime Assembly. - DotNetAssembly, - - /// File is Win32 SxS assembly. - Win32Assembly, - } - - public class MsiAssemblyTuple : IntermediateTuple - { - public MsiAssemblyTuple() : base(TupleDefinitions.MsiAssembly, null, null) - { - } - - public MsiAssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.MsiAssembly, sourceLineNumber, id) - { - } - - public IntermediateField this[MsiAssemblyTupleFields index] => this.Fields[(int)index]; - - public string ComponentRef - { - get => (string)this.Fields[(int)MsiAssemblyTupleFields.ComponentRef]; - set => this.Set((int)MsiAssemblyTupleFields.ComponentRef, value); - } - - public string FeatureRef - { - get => (string)this.Fields[(int)MsiAssemblyTupleFields.FeatureRef]; - set => this.Set((int)MsiAssemblyTupleFields.FeatureRef, value); - } - - public string ManifestFileRef - { - get => (string)this.Fields[(int)MsiAssemblyTupleFields.ManifestFileRef]; - set => this.Set((int)MsiAssemblyTupleFields.ManifestFileRef, value); - } - - public string ApplicationFileRef - { - get => (string)this.Fields[(int)MsiAssemblyTupleFields.ApplicationFileRef]; - set => this.Set((int)MsiAssemblyTupleFields.ApplicationFileRef, value); - } - - public AssemblyType Type - { - get => (AssemblyType)this.Fields[(int)MsiAssemblyTupleFields.Attributes].AsNumber(); - set => this.Set((int)MsiAssemblyTupleFields.Attributes, (int)value); - } - - //public string ProcessorArchitecture - //{ - // get => (string)this.Fields[(int)MsiAssemblyTupleFields.ProcessorArchitecture]; - // set => this.Set((int)MsiAssemblyTupleFields.ProcessorArchitecture, value); - //} - } -} \ No newline at end of file diff --git a/src/WixToolset.Data/Tuples/TupleDefinitions.cs b/src/WixToolset.Data/Tuples/TupleDefinitions.cs index 16f6f19a..bc1cb2eb 100644 --- a/src/WixToolset.Data/Tuples/TupleDefinitions.cs +++ b/src/WixToolset.Data/Tuples/TupleDefinitions.cs @@ -70,7 +70,7 @@ namespace WixToolset.Data ModuleSignature, ModuleSubstitution, MoveFile, - MsiAssembly, + Assembly, MsiAssemblyName, MsiDigitalCertificate, MsiDigitalSignature, @@ -402,8 +402,8 @@ namespace WixToolset.Data case TupleDefinitionType.MoveFile: return TupleDefinitions.MoveFile; - case TupleDefinitionType.MsiAssembly: - return TupleDefinitions.MsiAssembly; + case TupleDefinitionType.Assembly: + return TupleDefinitions.Assembly; case TupleDefinitionType.MsiAssemblyName: return TupleDefinitions.MsiAssemblyName; -- cgit v1.2.3-55-g6feb