From 0025fa31f46c98d37d6d204a1fb7f8ea9a12b620 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 23 May 2019 15:24:43 -0700 Subject: Merge WixFileTuple in to FileTuple and remove File from FileAssemblyType --- src/WixToolset.Data/Tuples/FileTuple.cs | 173 ++++++++++++++++----- src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs | 27 +++- src/WixToolset.Data/Tuples/TupleDefinitions.cs | 6 - src/WixToolset.Data/Tuples/WixActionTuple.cs | 4 +- .../Tuples/WixDeltaPatchFileTuple.cs | 76 --------- src/WixToolset.Data/Tuples/WixFileTuple.cs | 162 ------------------- src/WixToolset.Data/Tuples/WixMergeTuple.cs | 10 +- .../WindowsInstaller/Rows/WixFileRow.cs | 163 ------------------- src/WixToolset.Data/WindowsInstaller/Table.cs | 3 - 9 files changed, 168 insertions(+), 456 deletions(-) delete mode 100644 src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs delete mode 100644 src/WixToolset.Data/Tuples/WixFileTuple.cs delete mode 100644 src/WixToolset.Data/WindowsInstaller/Rows/WixFileRow.cs (limited to 'src') diff --git a/src/WixToolset.Data/Tuples/FileTuple.cs b/src/WixToolset.Data/Tuples/FileTuple.cs index 43de8b46..caae7b34 100644 --- a/src/WixToolset.Data/Tuples/FileTuple.cs +++ b/src/WixToolset.Data/Tuples/FileTuple.cs @@ -16,15 +16,26 @@ namespace WixToolset.Data new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(FileTupleFields.ReadOnly), IntermediateFieldType.Bool), - new IntermediateFieldDefinition(nameof(FileTupleFields.Hidden), IntermediateFieldType.Bool), - new IntermediateFieldDefinition(nameof(FileTupleFields.System), IntermediateFieldType.Bool), - new IntermediateFieldDefinition(nameof(FileTupleFields.Vital), IntermediateFieldType.Bool), - new IntermediateFieldDefinition(nameof(FileTupleFields.Checksum), IntermediateFieldType.Bool), - new IntermediateFieldDefinition(nameof(FileTupleFields.Compressed), IntermediateFieldType.Bool), + new IntermediateFieldDefinition(nameof(FileTupleFields.Attributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(FileTupleFields.DirectoryRef), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileTupleFields.DiskId), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(FileTupleFields.Source), IntermediateFieldType.Path), + new IntermediateFieldDefinition(nameof(FileTupleFields.FontTitle), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(FileTupleFields.SelfRegCost), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(FileTupleFields.BindPath), IntermediateFieldType.String), + + new IntermediateFieldDefinition(nameof(FileTupleFields.Sequence), IntermediateFieldType.Number), + + new IntermediateFieldDefinition(nameof(FileTupleFields.PatchGroup), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(FileTupleFields.PatchAttributes), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(FileTupleFields.DeltaPatchHeaderSource), IntermediateFieldType.String), + + new IntermediateFieldDefinition(nameof(FileTupleFields.RetainLengths), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileTupleFields.IgnoreOffsets), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileTupleFields.IgnoreLengths), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileTupleFields.RetainOffsets), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(FileTupleFields.SymbolPaths), IntermediateFieldType.String), }, typeof(FileTuple)); } @@ -32,6 +43,8 @@ namespace WixToolset.Data namespace WixToolset.Data.Tuples { + using System; + public enum FileTupleFields { ComponentRef, @@ -40,15 +53,61 @@ namespace WixToolset.Data.Tuples FileSize, Version, Language, - ReadOnly, - Hidden, - System, - Vital, - Checksum, - Compressed, + Attributes, + DirectoryRef, + DiskId, + Source, + FontTitle, SelfRegCost, BindPath, + + Sequence, + + PatchGroup, + PatchAttributes, + DeltaPatchHeaderSource, + + RetainLengths, + IgnoreOffsets, + IgnoreLengths, + RetainOffsets, + SymbolPaths, + } + + [Flags] + public enum FileTupleAttributes : int + { + None, + ReadOnly = 0x1, + Hidden = 0x2, + System = 0x4, + Vital = 0x8, + Compressed = 0x10, + Uncompressed = 0x20, + Checksum = 0x40, + GeneratedShortFileName = 0x80, + } + + /// + /// PatchAttribute values + /// + [Flags] + public enum PatchAttributeType + { + None = 0, + + /// Prevents the updating of the file that is in fact changed in the upgraded image relative to the target images. + Ignore = 1, + + /// Set if the entire file should be installed rather than creating a binary patch. + IncludeWholeFile = 2, + + /// Set to indicate that the patch is non-vital. + AllowIgnoreOnError = 4, + + /// Allowed bits. + Defined = Ignore | IncludeWholeFile | AllowIgnoreOnError } public class FileTuple : IntermediateTuple @@ -99,40 +158,28 @@ namespace WixToolset.Data.Tuples set => this.Set((int)FileTupleFields.Language, value); } - public bool ReadOnly + public FileTupleAttributes Attributes { - get => (bool)this.Fields[(int)FileTupleFields.ReadOnly]; - set => this.Set((int)FileTupleFields.ReadOnly, value); + get => (FileTupleAttributes)this.Fields[(int)FileTupleFields.Attributes].AsNumber(); + set => this.Set((int)FileTupleFields.Attributes, (int)value); } - public bool Hidden + public string DirectoryRef { - get => (bool)this.Fields[(int)FileTupleFields.Hidden]; - set => this.Set((int)FileTupleFields.Hidden, value); + get => (string)this.Fields[(int)FileTupleFields.DirectoryRef]; + set => this.Set((int)FileTupleFields.DirectoryRef, value); } - public bool System + public int? DiskId { - get => (bool)this.Fields[(int)FileTupleFields.System]; - set => this.Set((int)FileTupleFields.System, value); + get => (int?)this.Fields[(int)FileTupleFields.DiskId]; + set => this.Set((int)FileTupleFields.DiskId, value); } - public bool Vital + public IntermediateFieldPathValue Source { - get => (bool)this.Fields[(int)FileTupleFields.Vital]; - set => this.Set((int)FileTupleFields.Vital, value); - } - - public bool Checksum - { - get => (bool)this.Fields[(int)FileTupleFields.Checksum]; - set => this.Set((int)FileTupleFields.Checksum, value); - } - - public bool? Compressed - { - get => (bool?)this.Fields[(int)FileTupleFields.Compressed]; - set => this.Set((int)FileTupleFields.Compressed, value); + get => this.Fields[(int)FileTupleFields.Source].AsPath(); + set => this.Set((int)FileTupleFields.Source, value); } public string FontTitle @@ -152,5 +199,59 @@ namespace WixToolset.Data.Tuples get => (string)this.Fields[(int)FileTupleFields.BindPath]; set => this.Set((int)FileTupleFields.BindPath, value); } + + public int Sequence + { + get => (int)this.Fields[(int)FileTupleFields.Sequence]; + set => this.Set((int)FileTupleFields.Sequence, value); + } + + public int? PatchGroup + { + get => (int?)this.Fields[(int)FileTupleFields.PatchGroup]; + set => this.Set((int)FileTupleFields.PatchGroup, value); + } + + public PatchAttributeType? PatchAttributes + { + get => (PatchAttributeType?)this.Fields[(int)FileTupleFields.PatchAttributes].AsNullableNumber(); + set => this.Set((int)FileTupleFields.PatchAttributes, (int?)value); + } + + public string DeltaPatchHeaderSource + { + get => (string)this.Fields[(int)FileTupleFields.DeltaPatchHeaderSource]; + set => this.Set((int)FileTupleFields.DeltaPatchHeaderSource, value); + } + + public string RetainLengths + { + get => (string)this.Fields[(int)FileTupleFields.RetainLengths]; + set => this.Set((int)FileTupleFields.RetainLengths, value); + } + + public string IgnoreOffsets + { + get => (string)this.Fields[(int)FileTupleFields.IgnoreOffsets]; + set => this.Set((int)FileTupleFields.IgnoreOffsets, value); + } + + public string IgnoreLengths + { + get => (string)this.Fields[(int)FileTupleFields.IgnoreLengths]; + set => this.Set((int)FileTupleFields.IgnoreLengths, value); + } + + public string RetainOffsets + { + get => (string)this.Fields[(int)FileTupleFields.RetainOffsets]; + set => this.Set((int)FileTupleFields.RetainOffsets, value); + } + + public string SymbolPaths + { + get => (string)this.Fields[(int)FileTupleFields.SymbolPaths]; + set => this.Set((int)FileTupleFields.SymbolPaths, value); + } } } diff --git a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs index 99903307..57750bb9 100644 --- a/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs +++ b/src/WixToolset.Data/Tuples/MsiAssemblyTuple.cs @@ -15,6 +15,7 @@ namespace WixToolset.Data 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)); } @@ -29,6 +30,22 @@ namespace WixToolset.Data.Tuples 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 @@ -67,10 +84,16 @@ namespace WixToolset.Data.Tuples set => this.Set((int)MsiAssemblyTupleFields.ApplicationFileRef, value); } - public FileAssemblyType Type + public AssemblyType Type { - get => (FileAssemblyType)this.Fields[(int)MsiAssemblyTupleFields.Attributes].AsNumber(); + 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 ea4ff144..16f6f19a 100644 --- a/src/WixToolset.Data/Tuples/TupleDefinitions.cs +++ b/src/WixToolset.Data/Tuples/TupleDefinitions.cs @@ -663,9 +663,6 @@ namespace WixToolset.Data case TupleDefinitionType.WixCustomTable: return TupleDefinitions.WixCustomTable; - case TupleDefinitionType.WixDeltaPatchFile: - return TupleDefinitions.WixDeltaPatchFile; - case TupleDefinitionType.WixDeltaPatchSymbolPaths: return TupleDefinitions.WixDeltaPatchSymbolPaths; @@ -678,9 +675,6 @@ namespace WixToolset.Data case TupleDefinitionType.WixFeatureModules: return TupleDefinitions.WixFeatureModules; - case TupleDefinitionType.WixFile: - return TupleDefinitions.WixFile; - case TupleDefinitionType.WixFileSearch: return TupleDefinitions.WixFileSearch; diff --git a/src/WixToolset.Data/Tuples/WixActionTuple.cs b/src/WixToolset.Data/Tuples/WixActionTuple.cs index 716fd46b..28a10698 100644 --- a/src/WixToolset.Data/Tuples/WixActionTuple.cs +++ b/src/WixToolset.Data/Tuples/WixActionTuple.cs @@ -24,8 +24,6 @@ namespace WixToolset.Data namespace WixToolset.Data.Tuples { - using System; - public enum WixActionTupleFields { SequenceTable, @@ -100,4 +98,4 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixActionTupleFields.Overridable, value); } } -} \ No newline at end of file +} diff --git a/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs b/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs deleted file mode 100644 index 48d0a96c..00000000 --- a/src/WixToolset.Data/Tuples/WixDeltaPatchFileTuple.cs +++ /dev/null @@ -1,76 +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 WixDeltaPatchFile = new IntermediateTupleDefinition( - TupleDefinitionType.WixDeltaPatchFile, - new[] - { - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.RetainLengths), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.IgnoreOffsets), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.IgnoreLengths), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.RetainOffsets), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixDeltaPatchFileTupleFields.SymbolPaths), IntermediateFieldType.String), - }, - typeof(WixDeltaPatchFileTuple)); - } -} - -namespace WixToolset.Data.Tuples -{ - public enum WixDeltaPatchFileTupleFields - { - RetainLengths, - IgnoreOffsets, - IgnoreLengths, - RetainOffsets, - SymbolPaths, - } - - public class WixDeltaPatchFileTuple : IntermediateTuple - { - public WixDeltaPatchFileTuple() : base(TupleDefinitions.WixDeltaPatchFile, null, null) - { - } - - public WixDeltaPatchFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixDeltaPatchFile, sourceLineNumber, id) - { - } - - public IntermediateField this[WixDeltaPatchFileTupleFields index] => this.Fields[(int)index]; - - public string RetainLengths - { - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainLengths]; - set => this.Set((int)WixDeltaPatchFileTupleFields.RetainLengths, value); - } - - public string IgnoreOffsets - { - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreOffsets]; - set => this.Set((int)WixDeltaPatchFileTupleFields.IgnoreOffsets, value); - } - - public string IgnoreLengths - { - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.IgnoreLengths]; - set => this.Set((int)WixDeltaPatchFileTupleFields.IgnoreLengths, value); - } - - public string RetainOffsets - { - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.RetainOffsets]; - set => this.Set((int)WixDeltaPatchFileTupleFields.RetainOffsets, value); - } - - public string SymbolPaths - { - get => (string)this.Fields[(int)WixDeltaPatchFileTupleFields.SymbolPaths]; - set => this.Set((int)WixDeltaPatchFileTupleFields.SymbolPaths, value); - } - } -} \ No newline at end of file diff --git a/src/WixToolset.Data/Tuples/WixFileTuple.cs b/src/WixToolset.Data/Tuples/WixFileTuple.cs deleted file mode 100644 index 8f7cddc4..00000000 --- a/src/WixToolset.Data/Tuples/WixFileTuple.cs +++ /dev/null @@ -1,162 +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 WixFile = new IntermediateTupleDefinition( - TupleDefinitionType.WixFile, - new[] - { - new IntermediateFieldDefinition(nameof(WixFileTupleFields.AssemblyType), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixFileTupleFields.AssemblyManifestFileRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFileTupleFields.AssemblyApplicationFileRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFileTupleFields.DirectoryRef), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFileTupleFields.DiskId), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixFileTupleFields.Source), IntermediateFieldType.Path), - new IntermediateFieldDefinition(nameof(WixFileTupleFields.ProcessorArchitecture), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixFileTupleFields.PatchGroup), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixFileTupleFields.Attributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixFileTupleFields.PatchAttributes), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixFileTupleFields.DeltaPatchHeaderSource), IntermediateFieldType.String), - }, - typeof(WixFileTuple)); - } -} - -namespace WixToolset.Data.Tuples -{ - using System; - - public enum WixFileTupleFields - { - AssemblyType, - AssemblyManifestFileRef, - AssemblyApplicationFileRef, - DirectoryRef, - DiskId, - Source, - ProcessorArchitecture, - PatchGroup, - Attributes, - PatchAttributes, - DeltaPatchHeaderSource, - } - - /// - /// Every file row has an assembly type. - /// - public enum FileAssemblyType - { - /// File is not an assembly. - NotAnAssembly, - - /// File is a Common Language Runtime Assembly. - DotNetAssembly, - - /// File is Win32 SxS assembly. - Win32Assembly, - } - - /// - /// PatchAttribute values - /// - [Flags] - public enum PatchAttributeType - { - None = 0, - - /// Prevents the updating of the file that is in fact changed in the upgraded image relative to the target images. - Ignore = 1, - - /// Set if the entire file should be installed rather than creating a binary patch. - IncludeWholeFile = 2, - - /// Set to indicate that the patch is non-vital. - AllowIgnoreOnError = 4, - - /// Allowed bits. - Defined = Ignore | IncludeWholeFile | AllowIgnoreOnError - } - - public class WixFileTuple : IntermediateTuple - { - public WixFileTuple() : base(TupleDefinitions.WixFile, null, null) - { - } - - public WixFileTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.WixFile, sourceLineNumber, id) - { - } - - public IntermediateField this[WixFileTupleFields index] => this.Fields[(int)index]; - - public FileAssemblyType AssemblyType - { - get => (FileAssemblyType)(int)this.Fields[(int)WixFileTupleFields.AssemblyType]; - set => this.Set((int)WixFileTupleFields.AssemblyType, (int)value); - } - - public string AssemblyManifestFileRef - { - get => (string)this.Fields[(int)WixFileTupleFields.AssemblyManifestFileRef]; - set => this.Set((int)WixFileTupleFields.AssemblyManifestFileRef, value); - } - - public string AssemblyApplicationFileRef - { - get => (string)this.Fields[(int)WixFileTupleFields.AssemblyApplicationFileRef]; - set => this.Set((int)WixFileTupleFields.AssemblyApplicationFileRef, value); - } - - public string DirectoryRef - { - get => (string)this.Fields[(int)WixFileTupleFields.DirectoryRef]; - set => this.Set((int)WixFileTupleFields.DirectoryRef, value); - } - - public int DiskId - { - get => (int)this.Fields[(int)WixFileTupleFields.DiskId]; - set => this.Set((int)WixFileTupleFields.DiskId, value); - } - - public IntermediateFieldPathValue Source - { - get => this.Fields[(int)WixFileTupleFields.Source].AsPath(); - set => this.Set((int)WixFileTupleFields.Source, value); - } - - public string ProcessorArchitecture - { - get => (string)this.Fields[(int)WixFileTupleFields.ProcessorArchitecture]; - set => this.Set((int)WixFileTupleFields.ProcessorArchitecture, value); - } - - public int PatchGroup - { - get => (int)this.Fields[(int)WixFileTupleFields.PatchGroup]; - set => this.Set((int)WixFileTupleFields.PatchGroup, value); - } - - public int Attributes - { - get => (int)this.Fields[(int)WixFileTupleFields.Attributes]; - set => this.Set((int)WixFileTupleFields.Attributes, value); - } - - public PatchAttributeType? PatchAttributes - { - get => (PatchAttributeType?)this.Fields[(int)WixFileTupleFields.PatchAttributes].AsNullableNumber(); - set => this.Set((int)WixFileTupleFields.PatchAttributes, (int?)value); - } - - public string DeltaPatchHeaderSource - { - get => (string)this.Fields[(int)WixFileTupleFields.DeltaPatchHeaderSource]; - set => this.Set((int)WixFileTupleFields.DeltaPatchHeaderSource, value); - } - } -} \ No newline at end of file diff --git a/src/WixToolset.Data/Tuples/WixMergeTuple.cs b/src/WixToolset.Data/Tuples/WixMergeTuple.cs index 53d0cb60..daa0649f 100644 --- a/src/WixToolset.Data/Tuples/WixMergeTuple.cs +++ b/src/WixToolset.Data/Tuples/WixMergeTuple.cs @@ -14,7 +14,7 @@ namespace WixToolset.Data new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DirectoryRef), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixMergeTupleFields.SourceFile), IntermediateFieldType.Path), new IntermediateFieldDefinition(nameof(WixMergeTupleFields.DiskId), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FileCompression), IntermediateFieldType.Bool), + new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FileAttributes), IntermediateFieldType.Number), new IntermediateFieldDefinition(nameof(WixMergeTupleFields.ConfigurationData), IntermediateFieldType.String), new IntermediateFieldDefinition(nameof(WixMergeTupleFields.FeatureRef), IntermediateFieldType.String), }, @@ -30,7 +30,7 @@ namespace WixToolset.Data.Tuples DirectoryRef, SourceFile, DiskId, - FileCompression, + FileAttributes, ConfigurationData, FeatureRef, } @@ -71,10 +71,10 @@ namespace WixToolset.Data.Tuples set => this.Set((int)WixMergeTupleFields.DiskId, value); } - public bool? FileCompression + public FileTupleAttributes FileAttributes { - get => (bool?)this.Fields[(int)WixMergeTupleFields.FileCompression]; - set => this.Set((int)WixMergeTupleFields.FileCompression, value); + get => (FileTupleAttributes)this.Fields[(int)WixMergeTupleFields.FileAttributes].AsNumber(); + set => this.Set((int)WixMergeTupleFields.FileAttributes, (int)value); } public string ConfigurationData diff --git a/src/WixToolset.Data/WindowsInstaller/Rows/WixFileRow.cs b/src/WixToolset.Data/WindowsInstaller/Rows/WixFileRow.cs deleted file mode 100644 index 302272c4..00000000 --- a/src/WixToolset.Data/WindowsInstaller/Rows/WixFileRow.cs +++ /dev/null @@ -1,163 +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.WindowsInstaller.Rows -{ - using WixToolset.Data.Tuples; - - /// - /// Specialization of a row for the WixFile table. - /// - public sealed class WixFileRow : Row - { - /// - /// Creates a WixFile row that does not belong to a table. - /// - /// Original source lines for this row. - /// TableDefinition this row belongs to and should get its column definitions from. - public WixFileRow(SourceLineNumber sourceLineNumbers, TableDefinition tableDef) : - base(sourceLineNumbers, tableDef) - { - } - - /// - /// Creates a WixFile row that belongs to a table. - /// - /// Original source lines for this row. - /// Table this row belongs to and should get its column definitions from. - public WixFileRow(SourceLineNumber sourceLineNumbers, Table table) : - base(sourceLineNumbers, table) - { - } - - /// - /// Gets or sets the primary key of the file row. - /// - /// Primary key of the file row. - public string File - { - get { return (string)this.Fields[0].Data; } - set { this.Fields[0].Data = value; } - } - - /// - /// Gets or sets the assembly type of the file row. - /// - /// Assembly type of the file row. - public FileAssemblyType AssemblyType - { - get { return (null == this.Fields[1]) ? FileAssemblyType.NotAnAssembly : (FileAssemblyType)this.Fields[1].AsInteger(); } - set { this.Fields[1].Data = (int)value; } - } - - /// - /// Gets or sets the identifier for the assembly manifest. - /// - /// Identifier for the assembly manifest. - public string AssemblyManifest - { - get { return (string)this.Fields[2].Data; } - set { this.Fields[2].Data = value; } - } - - /// - /// Gets or sets the application for the assembly. - /// - /// Application for the assembly. - public string AssemblyApplication - { - get { return (string)this.Fields[3].Data; } - set { this.Fields[3].Data = value; } - } - - /// - /// Gets or sets the directory of the file. - /// - /// Directory of the file. - public string Directory - { - get { return (string)this.Fields[4].Data; } - set { this.Fields[4].Data = value; } - } - - /// - /// Gets or sets the disk id for this file. - /// - /// Disk id for the file. - public int DiskId - { - get { return (int)this.Fields[5].Data; } - set { this.Fields[5].Data = value; } - } - - /// - /// Gets or sets the source location to the file. - /// - /// Source location to the file. - public string Source - { - get { return (string)this.Fields[6].Data; } - set { this.Fields[6].Data = value; } - } - - /// - /// Gets or sets the source location to the file. - /// - /// Source location to the file. - public string PreviousSource - { - get { return (string)this.Fields[6].PreviousData; } - set { this.Fields[6].PreviousData = value; } - } - - /// - /// Gets or sets the architecture the file executes on. - /// - /// Architecture the file executes on. - public string ProcessorArchitecture - { - get { return (string)this.Fields[7].Data; } - set { this.Fields[7].Data = value; } - } - - /// - /// Gets or sets the patch group of a patch-added file. - /// - /// The patch group of a patch-added file. - public int PatchGroup - { - get { return (null == this.Fields[8].Data) ? 0 : (int)this.Fields[8].Data; } - set { this.Fields[8].Data = value; } - } - - /// - /// Gets or sets the attributes on a file. - /// - /// Attributes on a file. - public int Attributes - { - get { return (int)this.Fields[9].Data; } - set { this.Fields[9].Data = value; } - } - - /// - /// Gets or sets the patching attributes to the file. - /// - /// Patching attributes of the file. - public PatchAttributeType PatchAttributes - { - get { return (PatchAttributeType)this.Fields[10].AsInteger(); } - set { this.Fields[10].Data = (int)value; } - } - - /// - /// Gets or sets the path to the delta patch header. - /// - /// Patch header path. - /// Set by the binder only when doing delta patching. - public string DeltaPatchHeaderSource - { - get { return (string)this.Fields[11].Data; } - set { this.Fields[11].Data = value; } - } - } -} diff --git a/src/WixToolset.Data/WindowsInstaller/Table.cs b/src/WixToolset.Data/WindowsInstaller/Table.cs index c57d9d31..acb4b6fe 100644 --- a/src/WixToolset.Data/WindowsInstaller/Table.cs +++ b/src/WixToolset.Data/WindowsInstaller/Table.cs @@ -162,9 +162,6 @@ namespace WixToolset.Data.WindowsInstaller case "WixDeltaPatchSymbolPaths": row = new WixDeltaPatchSymbolPathsRow(sourceLineNumbers, this); break; - case "WixFile": - row = new WixFileRow(sourceLineNumbers, this); - break; case "WixGroup": row = new WixGroupRow(sourceLineNumbers, this); break; -- cgit v1.2.3-55-g6feb