[#675] Corrected order of execution when assigning values to ValueX, from object collection, and correctly storing the state of HasValueX

Author: Adam Smith-Platts

Source/Common/Values{T1,T2,T3,T4,T5,T6,T7}.cs

@@ -245,21 +245,21 @@ public Values(IEnumerable<object?> items)
             }
         }
 
-        this.HasValue1 = items1?.Count > 0;
-        this.HasValue2 = items2?.Count > 0;
-        this.HasValue3 = items3?.Count > 0;
-        this.HasValue4 = items4?.Count > 0;
-        this.HasValue5 = items5?.Count > 0;
-        this.HasValue6 = items6?.Count > 0;
-        this.HasValue7 = items7?.Count > 0;
-
         this.Value1 = items1 == null ? default : (OneOrMany<T1>)items1;
         this.Value2 = items2 == null ? default : (OneOrMany<T2>)items2;
         this.Value3 = items3 == null ? default : (OneOrMany<T3>)items3;
         this.Value4 = items4 == null ? default : (OneOrMany<T4>)items4;
         this.Value5 = items5 == null ? default : (OneOrMany<T5>)items5;
         this.Value6 = items6 == null ? default : (OneOrMany<T6>)items6;
         this.Value7 = items7 == null ? default : (OneOrMany<T7>)items7;
+
+        this.HasValue1 = this.Value1.Count > 0;
+        this.HasValue2 = this.Value2.Count > 0;
+        this.HasValue3 = this.Value3.Count > 0;
+        this.HasValue4 = this.Value4.Count > 0;
+        this.HasValue5 = this.Value5.Count > 0;
+        this.HasValue6 = this.Value6.Count > 0;
+        this.HasValue7 = this.Value7.Count > 0;
     }
 
     /// <summary>

Source/Common/Values{T1,T2,T3,T4,T5,T6}.cs

@@ -204,19 +204,19 @@ public Values(IEnumerable<object?> items)
             }
         }
 
-        this.HasValue1 = items1?.Count > 0;
-        this.HasValue2 = items2?.Count > 0;
-        this.HasValue3 = items3?.Count > 0;
-        this.HasValue4 = items4?.Count > 0;
-        this.HasValue5 = items5?.Count > 0;
-        this.HasValue6 = items6?.Count > 0;
-
         this.Value1 = items1 == null ? default : (OneOrMany<T1>)items1;
         this.Value2 = items2 == null ? default : (OneOrMany<T2>)items2;
         this.Value3 = items3 == null ? default : (OneOrMany<T3>)items3;
         this.Value4 = items4 == null ? default : (OneOrMany<T4>)items4;
         this.Value5 = items5 == null ? default : (OneOrMany<T5>)items5;
         this.Value6 = items6 == null ? default : (OneOrMany<T6>)items6;
+
+        this.HasValue1 = this.Value1.Count > 0;
+        this.HasValue2 = this.Value2.Count > 0;
+        this.HasValue3 = this.Value3.Count > 0;
+        this.HasValue4 = this.Value4.Count > 0;
+        this.HasValue5 = this.Value5.Count > 0;
+        this.HasValue6 = this.Value6.Count > 0;
     }
 
     /// <summary>

Source/Common/Values{T1,T2,T3,T4,T5}.cs

@@ -167,17 +167,17 @@ public Values(IEnumerable<object?> items)
             }
         }
 
-        this.HasValue1 = items1?.Count > 0;
-        this.HasValue2 = items2?.Count > 0;
-        this.HasValue3 = items3?.Count > 0;
-        this.HasValue4 = items4?.Count > 0;
-        this.HasValue5 = items5?.Count > 0;
-
         this.Value1 = items1 == null ? default : (OneOrMany<T1>)items1;
         this.Value2 = items2 == null ? default : (OneOrMany<T2>)items2;
         this.Value3 = items3 == null ? default : (OneOrMany<T3>)items3;
         this.Value4 = items4 == null ? default : (OneOrMany<T4>)items4;
         this.Value5 = items5 == null ? default : (OneOrMany<T5>)items5;
+
+        this.HasValue1 = this.Value1.Count > 0;
+        this.HasValue2 = this.Value2.Count > 0;
+        this.HasValue3 = this.Value3.Count > 0;
+        this.HasValue4 = this.Value4.Count > 0;
+        this.HasValue5 = this.Value5.Count > 0;
     }
 
     /// <summary>

Source/Common/Values{T1,T2,T3,T4}.cs

@@ -134,15 +134,15 @@ public Values(IEnumerable<object?> items)
             }
         }
 
-        this.HasValue1 = items1?.Count > 0;
-        this.HasValue2 = items2?.Count > 0;
-        this.HasValue3 = items3?.Count > 0;
-        this.HasValue4 = items4?.Count > 0;
-
         this.Value1 = items1 == null ? default : (OneOrMany<T1>)items1;
         this.Value2 = items2 == null ? default : (OneOrMany<T2>)items2;
         this.Value3 = items3 == null ? default : (OneOrMany<T3>)items3;
         this.Value4 = items4 == null ? default : (OneOrMany<T4>)items4;
+
+        this.HasValue1 = this.Value1.Count > 0;
+        this.HasValue2 = this.Value2.Count > 0;
+        this.HasValue3 = this.Value3.Count > 0;
+        this.HasValue4 = this.Value4.Count > 0;
     }
 
     /// <summary>

Source/Common/Values{T1,T2,T3}.cs

@@ -105,13 +105,13 @@ public Values(IEnumerable<object> items)
             }
         }
 
-        this.HasValue1 = items1?.Count > 0;
-        this.HasValue2 = items2?.Count > 0;
-        this.HasValue3 = items3?.Count > 0;
-
         this.Value1 = items1 == null ? default : (OneOrMany<T1>)items1;
         this.Value2 = items2 == null ? default : (OneOrMany<T2>)items2;
         this.Value3 = items3 == null ? default : (OneOrMany<T3>)items3;
+
+        this.HasValue1 = this.Value1.Count > 0;
+        this.HasValue2 = this.Value2.Count > 0;
+        this.HasValue3 = this.Value3.Count > 0;
     }
 
     /// <summary>

Source/Common/Values{T1,T2}.cs

@@ -80,11 +80,11 @@ public Values(IEnumerable<object?> items)
             }
         }
 
-        this.HasValue1 = items1?.Count > 0;
-        this.HasValue2 = items2?.Count > 0;
-
         this.Value1 = items1 == null ? default : (OneOrMany<T1>)items1;
         this.Value2 = items2 == null ? default : (OneOrMany<T2>)items2;
+
+        this.HasValue1 = this.Value1.Count > 0;
+        this.HasValue2 = this.Value2.Count > 0;
     }
 
     /// <summary>