From cf6531a216dc248177116399120f02d67731f312 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 18 Oct 2019 11:28:14 -0700
Subject: Small fixes to tuples

---
 src/WixToolset.Data/IntermediateTupleExtensions.cs | 25 +++++-----------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'src/WixToolset.Data/IntermediateTupleExtensions.cs')

diff --git a/src/WixToolset.Data/IntermediateTupleExtensions.cs b/src/WixToolset.Data/IntermediateTupleExtensions.cs
index dd488dc5..7fb2a6c3 100644
--- a/src/WixToolset.Data/IntermediateTupleExtensions.cs
+++ b/src/WixToolset.Data/IntermediateTupleExtensions.cs
@@ -16,11 +16,6 @@ namespace WixToolset.Data
 
         public static IntermediateField Set(this IntermediateTuple tuple, int index, bool value)
         {
-            if (value == default && NoFieldMetadata(tuple, index))
-            {
-                return tuple.Fields[index] = null;
-            }
-
             var definition = tuple.Definition.FieldDefinitions[index];
 
             var field = tuple.Fields[index].Set(definition, value);
@@ -30,7 +25,7 @@ namespace WixToolset.Data
 
         public static IntermediateField Set(this IntermediateTuple tuple, int index, bool? value)
         {
-            if (value == default && NoFieldMetadata(tuple, index))
+            if (value == null && NoFieldMetadata(tuple, index))
             {
                 return tuple.Fields[index] = null;
             }
@@ -44,11 +39,6 @@ namespace WixToolset.Data
 
         public static IntermediateField Set(this IntermediateTuple tuple, int index, long value)
         {
-            if (value == default && NoFieldMetadata(tuple, index))
-            {
-                return tuple.Fields[index] = null;
-            }
-
             var definition = tuple.Definition.FieldDefinitions[index];
 
             var field = tuple.Fields[index].Set(definition, value);
@@ -58,7 +48,7 @@ namespace WixToolset.Data
 
         public static IntermediateField Set(this IntermediateTuple tuple, int index, long? value)
         {
-            if (value == default && NoFieldMetadata(tuple, index))
+            if (value == null && NoFieldMetadata(tuple, index))
             {
                 return tuple.Fields[index] = null;
             }
@@ -72,11 +62,6 @@ namespace WixToolset.Data
 
         public static IntermediateField Set(this IntermediateTuple tuple, int index, int value)
         {
-            if (value == default && NoFieldMetadata(tuple, index))
-            {
-                return tuple.Fields[index] = null;
-            }
-
             var definition = tuple.Definition.FieldDefinitions[index];
 
             var field = tuple.Fields[index].Set(definition, value);
@@ -86,7 +71,7 @@ namespace WixToolset.Data
 
         public static IntermediateField Set(this IntermediateTuple tuple, int index, int? value)
         {
-            if (value == default && NoFieldMetadata(tuple, index))
+            if (value == null && NoFieldMetadata(tuple, index))
             {
                 return tuple.Fields[index] = null;
             }
@@ -100,7 +85,7 @@ namespace WixToolset.Data
 
         public static IntermediateField Set(this IntermediateTuple tuple, int index, IntermediateFieldPathValue value)
         {
-            if (value == default && NoFieldMetadata(tuple, index))
+            if (value == null && NoFieldMetadata(tuple, index))
             {
                 return tuple.Fields[index] = null;
             }
@@ -114,7 +99,7 @@ namespace WixToolset.Data
 
         public static IntermediateField Set(this IntermediateTuple tuple, int index, string value)
         {
-            if (value == default && NoFieldMetadata(tuple, index))
+            if (value == null && NoFieldMetadata(tuple, index))
             {
                 return tuple.Fields[index] = null;
             }
-- 
cgit v1.2.3-55-g6feb