9 files changed, 46 insertions, 58 deletions

diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 0e00132b..44a042c7 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -8,7 +8,7 @@
     <OutDir>$(OutputPath)$(Platform)\</OutDir>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
     <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
   </PropertyGroup>
 
diff --git a/src/ca/netfxca.vcxproj b/src/ca/netfxca.vcxproj
index 8be3a0ea..3f525e58 100644
--- a/src/ca/netfxca.vcxproj
+++ b/src/ca/netfxca.vcxproj
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
-
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" />
-  <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" />
-
+  <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -15,7 +13,6 @@
       <Platform>Win32</Platform>
     </ProjectConfiguration>
   </ItemGroup>
-
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -25,38 +22,31 @@
     <ProjectModuleDefinitionFile>netfxca.def</ProjectModuleDefinitionFile>
     <Description>WiX Toolset .NET Framework CustomAction</Description>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-
   <PropertyGroup>
     <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
   </PropertyGroup>
-
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="netfxca.cpp" />
   </ItemGroup>
-
   <ItemGroup>
     <ClInclude Include="cost.h" />
     <ClInclude Include="precomp.h" />
   </ItemGroup>
-
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="netfxca.def" />
+    <None Include="packages.config" />
   </ItemGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/ca/packages.config b/src/ca/packages.config
index b87f9ab4..4e9403bf 100644
--- a/src/ca/packages.config
+++ b/src/ca/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WixToolset.DUtil" version="4.0.6" targetFramework="native" />
-  <package id="WixToolset.WcaUtil" version="4.0.2" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />
+  <package id="WixToolset.WcaUtil" version="4.0.8" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index 7fe2dcff..3f04fea5 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 
 <Project Sdk="Microsoft.NET.Sdk">
@@ -31,8 +31,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/src/wixext/NetFxCompiler.cs b/src/wixext/NetFxCompiler.cs
index 55db4297..8a5d02f5 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.Netfx.Tuples;
 
     /// <summary>
     /// The compiler for the WiX Toolset .NET Framework Extension.
@@ -147,12 +148,14 @@ namespace WixToolset.Netfx
 
             if (!this.Messaging.EncounteredError)
             {
-                var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "NetFxNativeImage", id);
-                row.Set(1, fileId);
-                row.Set(2, priority);
-                row.Set(3, attributes);
-                row.Set(4, assemblyApplication);
-                row.Set(5, appBaseDirectory);
+                section.Tuples.Add(new NetFxNativeImageTuple(sourceLineNumbers, id)
+                {
+                    FileRef=fileId,
+                    Priority=priority,
+                    Attributes=attributes,
+                    ApplicationFileRef=assemblyApplication,
+                    ApplicationBaseDirectoryRef=appBaseDirectory,
+                });
             }
         }
     }
diff --git a/src/wixext/Tuples/NetFxNativeImageTuple.cs b/src/wixext/Tuples/NetFxNativeImageTuple.cs
index af507137..51211f75 100644
--- a/src/wixext/Tuples/NetFxNativeImageTuple.cs
+++ b/src/wixext/Tuples/NetFxNativeImageTuple.cs
@@ -6,12 +6,11 @@ namespace WixToolset.Netfx.Tuples
 
     public enum NetFxNativeImageTupleFields
     {
-        NetFxNativeImage,
-        File_,
+        FileRef,
         Priority,
         Attributes,
-        File_Application,
-        Directory_ApplicationBase,
+        ApplicationFileRef,
+        ApplicationBaseDirectoryRef,
     }
 
     public class NetFxNativeImageTuple : IntermediateTuple
@@ -26,16 +25,10 @@ namespace WixToolset.Netfx.Tuples
 
         public IntermediateField this[NetFxNativeImageTupleFields index] => this.Fields[(int)index];
 
-        public string NetFxNativeImage
+        public string FileRef
         {
-            get => this.Fields[(int)NetFxNativeImageTupleFields.NetFxNativeImage].AsString();
-            set => this.Set((int)NetFxNativeImageTupleFields.NetFxNativeImage, value);
-        }
-
-        public string File_
-        {
-            get => this.Fields[(int)NetFxNativeImageTupleFields.File_].AsString();
-            set => this.Set((int)NetFxNativeImageTupleFields.File_, value);
+            get => this.Fields[(int)NetFxNativeImageTupleFields.FileRef].AsString();
+            set => this.Set((int)NetFxNativeImageTupleFields.FileRef, value);
         }
 
         public int Priority
@@ -50,16 +43,16 @@ namespace WixToolset.Netfx.Tuples
             set => this.Set((int)NetFxNativeImageTupleFields.Attributes, value);
         }
 
-        public string File_Application
+        public string ApplicationFileRef
         {
-            get => this.Fields[(int)NetFxNativeImageTupleFields.File_Application].AsString();
-            set => this.Set((int)NetFxNativeImageTupleFields.File_Application, value);
+            get => this.Fields[(int)NetFxNativeImageTupleFields.ApplicationFileRef].AsString();
+            set => this.Set((int)NetFxNativeImageTupleFields.ApplicationFileRef, value);
         }
 
-        public string Directory_ApplicationBase
+        public string ApplicationBaseDirectoryRef
         {
-            get => this.Fields[(int)NetFxNativeImageTupleFields.Directory_ApplicationBase].AsString();
-            set => this.Set((int)NetFxNativeImageTupleFields.Directory_ApplicationBase, value);
+            get => this.Fields[(int)NetFxNativeImageTupleFields.ApplicationBaseDirectoryRef].AsString();
+            set => this.Set((int)NetFxNativeImageTupleFields.ApplicationBaseDirectoryRef, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/wixext/Tuples/NetfxTupleDefinitions.cs b/src/wixext/Tuples/NetfxTupleDefinitions.cs
index aa584b38..9b617279 100644
--- a/src/wixext/Tuples/NetfxTupleDefinitions.cs
+++ b/src/wixext/Tuples/NetfxTupleDefinitions.cs
@@ -1,4 +1,4 @@
-// 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.
+// 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.Tuples
 {
@@ -15,12 +15,11 @@ namespace WixToolset.Netfx.Tuples
             NetfxTupleDefinitionNames.NetFxNativeImage,
             new[]
             {
-                new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.NetFxNativeImage), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.File_), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.FileRef), IntermediateFieldType.String),
                 new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.Priority), IntermediateFieldType.Number),
                 new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.Attributes), IntermediateFieldType.Number),
-                new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.File_Application), IntermediateFieldType.String),
-                new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.Directory_ApplicationBase), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.ApplicationFileRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(NetFxNativeImageTupleFields.ApplicationBaseDirectoryRef), IntermediateFieldType.String),
             },
             typeof(NetFxNativeImageTuple));
     }
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index 302e5a1f..438ac60f 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 <Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
-  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0005\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0005\build\WixToolset.MSBuild.props')" />
+  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0049\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0049\build\WixToolset.MSBuild.props')" />
   <Import Project="..\FindLocalWix.props" />
   <PropertyGroup>
     <ProjectGuid>{45e4a6ac-3190-4e17-83f0-9935ffa5dc2b}</ProjectGuid>
@@ -45,9 +45,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0005\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0005\build\WixToolset.MSBuild.props'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.8\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.8\build\WixToolset.Util.wixext.targets'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0049\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0049\build\WixToolset.MSBuild.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.15\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.15\build\WixToolset.Util.wixext.targets'))" />
   </Target>
   <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
-  <Import Project="..\..\packages\WixToolset.Util.wixext.4.0.8\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.8\build\WixToolset.Util.wixext.targets')" />
+  <Import Project="..\..\packages\WixToolset.Util.wixext.4.0.15\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.15\build\WixToolset.Util.wixext.targets')" />
 </Project>
\ No newline at end of file
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
index 00328b08..1d51675a 100644
--- a/src/wixlib/packages.config
+++ b/src/wixlib/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.MSBuild" version="4.0.0-build-0005" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.Util.wixext" version="4.0.8" targetFramework="net40" />
+  <package id="WixToolset.MSBuild" version="4.0.0-build-0049" developmentDependency="true" targetFramework="net40" />
+  <package id="WixToolset.Util.wixext" version="4.0.15" targetFramework="net40" />
 </packages>
\ No newline at end of file