From 014bc7918c05f01f819c07fac6e502e0f542a222 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@joyofsetup.com>
Date: Thu, 24 Oct 2019 17:16:31 -0400
Subject: Modernize tuples; update to latest dependencies.

---
 src/wixext/Tuples/NetFxNativeImageTuple.cs | 31 ++++++++++++------------------
 src/wixext/Tuples/NetfxTupleDefinitions.cs |  9 ++++-----
 2 files changed, 16 insertions(+), 24 deletions(-)

(limited to 'src/wixext/Tuples')

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));
     }
-- 
cgit v1.2.3-55-g6feb