aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Data/Tuples
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2017-12-19 12:24:16 -0800
committerRob Mensching <rob@firegiant.com>2017-12-19 12:24:16 -0800
commitf680e915f065026efd0301a76fd524f87b8c5f06 (patch)
tree63b6a8d7b799b10d77e133209041a809f4f3d144 /src/WixToolset.Data/Tuples
parent77dc8cd1acd5332aa0cb077c7e87d0678756969b (diff)
downloadwix-f680e915f065026efd0301a76fd524f87b8c5f06.tar.gz
wix-f680e915f065026efd0301a76fd524f87b8c5f06.tar.bz2
wix-f680e915f065026efd0301a76fd524f87b8c5f06.zip
Simplify message handling
Diffstat (limited to 'src/WixToolset.Data/Tuples')
-rw-r--r--src/WixToolset.Data/Tuples/FileTuple.cs12
-rw-r--r--src/WixToolset.Data/Tuples/_ByHandComponentTuple.cs55
-rw-r--r--src/WixToolset.Data/Tuples/_ByHandFileTuple.cs88
-rw-r--r--src/WixToolset.Data/Tuples/_ByHandTupleDefinitions.cs55
4 files changed, 6 insertions, 204 deletions
diff --git a/src/WixToolset.Data/Tuples/FileTuple.cs b/src/WixToolset.Data/Tuples/FileTuple.cs
index 6c184b63..2f283406 100644
--- a/src/WixToolset.Data/Tuples/FileTuple.cs
+++ b/src/WixToolset.Data/Tuples/FileTuple.cs
@@ -17,12 +17,12 @@ namespace WixToolset.Data
17 new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number), 17 new IntermediateFieldDefinition(nameof(FileTupleFields.FileSize), IntermediateFieldType.Number),
18 new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String), 18 new IntermediateFieldDefinition(nameof(FileTupleFields.Version), IntermediateFieldType.String),
19 new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String), 19 new IntermediateFieldDefinition(nameof(FileTupleFields.Language), IntermediateFieldType.String),
20 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.ReadOnly), IntermediateFieldType.Bool), 20 new IntermediateFieldDefinition(nameof(FileTupleFields.ReadOnly), IntermediateFieldType.Bool),
21 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Hidden), IntermediateFieldType.Bool), 21 new IntermediateFieldDefinition(nameof(FileTupleFields.Hidden), IntermediateFieldType.Bool),
22 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.System), IntermediateFieldType.Bool), 22 new IntermediateFieldDefinition(nameof(FileTupleFields.System), IntermediateFieldType.Bool),
23 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Vital), IntermediateFieldType.Bool), 23 new IntermediateFieldDefinition(nameof(FileTupleFields.Vital), IntermediateFieldType.Bool),
24 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Checksum), IntermediateFieldType.Bool), 24 new IntermediateFieldDefinition(nameof(FileTupleFields.Checksum), IntermediateFieldType.Bool),
25 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Compressed), IntermediateFieldType.Bool), 25 new IntermediateFieldDefinition(nameof(FileTupleFields.Compressed), IntermediateFieldType.Bool),
26 }, 26 },
27 typeof(FileTuple)); 27 typeof(FileTuple));
28 } 28 }
diff --git a/src/WixToolset.Data/Tuples/_ByHandComponentTuple.cs b/src/WixToolset.Data/Tuples/_ByHandComponentTuple.cs
deleted file mode 100644
index 0e8fe8e7..00000000
--- a/src/WixToolset.Data/Tuples/_ByHandComponentTuple.cs
+++ /dev/null
@@ -1,55 +0,0 @@
1// 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.
2
3namespace WixToolset.Data
4{
5 using WixToolset.Data.Tuples;
6
7 public static partial class TupleDefinitions
8 {
9 public static readonly IntermediateTupleDefinition ComponentOriginal = new IntermediateTupleDefinition(TupleDefinitionType.Component, new[]
10 {
11 new IntermediateFieldDefinition("Guid", IntermediateFieldType.String),
12 new IntermediateFieldDefinition("Directory", IntermediateFieldType.String),
13 new IntermediateFieldDefinition("Condition", IntermediateFieldType.String),
14 new IntermediateFieldDefinition("KeyPath", IntermediateFieldType.String),
15 new IntermediateFieldDefinition("LocalOnly", IntermediateFieldType.Bool),
16 new IntermediateFieldDefinition("SourceOnly", IntermediateFieldType.Bool),
17 new IntermediateFieldDefinition("Optional", IntermediateFieldType.Bool),
18 new IntermediateFieldDefinition("RegistryKeyPath", IntermediateFieldType.Bool),
19 new IntermediateFieldDefinition("SharedDllRefCount", IntermediateFieldType.Bool),
20 new IntermediateFieldDefinition("Permanent", IntermediateFieldType.Bool),
21 new IntermediateFieldDefinition("OdbcDataSource", IntermediateFieldType.Bool),
22 new IntermediateFieldDefinition("Transitive", IntermediateFieldType.Bool),
23 new IntermediateFieldDefinition("NeverOverwrite", IntermediateFieldType.Bool),
24 new IntermediateFieldDefinition("x64", IntermediateFieldType.Bool),
25 new IntermediateFieldDefinition("DisableRegistryReflection", IntermediateFieldType.Bool),
26 new IntermediateFieldDefinition("UnisntallOnSupersedence", IntermediateFieldType.Bool),
27 new IntermediateFieldDefinition("Shared", IntermediateFieldType.Bool),
28 }, typeof(ComponentTuple));
29 }
30}
31
32namespace WixToolset.Data.Tuples
33{
34 using System;
35
36 public class ComponentTupleOriginal : IntermediateTuple
37 {
38 public ComponentTupleOriginal(IntermediateTupleDefinition definition) : base(definition, null, null)
39 {
40 if (definition != TupleDefinitions.ComponentOriginal) throw new ArgumentException(nameof(definition));
41 }
42
43 public string Guid
44 {
45 get => (string)this[0]?.Value;
46 set => this.Set(0, value);
47 }
48
49 public string Directory
50 {
51 get => (string)this[1]?.Value;
52 set => this.Set(1, value);
53 }
54 }
55}
diff --git a/src/WixToolset.Data/Tuples/_ByHandFileTuple.cs b/src/WixToolset.Data/Tuples/_ByHandFileTuple.cs
deleted file mode 100644
index 79fb31e5..00000000
--- a/src/WixToolset.Data/Tuples/_ByHandFileTuple.cs
+++ /dev/null
@@ -1,88 +0,0 @@
1// 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.
2
3namespace WixToolset.Data
4{
5 using WixToolset.Data.Tuples;
6
7 //public static partial class TupleDefinitionNames
8 //{
9 // public const string File = nameof(TupleDefinitionNames.File);
10 //}
11
12 /*
13 [
14 {
15 "File" : [
16 { "Component" : "string" },
17 { "Name" : "string" },
18 { "Compressed" : "bool" },
19 ]
20 },
21 {
22 "Component": [
23 { "Guid" : "string" },
24 ]
25 },
26 ]
27 */
28
29 public static partial class TupleDefinitions
30 {
31 public static readonly IntermediateTupleDefinition FileOriginal = new IntermediateTupleDefinition(
32 TupleDefinitionType.File,
33 new[]
34 {
35 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Component), IntermediateFieldType.String),
36 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Name), IntermediateFieldType.String),
37 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.ShortName), IntermediateFieldType.String),
38 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Size), IntermediateFieldType.Number),
39 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Version), IntermediateFieldType.String),
40 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Language), IntermediateFieldType.String),
41 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.ReadOnly), IntermediateFieldType.Bool),
42 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Hidden), IntermediateFieldType.Bool),
43 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.System), IntermediateFieldType.Bool),
44 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Vital), IntermediateFieldType.Bool),
45 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Checksum), IntermediateFieldType.Bool),
46 new IntermediateFieldDefinition(nameof(FileTupleFieldsOriginal.Compressed), IntermediateFieldType.Bool),
47 },
48 typeof(FileTuple));
49 }
50}
51
52namespace WixToolset.Data.Tuples
53{
54 public enum FileTupleFieldsOriginal
55 {
56 Component,
57 Name,
58 ShortName,
59 Size,
60 Version,
61 Language,
62 ReadOnly,
63 Hidden,
64 System,
65 Vital,
66 Checksum,
67 Compressed,
68 }
69
70 public class FileTupleOriginal : IntermediateTuple
71 {
72 public FileTupleOriginal() : base(TupleDefinitions.File, null, null)
73 {
74 }
75
76 public FileTupleOriginal(SourceLineNumber sourceLineNumber, Identifier id = null) : base(TupleDefinitions.File, sourceLineNumber, id)
77 {
78 }
79
80 public IntermediateField this[FileTupleFields index] => this.Fields[(int)index];
81
82 public string Component
83 {
84 get => (string)this.Fields[(int)FileTupleFieldsOriginal.Component]?.Value;
85 set => this.Set((int)FileTupleFieldsOriginal.Component, value);
86 }
87 }
88}
diff --git a/src/WixToolset.Data/Tuples/_ByHandTupleDefinitions.cs b/src/WixToolset.Data/Tuples/_ByHandTupleDefinitions.cs
deleted file mode 100644
index 0cb0feeb..00000000
--- a/src/WixToolset.Data/Tuples/_ByHandTupleDefinitions.cs
+++ /dev/null
@@ -1,55 +0,0 @@
1// 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.
2
3#if false
4namespace WixToolset.Data.Tuples
5{
6 using System;
7
8 //public enum TupleDefinitionType
9 //{
10 // Component,
11 // File,
12 // MustBeFromAnExtension,
13 //}
14
15 public static partial class TupleDefinitionsOriginal
16 {
17 public static readonly Version Version = new Version("4.0.0");
18
19 public static IntermediateTupleDefinition ByName(string name)
20 {
21 if (!Enum.TryParse(name, out TupleDefinitionType type) || type == TupleDefinitionType.MustBeFromAnExtension)
22 {
23 return null;
24 }
25
26 return ByType(type);
27 }
28
29 public static IntermediateTupleDefinition ByType(TupleDefinitionType type)
30 {
31 switch (type)
32 {
33 //case TupleDefinitionType.Component:
34 // return TupleDefinitions.Component;
35
36 //case TupleDefinitionType.File:
37 // return TupleDefinitions.File;
38
39 default:
40 throw new ArgumentOutOfRangeException(nameof(type));
41 }
42 }
43
44 //public static T CreateTuple<T>() where T : IntermediateTuple
45 //{
46 // if (TypeToName.TryGetValue(typeof(T), out var name))
47 // {
48 // return ByName(name)?.CreateTuple<T>();
49 // }
50
51 // return null;
52 //}
53 }
54}
55#endif
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-15 20:59:33 +0000