2 files changed, 10 insertions, 2 deletions

diff --git a/src/wixext/NetFxCompiler.cs b/src/wixext/NetFxCompiler.cs
index 06d48fe7..4916994e 100644
--- a/src/wixext/NetFxCompiler.cs
+++ b/src/wixext/NetFxCompiler.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Netfx
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Extensibility;
+    using WixToolset.Extensibility.Data;
     using WixToolset.Netfx.Tuples;
 
     /// <summary>
@@ -144,7 +145,7 @@ namespace WixToolset.Netfx
 
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "NetFxScheduleNativeImage");
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "NetFxScheduleNativeImage", this.Context.Platform, CustomActionPlatforms.X86);
 
             if (!this.Messaging.EncounteredError)
             {
diff --git a/src/wixext/NetfxWindowsInstallerBackendExtension.cs b/src/wixext/NetfxWindowsInstallerBackendExtension.cs
index df4e9839..1c7ce9b8 100644
--- a/src/wixext/NetfxWindowsInstallerBackendExtension.cs
+++ b/src/wixext/NetfxWindowsInstallerBackendExtension.cs
@@ -11,10 +11,11 @@ namespace WixToolset.Netfx
     {
         private static readonly TableDefinition[] Tables = new[] {
             new TableDefinition(
+                "Wix4NetFxNativeImage",
                 "NetFxNativeImage",
                 new[]
                 {
-                    new ColumnDefinition("NetFxNativeImage", ColumnType.String, 72, true, false, ColumnCategory.Identifier, description: "The primary key, a non-localized token."),
+                    new ColumnDefinition("Wix4NetFxNativeImage", ColumnType.String, 72, true, false, ColumnCategory.Identifier, description: "The primary key, a non-localized token."),
                     new ColumnDefinition("File_", ColumnType.String, 0, false, false, ColumnCategory.Identifier, keyTable:"File", keyColumn: 1, description: "The assembly for which a native image will be generated."),
                     new ColumnDefinition("Priority", ColumnType.Number, 2, false, false, ColumnCategory.Integer, maxValue: 3, description: "The priority for generating this native image: 0 is syncronous, 1-3 represent various levels of queued generation."),
                     new ColumnDefinition("Attributes", ColumnType.Number, 4, false, false, ColumnCategory.Integer, maxValue: 2147483647, description: "Integer containing bit flags representing native image attributes."),
@@ -25,5 +26,11 @@ namespace WixToolset.Netfx
         };
 
         public override IEnumerable<TableDefinition> TableDefinitions { get => Tables; }
+
+        public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output)
+        {
+            var columnZeroIsId = tuple.Id != null;
+            return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions, columnZeroIsId);
+        }
     }
 }