diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-03-08 15:44:56 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-03-08 15:47:14 -0600 |
commit | dc13aa675da9307e36e8ff84b9914aceee15593d (patch) | |
tree | 82f2ae6f3f21a02a4d23bc1e82341d0debf895e8 /src | |
parent | 7f0a67c7c4570f3e453b046b193c06b345fd9f43 (diff) | |
download | wix-dc13aa675da9307e36e8ff84b9914aceee15593d.tar.gz wix-dc13aa675da9307e36e8ff84b9914aceee15593d.tar.bz2 wix-dc13aa675da9307e36e8ff84b9914aceee15593d.zip |
Fix WixDependencyProvider in SymbolDefinitions.ByType
and improve error message for unknown type (which should be unreachable but...).
Diffstat (limited to 'src')
-rw-r--r-- | src/WixToolset.Data/Symbols/SymbolDefinitions.cs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/WixToolset.Data/Symbols/SymbolDefinitions.cs b/src/WixToolset.Data/Symbols/SymbolDefinitions.cs index 9024e58c..9bb8bcfb 100644 --- a/src/WixToolset.Data/Symbols/SymbolDefinitions.cs +++ b/src/WixToolset.Data/Symbols/SymbolDefinitions.cs | |||
@@ -461,12 +461,12 @@ namespace WixToolset.Data | |||
461 | case SymbolDefinitionType.Property: | 461 | case SymbolDefinitionType.Property: |
462 | return SymbolDefinitions.Property; | 462 | return SymbolDefinitions.Property; |
463 | 463 | ||
464 | case SymbolDefinitionType.PublishComponent: | ||
465 | return SymbolDefinitions.PublishComponent; | ||
466 | |||
467 | case SymbolDefinitionType.ProvidesDependency: | 464 | case SymbolDefinitionType.ProvidesDependency: |
468 | return SymbolDefinitions.ProvidesDependency; | 465 | return SymbolDefinitions.ProvidesDependency; |
469 | 466 | ||
467 | case SymbolDefinitionType.PublishComponent: | ||
468 | return SymbolDefinitions.PublishComponent; | ||
469 | |||
470 | case SymbolDefinitionType.RadioButton: | 470 | case SymbolDefinitionType.RadioButton: |
471 | return SymbolDefinitions.RadioButton; | 471 | return SymbolDefinitions.RadioButton; |
472 | 472 | ||
@@ -674,6 +674,9 @@ namespace WixToolset.Data | |||
674 | case SymbolDefinitionType.WixDependencyRef: | 674 | case SymbolDefinitionType.WixDependencyRef: |
675 | return SymbolDefinitions.WixDependencyRef; | 675 | return SymbolDefinitions.WixDependencyRef; |
676 | 676 | ||
677 | case SymbolDefinitionType.WixDependencyProvider: | ||
678 | return SymbolDefinitions.WixDependencyProvider; | ||
679 | |||
677 | case SymbolDefinitionType.WixEnsureTable: | 680 | case SymbolDefinitionType.WixEnsureTable: |
678 | return SymbolDefinitions.WixEnsureTable; | 681 | return SymbolDefinitions.WixEnsureTable; |
679 | 682 | ||
@@ -765,7 +768,7 @@ namespace WixToolset.Data | |||
765 | return SymbolDefinitions.WixVariable; | 768 | return SymbolDefinitions.WixVariable; |
766 | 769 | ||
767 | default: | 770 | default: |
768 | throw new ArgumentOutOfRangeException(nameof(type)); | 771 | throw new ArgumentOutOfRangeException($"{nameof(type)} ({type})"); |
769 | } | 772 | } |
770 | } | 773 | } |
771 | } | 774 | } |