Add Netfx bundle extension and netfx:DotNetCoreSearch.

Remove built-in .NET Core packages since they update too quickly.

Fixes 6257

5 files changed, 301 insertions, 17 deletions

diff --git a/src/ext/NetFx/wixext/NetFxCompiler.cs b/src/ext/NetFx/wixext/NetFxCompiler.cs
index 90aa8bcb..739618e9 100644
--- a/src/ext/NetFx/wixext/NetFxCompiler.cs
+++ b/src/ext/NetFx/wixext/NetFxCompiler.cs
@@ -40,12 +40,178 @@ namespace WixToolset.Netfx
                             break;
                     }
                     break;
+                case "Bundle":
+                case "Fragment":
+                    switch (element.Name.LocalName)
+                    {
+                        case "DotNetCoreSearch":
+                            this.ParseDotNetCoreSearchElement(intermediate, section, element);
+                            break;
+                        case "DotNetCoreSearchRef":
+                            this.ParseDotNetCoreSearchRefElement(intermediate, section, element);
+                            break;
+                    }
+
+                    break;
                 default:
                     this.ParseHelper.UnexpectedElement(parentElement, element);
                     break;
             }
         }
 
+        private void ParseDotNetCoreSearchElement(Intermediate intermediate, IntermediateSection section, XElement element)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+            Identifier id = null;
+            string variable = null;
+            string condition = null;
+            string after = null;
+            NetCoreSearchRuntimeType? runtimeType = null;
+            NetCoreSearchPlatform? platform = null;
+            var majorVersion = CompilerConstants.IntegerNotSet;
+
+            foreach (var attrib in element.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            id = this.ParseHelper.GetAttributeIdentifier(sourceLineNumbers, attrib);
+                            break;
+                        case "Variable":
+                            variable = this.ParseHelper.GetAttributeBundleVariableNameValue(sourceLineNumbers, attrib);
+                            break;
+                        case "Condition":
+                            condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "After":
+                            after = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            break;
+                        case "RuntimeType":
+                            var runtimeTypeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (runtimeTypeValue)
+                            {
+                                case "aspnet":
+                                    runtimeType = NetCoreSearchRuntimeType.Aspnet;
+                                    break;
+                                case "core":
+                                    runtimeType = NetCoreSearchRuntimeType.Core;
+                                    break;
+                                case "desktop":
+                                    runtimeType = NetCoreSearchRuntimeType.Desktop;
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "RuntimeType", runtimeTypeValue, "aspnet", "core", "desktop"));
+                                    break;
+                            }
+                            break;
+                        case "Platform":
+                            var platformValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            switch (platformValue)
+                            {
+                                case "arm64":
+                                    platform = NetCoreSearchPlatform.Arm64;
+                                    break;
+                                case "x64":
+                                    platform = NetCoreSearchPlatform.X64;
+                                    break;
+                                case "x86":
+                                    platform = NetCoreSearchPlatform.X86;
+                                    break;
+                                default:
+                                    this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "Platform", platformValue, "arm64", "x64", "x86"));
+                                    break;
+                            }
+                            break;
+                        case "MajorVersion":
+                            // .NET Core had a different deployment strategy before .NET Core 3.0 which would require different detection logic.
+                            majorVersion = this.ParseHelper.GetAttributeIntegerValue(sourceLineNumbers, attrib, 3, Int32.MaxValue);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
+                }
+            }
+
+            if (id == null)
+            {
+                id = this.ParseHelper.CreateIdentifier("dncs", variable, condition, after);
+            }
+
+            if (!runtimeType.HasValue)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "RuntimeType"));
+            }
+
+            if (!platform.HasValue)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Platform"));
+            }
+
+            if (majorVersion == CompilerConstants.IntegerNotSet)
+            {
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "MajorVersion"));
+            }
+            else if (majorVersion == 4)
+            {
+                this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, element.Name.LocalName, "MajorVersion", "4", "3", "5+"));
+            }
+
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
+
+            var bundleExtensionId = this.ParseHelper.CreateIdentifierValueFromPlatform("Wix4NetfxBundleExtension", this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64);
+            if (bundleExtensionId == null)
+            {
+                this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), element.Name.LocalName));
+            }
+
+            if (!this.Messaging.EncounteredError)
+            {
+                this.ParseHelper.CreateWixSearchSymbol(section, sourceLineNumbers, element.Name.LocalName, id, variable, condition, after, bundleExtensionId);
+
+                section.AddSymbol(new NetFxNetCoreSearchSymbol(sourceLineNumbers, id)
+                {
+                    RuntimeType = runtimeType.Value,
+                    Platform = platform.Value,
+                    MajorVersion = majorVersion,
+                });
+            }
+        }
+
+        private void ParseDotNetCoreSearchRefElement(Intermediate intermediate, IntermediateSection section, XElement element)
+        {
+            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
+
+            foreach (var attrib in element.Attributes())
+            {
+                if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace)
+                {
+                    switch (attrib.Name.LocalName)
+                    {
+                        case "Id":
+                            var refId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
+                            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, NetfxSymbolDefinitions.NetFxNetCoreSearch, refId);
+                            break;
+                        default:
+                            this.ParseHelper.UnexpectedAttribute(element, attrib);
+                            break;
+                    }
+                }
+                else
+                {
+                    this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, element, attrib);
+                }
+            }
+
+            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
+        }
+
         /// <summary>
         /// Parses a NativeImage element.
         /// </summary>
diff --git a/src/ext/NetFx/wixext/NetFxExtensionData.cs b/src/ext/NetFx/wixext/NetFxExtensionData.cs
index 0a24ef1e..61d618cf 100644
--- a/src/ext/NetFx/wixext/NetFxExtensionData.cs
+++ b/src/ext/NetFx/wixext/NetFxExtensionData.cs
@@ -4,7 +4,6 @@ namespace WixToolset.Netfx
 {
     using WixToolset.Data;
     using WixToolset.Extensibility;
-    using WixToolset.Netfx.Symbols;
 
     /// <summary>
     /// The WiX Toolset .NET Framework Extension.
@@ -13,7 +12,7 @@ namespace WixToolset.Netfx
     {
         public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition)
         {
-            symbolDefinition = (name == NetfxSymbolDefinitionNames.NetFxNativeImage) ? NetfxSymbolDefinitions.NetFxNativeImage : null;
+            symbolDefinition = NetfxSymbolDefinitions.ByName(name);
             return symbolDefinition != null;
         }
 
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);
+        }
     }
 }