diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:43:50 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-06-25 14:50:31 -0700 |
| commit | 38afa9e7bc7eacc021f8805f607368a05751e3c3 (patch) | |
| tree | 803b0a8d9a06a7d6f7c4df408437017ae21a883e /src/WixToolset.Core/Bind/FileFacade.cs | |
| parent | 8968578d50858721317d410549a9f9b5c62bf1f7 (diff) | |
| download | wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.gz wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.tar.bz2 wix-38afa9e7bc7eacc021f8805f607368a05751e3c3.zip | |
The Great Tuple to Symbol Rename (tm)
Diffstat (limited to 'src/WixToolset.Core/Bind/FileFacade.cs')
| -rw-r--r-- | src/WixToolset.Core/Bind/FileFacade.cs | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/WixToolset.Core/Bind/FileFacade.cs b/src/WixToolset.Core/Bind/FileFacade.cs index 511f4aab..075d3d34 100644 --- a/src/WixToolset.Core/Bind/FileFacade.cs +++ b/src/WixToolset.Core/Bind/FileFacade.cs | |||
| @@ -5,25 +5,25 @@ namespace WixToolset.Core.Bind | |||
| 5 | using System; | 5 | using System; |
| 6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
| 7 | using WixToolset.Data; | 7 | using WixToolset.Data; |
| 8 | using WixToolset.Data.Tuples; | 8 | using WixToolset.Data.Symbols; |
| 9 | using WixToolset.Data.WindowsInstaller; | 9 | using WixToolset.Data.WindowsInstaller; |
| 10 | using WixToolset.Data.WindowsInstaller.Rows; | 10 | using WixToolset.Data.WindowsInstaller.Rows; |
| 11 | 11 | ||
| 12 | public class FileFacade | 12 | public class FileFacade |
| 13 | { | 13 | { |
| 14 | public FileFacade(FileTuple file, AssemblyTuple assembly) | 14 | public FileFacade(FileSymbol file, AssemblySymbol assembly) |
| 15 | { | 15 | { |
| 16 | this.FileTuple = file; | 16 | this.FileSymbol = file; |
| 17 | this.AssemblyTuple = assembly; | 17 | this.AssemblySymbol = assembly; |
| 18 | 18 | ||
| 19 | this.Identifier = file.Id; | 19 | this.Identifier = file.Id; |
| 20 | this.ComponentRef = file.ComponentRef; | 20 | this.ComponentRef = file.ComponentRef; |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | public FileFacade(bool fromModule, FileTuple file) | 23 | public FileFacade(bool fromModule, FileSymbol file) |
| 24 | { | 24 | { |
| 25 | this.FromModule = fromModule; | 25 | this.FromModule = fromModule; |
| 26 | this.FileTuple = file; | 26 | this.FileSymbol = file; |
| 27 | 27 | ||
| 28 | this.Identifier = file.Id; | 28 | this.Identifier = file.Id; |
| 29 | this.ComponentRef = file.ComponentRef; | 29 | this.ComponentRef = file.ComponentRef; |
| @@ -44,9 +44,9 @@ namespace WixToolset.Core.Bind | |||
| 44 | 44 | ||
| 45 | private FileRow FileRow { get; } | 45 | private FileRow FileRow { get; } |
| 46 | 46 | ||
| 47 | private FileTuple FileTuple { get; } | 47 | private FileSymbol FileSymbol { get; } |
| 48 | 48 | ||
| 49 | private AssemblyTuple AssemblyTuple { get; } | 49 | private AssemblySymbol AssemblySymbol { get; } |
| 50 | 50 | ||
| 51 | public string Id => this.Identifier.Id; | 51 | public string Id => this.Identifier.Id; |
| 52 | 52 | ||
| @@ -56,12 +56,12 @@ namespace WixToolset.Core.Bind | |||
| 56 | 56 | ||
| 57 | public int DiskId | 57 | public int DiskId |
| 58 | { | 58 | { |
| 59 | get => this.FileRow == null ? this.FileTuple.DiskId ?? 1 : this.FileRow.DiskId; | 59 | get => this.FileRow == null ? this.FileSymbol.DiskId ?? 1 : this.FileRow.DiskId; |
| 60 | set | 60 | set |
| 61 | { | 61 | { |
| 62 | if (this.FileRow == null) | 62 | if (this.FileRow == null) |
| 63 | { | 63 | { |
| 64 | this.FileTuple.DiskId = value; | 64 | this.FileSymbol.DiskId = value; |
| 65 | } | 65 | } |
| 66 | else | 66 | else |
| 67 | { | 67 | { |
| @@ -70,16 +70,16 @@ namespace WixToolset.Core.Bind | |||
| 70 | } | 70 | } |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | public string FileName => this.FileRow == null ? this.FileTuple.Name : this.FileRow.FileName; | 73 | public string FileName => this.FileRow == null ? this.FileSymbol.Name : this.FileRow.FileName; |
| 74 | 74 | ||
| 75 | public int FileSize | 75 | public int FileSize |
| 76 | { | 76 | { |
| 77 | get => this.FileRow == null ? this.FileTuple.FileSize : this.FileRow.FileSize; | 77 | get => this.FileRow == null ? this.FileSymbol.FileSize : this.FileRow.FileSize; |
| 78 | set | 78 | set |
| 79 | { | 79 | { |
| 80 | if (this.FileRow == null) | 80 | if (this.FileRow == null) |
| 81 | { | 81 | { |
| 82 | this.FileTuple.FileSize = value; | 82 | this.FileSymbol.FileSize = value; |
| 83 | } | 83 | } |
| 84 | else | 84 | else |
| 85 | { | 85 | { |
| @@ -90,12 +90,12 @@ namespace WixToolset.Core.Bind | |||
| 90 | 90 | ||
| 91 | public string Language | 91 | public string Language |
| 92 | { | 92 | { |
| 93 | get => this.FileRow == null ? this.FileTuple.Language : this.FileRow.Language; | 93 | get => this.FileRow == null ? this.FileSymbol.Language : this.FileRow.Language; |
| 94 | set | 94 | set |
| 95 | { | 95 | { |
| 96 | if (this.FileRow == null) | 96 | if (this.FileRow == null) |
| 97 | { | 97 | { |
| 98 | this.FileTuple.Language = value; | 98 | this.FileSymbol.Language = value; |
| 99 | } | 99 | } |
| 100 | else | 100 | else |
| 101 | { | 101 | { |
| @@ -104,16 +104,16 @@ namespace WixToolset.Core.Bind | |||
| 104 | } | 104 | } |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | public int? PatchGroup => this.FileRow == null ? this.FileTuple.PatchGroup : null; | 107 | public int? PatchGroup => this.FileRow == null ? this.FileSymbol.PatchGroup : null; |
| 108 | 108 | ||
| 109 | public int Sequence | 109 | public int Sequence |
| 110 | { | 110 | { |
| 111 | get => this.FileRow == null ? this.FileTuple.Sequence : this.FileRow.Sequence; | 111 | get => this.FileRow == null ? this.FileSymbol.Sequence : this.FileRow.Sequence; |
| 112 | set | 112 | set |
| 113 | { | 113 | { |
| 114 | if (this.FileRow == null) | 114 | if (this.FileRow == null) |
| 115 | { | 115 | { |
| 116 | this.FileTuple.Sequence = value; | 116 | this.FileSymbol.Sequence = value; |
| 117 | } | 117 | } |
| 118 | else | 118 | else |
| 119 | { | 119 | { |
| @@ -122,22 +122,22 @@ namespace WixToolset.Core.Bind | |||
| 122 | } | 122 | } |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | public SourceLineNumber SourceLineNumber => this.FileRow == null ? this.FileTuple.SourceLineNumbers : this.FileRow.SourceLineNumbers; | 125 | public SourceLineNumber SourceLineNumber => this.FileRow == null ? this.FileSymbol.SourceLineNumbers : this.FileRow.SourceLineNumbers; |
| 126 | 126 | ||
| 127 | public string SourcePath => this.FileRow == null ? this.FileTuple.Source.Path : this.FileRow.Source; | 127 | public string SourcePath => this.FileRow == null ? this.FileSymbol.Source.Path : this.FileRow.Source; |
| 128 | 128 | ||
| 129 | public bool Compressed => this.FileRow == null ? (this.FileTuple.Attributes & FileTupleAttributes.Compressed) == FileTupleAttributes.Compressed : (this.FileRow.Attributes & WindowsInstallerConstants.MsidbFileAttributesCompressed) == WindowsInstallerConstants.MsidbFileAttributesCompressed; | 129 | public bool Compressed => this.FileRow == null ? (this.FileSymbol.Attributes & FileSymbolAttributes.Compressed) == FileSymbolAttributes.Compressed : (this.FileRow.Attributes & WindowsInstallerConstants.MsidbFileAttributesCompressed) == WindowsInstallerConstants.MsidbFileAttributesCompressed; |
| 130 | 130 | ||
| 131 | public bool Uncompressed => this.FileRow == null ? (this.FileTuple.Attributes & FileTupleAttributes.Uncompressed) == FileTupleAttributes.Uncompressed : (this.FileRow.Attributes & WindowsInstallerConstants.MsidbFileAttributesNoncompressed) == WindowsInstallerConstants.MsidbFileAttributesNoncompressed; | 131 | public bool Uncompressed => this.FileRow == null ? (this.FileSymbol.Attributes & FileSymbolAttributes.Uncompressed) == FileSymbolAttributes.Uncompressed : (this.FileRow.Attributes & WindowsInstallerConstants.MsidbFileAttributesNoncompressed) == WindowsInstallerConstants.MsidbFileAttributesNoncompressed; |
| 132 | 132 | ||
| 133 | public string Version | 133 | public string Version |
| 134 | { | 134 | { |
| 135 | get => this.FileRow == null ? this.FileTuple.Version : this.FileRow.Version; | 135 | get => this.FileRow == null ? this.FileSymbol.Version : this.FileRow.Version; |
| 136 | set | 136 | set |
| 137 | { | 137 | { |
| 138 | if (this.FileRow == null) | 138 | if (this.FileRow == null) |
| 139 | { | 139 | { |
| 140 | this.FileTuple.Version = value; | 140 | this.FileSymbol.Version = value; |
| 141 | } | 141 | } |
| 142 | else | 142 | else |
| 143 | { | 143 | { |
| @@ -146,22 +146,22 @@ namespace WixToolset.Core.Bind | |||
| 146 | } | 146 | } |
| 147 | } | 147 | } |
| 148 | 148 | ||
| 149 | public AssemblyType? AssemblyType => this.FileRow == null ? this.AssemblyTuple?.Type : null; | 149 | public AssemblyType? AssemblyType => this.FileRow == null ? this.AssemblySymbol?.Type : null; |
| 150 | 150 | ||
| 151 | public string AssemblyApplicationFileRef => this.FileRow == null ? this.AssemblyTuple?.ApplicationFileRef : throw new NotImplementedException(); | 151 | public string AssemblyApplicationFileRef => this.FileRow == null ? this.AssemblySymbol?.ApplicationFileRef : throw new NotImplementedException(); |
| 152 | 152 | ||
| 153 | public string AssemblyManifestFileRef => this.FileRow == null ? this.AssemblyTuple?.ManifestFileRef : throw new NotImplementedException(); | 153 | public string AssemblyManifestFileRef => this.FileRow == null ? this.AssemblySymbol?.ManifestFileRef : throw new NotImplementedException(); |
| 154 | 154 | ||
| 155 | /// <summary> | 155 | /// <summary> |
| 156 | /// Gets the set of MsiAssemblyName rows created for this file. | 156 | /// Gets the set of MsiAssemblyName rows created for this file. |
| 157 | /// </summary> | 157 | /// </summary> |
| 158 | /// <value>RowCollection of MsiAssemblyName table.</value> | 158 | /// <value>RowCollection of MsiAssemblyName table.</value> |
| 159 | public List<MsiAssemblyNameTuple> AssemblyNames { get; set; } | 159 | public List<MsiAssemblyNameSymbol> AssemblyNames { get; set; } |
| 160 | 160 | ||
| 161 | /// <summary> | 161 | /// <summary> |
| 162 | /// Gets or sets the MsiFileHash row for this file. | 162 | /// Gets or sets the MsiFileHash row for this file. |
| 163 | /// </summary> | 163 | /// </summary> |
| 164 | public MsiFileHashTuple Hash { get; set; } | 164 | public MsiFileHashSymbol Hash { get; set; } |
| 165 | 165 | ||
| 166 | /// <summary> | 166 | /// <summary> |
| 167 | /// Allows direct access to the underlying FileRow as requried for patching. | 167 | /// Allows direct access to the underlying FileRow as requried for patching. |
