Add netfx:DotNetCoreSdkFeatureBandSearch.

7058

3 files changed, 85 insertions, 18 deletions

diff --git a/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkFeatureBandSymbol.cs b/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkFeatureBandSymbol.cs
new file mode 100644
index 00000000..ad80f9d2
--- /dev/null
+++ b/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkFeatureBandSymbol.cs
@@ -0,0 +1,71 @@
+// 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 NetFxNetCoreSdkFeatureBandSearch = new IntermediateSymbolDefinition(
+            NetfxSymbolDefinitionType.NetFxNetCoreSdkFeatureBandSearch.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkFeatureBandSearchSymbolFields.Platform), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkFeatureBandSearchSymbolFields.MajorVersion), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkFeatureBandSearchSymbolFields.MinorVersion), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkFeatureBandSearchSymbolFields.PatchVersion), IntermediateFieldType.Number),
+            },
+            typeof(NetFxNetCoreSdkFeatureBandSearchSymbol));
+    }
+}
+
+namespace WixToolset.Netfx.Symbols
+{
+    using WixToolset.Data;
+
+    public enum NetFxNetCoreSdkFeatureBandSearchSymbolFields
+    {
+        Platform,
+        MajorVersion,
+        MinorVersion,
+        PatchVersion,
+    }
+
+    public class NetFxNetCoreSdkFeatureBandSearchSymbol : IntermediateSymbol
+    {
+        public NetFxNetCoreSdkFeatureBandSearchSymbol() : base(NetfxSymbolDefinitions.NetFxNetCoreSdkFeatureBandSearch, null, null)
+        {
+        }
+
+        public NetFxNetCoreSdkFeatureBandSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(NetfxSymbolDefinitions.NetFxNetCoreSdkFeatureBandSearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[NetFxNetCoreSdkFeatureBandSearchSymbolFields index] => this.Fields[(int)index];
+
+        public NetCoreSearchPlatform Platform
+        {
+            get => (NetCoreSearchPlatform)this.Fields[(int)NetFxNetCoreSdkFeatureBandSearchSymbolFields.Platform].AsNumber();
+            set => this.Set((int)NetFxNetCoreSdkFeatureBandSearchSymbolFields.Platform, (int)value);
+        }
+
+        public int MajorVersion
+        {
+            get => this.Fields[(int)NetFxNetCoreSdkFeatureBandSearchSymbolFields.MajorVersion].AsNumber();
+            set => this.Set((int)NetFxNetCoreSdkFeatureBandSearchSymbolFields.MajorVersion, value);
+        }
+
+        public int MinorVersion
+        {
+            get => this.Fields[(int)NetFxNetCoreSdkFeatureBandSearchSymbolFields.MinorVersion].AsNumber();
+            set => this.Set((int)NetFxNetCoreSdkFeatureBandSearchSymbolFields.MinorVersion, value);
+        }
+
+        public int PatchVersion
+        {
+            get => this.Fields[(int)NetFxNetCoreSdkFeatureBandSearchSymbolFields.PatchVersion].AsNumber();
+            set => this.Set((int)NetFxNetCoreSdkFeatureBandSearchSymbolFields.PatchVersion, value);
+        }
+    }
+}
diff --git a/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkSymbol.cs b/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkSymbol.cs
index 86b750ea..a368068e 100644
--- a/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkSymbol.cs
+++ b/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkSymbol.cs
@@ -12,9 +12,9 @@ namespace WixToolset.Netfx
             new[]
             {
                 new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkSearchSymbolFields.Platform), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkSearchSymbolFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkSearchSymbolFields.MajorVersion), IntermediateFieldType.Number),
             },
-            typeof(NetFxNetCoreSearchSymbol));
+            typeof(NetFxNetCoreSdkSearchSymbol));
     }
 }
 
@@ -22,21 +22,12 @@ namespace WixToolset.Netfx.Symbols
 {
     using WixToolset.Data;
 
-
-    public enum NetCoreSdkSearchPlatform
-    {
-        X86,
-        X64,
-        Arm64,
-    }
-
     public enum NetFxNetCoreSdkSearchSymbolFields
     {
         Platform,
-        Version,
+        MajorVersion,
     }
 
-
     public class NetFxNetCoreSdkSearchSymbol : IntermediateSymbol
     {
         public NetFxNetCoreSdkSearchSymbol() : base(NetfxSymbolDefinitions.NetFxNetCoreSdkSearch, null, null)
@@ -49,16 +40,16 @@ namespace WixToolset.Netfx.Symbols
 
         public IntermediateField this[NetFxNetCoreSdkSearchSymbolFields index] => this.Fields[(int)index];
 
-        public NetCoreSdkSearchPlatform Platform
+        public NetCoreSearchPlatform Platform
         {
-            get => (NetCoreSdkSearchPlatform)this.Fields[(int)NetFxNetCoreSdkSearchSymbolFields.Platform].AsNumber();
+            get => (NetCoreSearchPlatform)this.Fields[(int)NetFxNetCoreSdkSearchSymbolFields.Platform].AsNumber();
             set => this.Set((int)NetFxNetCoreSdkSearchSymbolFields.Platform, (int)value);
         }
 
-        public string Version
+        public int MajorVersion
         {
-            get => this.Fields[(int)NetFxNetCoreSdkSearchSymbolFields.Version].AsString();
-            set => this.Set((int)NetFxNetCoreSdkSearchSymbolFields.Version, value);
+            get => this.Fields[(int)NetFxNetCoreSdkSearchSymbolFields.MajorVersion].AsNumber();
+            set => this.Set((int)NetFxNetCoreSdkSearchSymbolFields.MajorVersion, value);
         }
     }
 }
diff --git a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
index 00c52f9e..1db4f647 100644
--- a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
+++ b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
@@ -10,8 +10,9 @@ namespace WixToolset.Netfx
     {
         NetFxNativeImage,
         NetFxNetCoreSearch,
-        NetFxNetCoreSdkSearch,
         NetFxDotNetCompatibilityCheck,
+        NetFxNetCoreSdkSearch,
+        NetFxNetCoreSdkFeatureBandSearch,
     }
 
     public static partial class NetfxSymbolDefinitions
@@ -41,6 +42,9 @@ namespace WixToolset.Netfx
                 case NetfxSymbolDefinitionType.NetFxNetCoreSdkSearch:
                     return NetfxSymbolDefinitions.NetFxNetCoreSdkSearch;
 
+                case NetfxSymbolDefinitionType.NetFxNetCoreSdkFeatureBandSearch:
+                    return NetfxSymbolDefinitions.NetFxNetCoreSdkFeatureBandSearch;
+
                 case NetfxSymbolDefinitionType.NetFxDotNetCompatibilityCheck:
                     return NetfxSymbolDefinitions.NetFxDotNetCompatibilityCheck;
 
@@ -53,6 +57,7 @@ namespace WixToolset.Netfx
         {
             NetFxNetCoreSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
             NetFxNetCoreSdkSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
+            NetFxNetCoreSdkFeatureBandSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
         }
     }
 }