3 files changed, 134 insertions, 15 deletions

diff --git a/src/ext/NetFx/wixext/Symbols/NetFxNativeImageSymbol.cs b/src/ext/NetFx/wixext/Symbols/NetFxNativeImageSymbol.cs
index 3803abd6..252c6aba 100644
--- a/src/ext/NetFx/wixext/Symbols/NetFxNativeImageSymbol.cs
+++ b/src/ext/NetFx/wixext/Symbols/NetFxNativeImageSymbol.cs
@@ -1,5 +1,26 @@
 // 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.Netfx
+{
+    using WixToolset.Data;
+    using WixToolset.Netfx.Symbols;
+
+    public static partial class NetfxSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition NetFxNativeImage = new IntermediateSymbolDefinition(
+            NetfxSymbolDefinitionType.NetFxNativeImage.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.FileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.Priority), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.Attributes), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.ApplicationFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.ApplicationBaseDirectoryRef), IntermediateFieldType.String),
+            },
+            typeof(NetFxNativeImageSymbol));
+    }
+}
+
 namespace WixToolset.Netfx.Symbols
 {
     using WixToolset.Data;
@@ -55,4 +76,4 @@ namespace WixToolset.Netfx.Symbols
             set => this.Set((int)NetFxNativeImageSymbolFields.ApplicationBaseDirectoryRef, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSymbol.cs b/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSymbol.cs
new file mode 100644
index 00000000..8bf0a24c
--- /dev/null
+++ b/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSymbol.cs
@@ -0,0 +1,77 @@
+// 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.Netfx
+{
+    using WixToolset.Data;
+    using WixToolset.Netfx.Symbols;
+
+    public static partial class NetfxSymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition NetFxNetCoreSearch = new IntermediateSymbolDefinition(
+            NetfxSymbolDefinitionType.NetFxNetCoreSearch.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSearchSymbolFields.RuntimeType), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSearchSymbolFields.Platform), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSearchSymbolFields.MajorVersion), IntermediateFieldType.Number),
+            },
+            typeof(NetFxNetCoreSearchSymbol));
+    }
+}
+
+namespace WixToolset.Netfx.Symbols
+{
+    using WixToolset.Data;
+
+    public enum NetCoreSearchRuntimeType
+    {
+        Core,
+        Aspnet,
+        Desktop,
+    }
+
+    public enum NetCoreSearchPlatform
+    {
+        X86,
+        X64,
+        Arm64,
+    }
+
+    public enum NetFxNetCoreSearchSymbolFields
+    {
+        RuntimeType,
+        Platform,
+        MajorVersion,
+    }
+
+    public class NetFxNetCoreSearchSymbol : IntermediateSymbol
+    {
+        public NetFxNetCoreSearchSymbol() : base(NetfxSymbolDefinitions.NetFxNetCoreSearch, null, null)
+        {
+        }
+
+        public NetFxNetCoreSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(NetfxSymbolDefinitions.NetFxNetCoreSearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[NetFxNetCoreSearchSymbolFields index] => this.Fields[(int)index];
+
+        public NetCoreSearchRuntimeType RuntimeType
+        {
+            get => (NetCoreSearchRuntimeType)this.Fields[(int)NetFxNetCoreSearchSymbolFields.RuntimeType].AsNumber();
+            set => this.Set((int)NetFxNetCoreSearchSymbolFields.RuntimeType, (int)value);
+        }
+
+        public NetCoreSearchPlatform Platform
+        {
+            get => (NetCoreSearchPlatform)this.Fields[(int)NetFxNetCoreSearchSymbolFields.Platform].AsNumber();
+            set => this.Set((int)NetFxNetCoreSearchSymbolFields.Platform, (int)value);
+        }
+
+        public int MajorVersion
+        {
+            get => this.Fields[(int)NetFxNetCoreSearchSymbolFields.MajorVersion].AsNumber();
+            set => this.Set((int)NetFxNetCoreSearchSymbolFields.MajorVersion, value);
+        }
+    }
+}
diff --git a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
index 3c0f1176..862eba16 100644
--- a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
+++ b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
@@ -1,26 +1,47 @@
 // 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.Netfx.Symbols
+namespace WixToolset.Netfx
 {
+    using System;
     using WixToolset.Data;
+    using WixToolset.Data.Burn;
 
-    public static class NetfxSymbolDefinitionNames
+    public enum NetfxSymbolDefinitionType
     {
-        public static string NetFxNativeImage { get; } = "NetFxNativeImage";
+        NetFxNativeImage,
+        NetFxNetCoreSearch,
     }
 
-    public static class NetfxSymbolDefinitions
+    public static partial class NetfxSymbolDefinitions
     {
-        public static readonly IntermediateSymbolDefinition NetFxNativeImage = new IntermediateSymbolDefinition(
-            NetfxSymbolDefinitionNames.NetFxNativeImage,
-            new[]
+        public static IntermediateSymbolDefinition ByName(string name)
+        {
+            if (!Enum.TryParse(name, out NetfxSymbolDefinitionType type))
             {
-                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.FileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.Priority), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.ApplicationFileRef), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxNativeImageSymbolFields.ApplicationBaseDirectoryRef), IntermediateFieldType.String),
-            },
-            typeof(NetFxNativeImageSymbol));
+                return null;
+            }
+
+            return ByType(type);
+        }
+
+        public static IntermediateSymbolDefinition ByType(NetfxSymbolDefinitionType type)
+        {
+            switch (type)
+            {
+                case NetfxSymbolDefinitionType.NetFxNativeImage:
+                    return NetfxSymbolDefinitions.NetFxNativeImage;
+
+                case NetfxSymbolDefinitionType.NetFxNetCoreSearch:
+                    return NetfxSymbolDefinitions.NetFxNetCoreSearch;
+
+                default:
+                    throw new ArgumentOutOfRangeException(nameof(type));
+            }
+        }
+
+        static NetfxSymbolDefinitions()
+        {
+            NetFxNetCoreSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
+        }
     }
 }