Adding support for DotNetCoreSdkSearch and DotNetCoreSdkCompatibilityCheck

3 files changed, 88 insertions, 19 deletions

diff --git a/src/ext/NetFx/wixext/Symbols/NetFxDotNetCompatibilityCheckSymbol.cs b/src/ext/NetFx/wixext/Symbols/NetFxDotNetCompatibilityCheckSymbol.cs
index a46cf17f..ea1b16c5 100644
--- a/src/ext/NetFx/wixext/Symbols/NetFxDotNetCompatibilityCheckSymbol.cs
+++ b/src/ext/NetFx/wixext/Symbols/NetFxDotNetCompatibilityCheckSymbol.cs
@@ -11,11 +11,11 @@ namespace WixToolset.Netfx
             NetfxSymbolDefinitionType.NetFxDotNetCompatibilityCheck.ToString(),
             new[]
             {
-                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbollFields.RuntimeType), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbollFields.Platform), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbollFields.Version), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbollFields.RollForward), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbollFields.Property), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbolFields.RuntimeType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbolFields.Platform), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbolFields.Version), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbolFields.RollForward), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxDotNetCompatibilityCheckSymbolFields.Property), IntermediateFieldType.String),
             },
             typeof(NetFxDotNetCompatibilityCheckSymbol));
     }
@@ -25,7 +25,7 @@ namespace WixToolset.Netfx.Symbols
 {
     using WixToolset.Data;
 
-    public enum NetFxDotNetCompatibilityCheckSymbollFields
+    public enum NetFxDotNetCompatibilityCheckSymbolFields
     {
         RuntimeType,
         Platform,
@@ -44,36 +44,36 @@ namespace WixToolset.Netfx.Symbols
         {
         }
 
-        public IntermediateField this[NetFxDotNetCompatibilityCheckSymbollFields index] => this.Fields[(int)index];
+        public IntermediateField this[NetFxDotNetCompatibilityCheckSymbolFields index] => this.Fields[(int)index];
 
         public string RuntimeType
         {
-            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbollFields.RuntimeType].AsString();
-            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbollFields.RuntimeType, value);
+            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbolFields.RuntimeType].AsString();
+            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbolFields.RuntimeType, value);
         }
 
         public string Platform
         {
-            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbollFields.Platform].AsString();
-            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbollFields.Platform, value);
+            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbolFields.Platform].AsString();
+            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbolFields.Platform, value);
         }
 
         public string Version
         {
-            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbollFields.Version].AsString();
-            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbollFields.Version, value);
+            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbolFields.Version].AsString();
+            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbolFields.Version, value);
         }
 
         public string RollForward
         {
-            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbollFields.RollForward].AsString();
-            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbollFields.RollForward, value);
+            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbolFields.RollForward].AsString();
+            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbolFields.RollForward, value);
         }
 
         public string Property
         {
-            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbollFields.Property].AsString();
-            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbollFields.Property, value);
+            get => this.Fields[(int)NetFxDotNetCompatibilityCheckSymbolFields.Property].AsString();
+            set => this.Set((int)NetFxDotNetCompatibilityCheckSymbolFields.Property, value);
         }
     }
 }
diff --git a/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkSymbol.cs b/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkSymbol.cs
new file mode 100644
index 00000000..86b750ea
--- /dev/null
+++ b/src/ext/NetFx/wixext/Symbols/NetFxNetCoreSearchSdkSymbol.cs
@@ -0,0 +1,64 @@
+// 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 NetFxNetCoreSdkSearch = new IntermediateSymbolDefinition(
+            NetfxSymbolDefinitionType.NetFxNetCoreSdkSearch.ToString(),
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkSearchSymbolFields.Platform), IntermediateFieldType.Number),
+                new IntermediateFieldDefinition(nameof(NetFxNetCoreSdkSearchSymbolFields.Version), IntermediateFieldType.String),
+            },
+            typeof(NetFxNetCoreSearchSymbol));
+    }
+}
+
+namespace WixToolset.Netfx.Symbols
+{
+    using WixToolset.Data;
+
+
+    public enum NetCoreSdkSearchPlatform
+    {
+        X86,
+        X64,
+        Arm64,
+    }
+
+    public enum NetFxNetCoreSdkSearchSymbolFields
+    {
+        Platform,
+        Version,
+    }
+
+
+    public class NetFxNetCoreSdkSearchSymbol : IntermediateSymbol
+    {
+        public NetFxNetCoreSdkSearchSymbol() : base(NetfxSymbolDefinitions.NetFxNetCoreSdkSearch, null, null)
+        {
+        }
+
+        public NetFxNetCoreSdkSearchSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(NetfxSymbolDefinitions.NetFxNetCoreSdkSearch, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[NetFxNetCoreSdkSearchSymbolFields index] => this.Fields[(int)index];
+
+        public NetCoreSdkSearchPlatform Platform
+        {
+            get => (NetCoreSdkSearchPlatform)this.Fields[(int)NetFxNetCoreSdkSearchSymbolFields.Platform].AsNumber();
+            set => this.Set((int)NetFxNetCoreSdkSearchSymbolFields.Platform, (int)value);
+        }
+
+        public string Version
+        {
+            get => this.Fields[(int)NetFxNetCoreSdkSearchSymbolFields.Version].AsString();
+            set => this.Set((int)NetFxNetCoreSdkSearchSymbolFields.Version, value);
+        }
+    }
+}
diff --git a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
index ad729dd4..00c52f9e 100644
--- a/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
+++ b/src/ext/NetFx/wixext/Symbols/NetfxSymbolDefinitions.cs
@@ -10,7 +10,8 @@ namespace WixToolset.Netfx
     {
         NetFxNativeImage,
         NetFxNetCoreSearch,
-        NetFxDotNetCompatibilityCheck
+        NetFxNetCoreSdkSearch,
+        NetFxDotNetCompatibilityCheck,
     }
 
     public static partial class NetfxSymbolDefinitions
@@ -36,7 +37,10 @@ namespace WixToolset.Netfx
 
                 case NetfxSymbolDefinitionType.NetFxNetCoreSearch:
                     return NetfxSymbolDefinitions.NetFxNetCoreSearch;
-                    
+
+                case NetfxSymbolDefinitionType.NetFxNetCoreSdkSearch:
+                    return NetfxSymbolDefinitions.NetFxNetCoreSdkSearch;
+
                 case NetfxSymbolDefinitionType.NetFxDotNetCompatibilityCheck:
                     return NetfxSymbolDefinitions.NetFxDotNetCompatibilityCheck;
 
@@ -48,6 +52,7 @@ namespace WixToolset.Netfx
         static NetfxSymbolDefinitions()
         {
             NetFxNetCoreSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
+            NetFxNetCoreSdkSearch.AddTag(BurnConstants.BundleExtensionSearchSymbolDefinitionTag);
         }
     }
 }