diff options
Diffstat (limited to 'src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs')
-rw-r--r-- | src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs index 5229f278..5e9fb936 100644 --- a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs +++ b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs | |||
@@ -13,11 +13,11 @@ namespace WixToolset.Bal | |||
13 | WixBalCondition, | 13 | WixBalCondition, |
14 | WixBalPackageInfo, | 14 | WixBalPackageInfo, |
15 | WixDncOptions, | 15 | WixDncOptions, |
16 | WixMbaPrereqInformation, | 16 | WixPrereqInformation, |
17 | WixStdbaCommandLine, | 17 | WixStdbaCommandLine, |
18 | WixStdbaOptions, | 18 | WixStdbaOptions, |
19 | WixStdbaOverridableVariable, | 19 | WixStdbaOverridableVariable, |
20 | WixMbaPrereqOptions, | 20 | WixPrereqOptions, |
21 | WixBalBootstrapperApplication, | 21 | WixBalBootstrapperApplication, |
22 | } | 22 | } |
23 | 23 | ||
@@ -37,8 +37,10 @@ namespace WixToolset.Bal | |||
37 | { | 37 | { |
38 | switch (type) | 38 | switch (type) |
39 | { | 39 | { |
40 | #pragma warning disable 0612 // obsolete | ||
40 | case BalSymbolDefinitionType.WixBalBAFactoryAssembly: | 41 | case BalSymbolDefinitionType.WixBalBAFactoryAssembly: |
41 | return BalSymbolDefinitions.WixBalBAFactoryAssembly; | 42 | return BalSymbolDefinitions.WixBalBAFactoryAssembly; |
43 | #pragma warning restore 0612 | ||
42 | 44 | ||
43 | case BalSymbolDefinitionType.WixBalBAFunctions: | 45 | case BalSymbolDefinitionType.WixBalBAFunctions: |
44 | return BalSymbolDefinitions.WixBalBAFunctions; | 46 | return BalSymbolDefinitions.WixBalBAFunctions; |
@@ -49,11 +51,8 @@ namespace WixToolset.Bal | |||
49 | case BalSymbolDefinitionType.WixBalPackageInfo: | 51 | case BalSymbolDefinitionType.WixBalPackageInfo: |
50 | return BalSymbolDefinitions.WixBalPackageInfo; | 52 | return BalSymbolDefinitions.WixBalPackageInfo; |
51 | 53 | ||
52 | case BalSymbolDefinitionType.WixDncOptions: | 54 | case BalSymbolDefinitionType.WixPrereqInformation: |
53 | return BalSymbolDefinitions.WixDncOptions; | 55 | return BalSymbolDefinitions.WixPrereqInformation; |
54 | |||
55 | case BalSymbolDefinitionType.WixMbaPrereqInformation: | ||
56 | return BalSymbolDefinitions.WixMbaPrereqInformation; | ||
57 | 56 | ||
58 | case BalSymbolDefinitionType.WixStdbaCommandLine: | 57 | case BalSymbolDefinitionType.WixStdbaCommandLine: |
59 | return BalSymbolDefinitions.WixStdbaCommandLine; | 58 | return BalSymbolDefinitions.WixStdbaCommandLine; |
@@ -64,8 +63,8 @@ namespace WixToolset.Bal | |||
64 | case BalSymbolDefinitionType.WixStdbaOverridableVariable: | 63 | case BalSymbolDefinitionType.WixStdbaOverridableVariable: |
65 | return BalSymbolDefinitions.WixStdbaOverridableVariable; | 64 | return BalSymbolDefinitions.WixStdbaOverridableVariable; |
66 | 65 | ||
67 | case BalSymbolDefinitionType.WixMbaPrereqOptions: | 66 | case BalSymbolDefinitionType.WixPrereqOptions: |
68 | return BalSymbolDefinitions.WixMbaPrereqOptions; | 67 | return BalSymbolDefinitions.WixPrereqOptions; |
69 | 68 | ||
70 | case BalSymbolDefinitionType.WixBalBootstrapperApplication: | 69 | case BalSymbolDefinitionType.WixBalBootstrapperApplication: |
71 | return BalSymbolDefinitions.WixBalBootstrapperApplication; | 70 | return BalSymbolDefinitions.WixBalBootstrapperApplication; |
@@ -77,16 +76,17 @@ namespace WixToolset.Bal | |||
77 | 76 | ||
78 | static BalSymbolDefinitions() | 77 | static BalSymbolDefinitions() |
79 | { | 78 | { |
79 | #pragma warning disable 0612 // obsolete | ||
80 | WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 80 | WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
81 | #pragma warning restore 0612 | ||
81 | WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 82 | WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
82 | WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 83 | WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
83 | WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 84 | WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
84 | WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 85 | WixPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
85 | WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | ||
86 | WixStdbaCommandLine.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 86 | WixStdbaCommandLine.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
87 | WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 87 | WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
88 | WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 88 | WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
89 | WixMbaPrereqOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); | 89 | WixPrereqOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); |
90 | } | 90 | } |
91 | } | 91 | } |
92 | } | 92 | } |