replace array.getlength on single-dimension arrays with length property

h3xds1nz · h3xds1nz · commit dbafcd520957 · 2024-07-01T23:24:31.000+02:00
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Color.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Color.cs
@@ -57,7 +57,7 @@ private static Color FromProfile(Uri profileUri)
             if (c1.context != null)
             {
                 c1.nativeColorValue = new float[c1.context.NumChannels];
-                for (int i = 0; i < c1.nativeColorValue.GetLength(0); i++)
+                for (int i = 0; i < c1.nativeColorValue.Length; i++)
                 {
                     c1.nativeColorValue[i] = 0.0f;
                 }
@@ -80,12 +80,12 @@ public static Color FromAValues(float a, float[] values, Uri profileUri)
                 throw new ArgumentException(SR.Format(SR.Color_DimensionMismatch, null));
             }
 
-            if (values.GetLength(0) != c1.nativeColorValue.GetLength(0))
+            if (values.Length != c1.nativeColorValue.Length)
             {
                 throw new ArgumentException(SR.Format(SR.Color_DimensionMismatch, null));
             }
 
-            for (int numChannels = 0; numChannels < values.GetLength(0); numChannels++)
+            for (int numChannels = 0; numChannels < values.Length; numChannels++)
             {
                 c1.nativeColorValue[numChannels] = values[numChannels];
             }
@@ -305,10 +305,10 @@ internal string ConvertToString(string format, IFormatProvider provider)
                 var sb = new StringBuilder();
                 sb.AppendFormat(provider, "{0}{1} ", Parsers.s_ContextColor, uriString);
                 sb.AppendFormat(provider,"{1:" + format + "}{0}",separator,scRgbColor.a);
-                for (int i= 0; i< nativeColorValue.GetLength(0); ++i )
+                for (int i = 0; i < nativeColorValue.Length; ++i )
                 {
                     sb.AppendFormat(provider,"{0:" + format + "}",nativeColorValue[i]);
-                    if (i< nativeColorValue.GetLength(0)-1 )
+                    if (i < nativeColorValue.Length - 1)
                     {
                         sb.AppendFormat(provider,"{0}",separator);
                     }
@@ -350,7 +350,7 @@ private bool IsClose(Color color)
             }
             else
             {
-                for (int i = 0; i < color.nativeColorValue.GetLength(0); i++)
+                for (int i = 0; i < color.nativeColorValue.Length; i++)
                     result = result && FloatUtil.AreClose(nativeColorValue[i], color.nativeColorValue[i]);
             }
 
@@ -421,9 +421,9 @@ public float[] GetNativeColorValues()
                 
                 #pragma warning suppress 6506 // c1.context is obviously not null - both color1.context AND color2.context are not null
                 c1.nativeColorValue = new float[c1.context.NumChannels];
-                for (int i = 0; i < c1.nativeColorValue.GetLength(0); i++)
+                for (int i = 0; i < c1.nativeColorValue.Length; i++)
                 {
-                    c1.nativeColorValue[i] = color1.nativeColorValue[i] + color2.nativeColorValue[i] ;
+                    c1.nativeColorValue[i] = color1.nativeColorValue[i] + color2.nativeColorValue[i];
                 }
 
                 Color c2 = Color.FromRgb(0, 0, 0);
@@ -540,7 +540,7 @@ public static Color Add(Color color1, Color color2)
 
                 #pragma warning suppress 6506 // c1.context is obviously not null - both color1.context AND color2.context are not null
                 c1.nativeColorValue = new float[c1.context.NumChannels];
-                for (int i = 0; i < c1.nativeColorValue.GetLength(0); i++)
+                for (int i = 0; i < c1.nativeColorValue.Length; i++)
                 {
                     c1.nativeColorValue[i] = color1.nativeColorValue[i] - color2.nativeColorValue[i];
                 }
@@ -750,12 +750,12 @@ public override bool Equals(object o)
                     return false;
                 }
 
-                if (color1.nativeColorValue.GetLength(0) != color2.nativeColorValue.GetLength(0))
+                if (color1.nativeColorValue.Length != color2.nativeColorValue.Length)
                 {
                     return false;
                 }
 
-                for (int i = 0; i < color1.nativeColorValue.GetLength(0); i++)
+                for (int i = 0; i < color1.nativeColorValue.Length; i++)
                 {
                     if (color1.nativeColorValue[i] != color2.nativeColorValue[i])
                     {
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/WriteableBitmap.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Imaging/WriteableBitmap.cs
@@ -1085,7 +1085,7 @@ private void ValidateArrayAndGetInfo(Array sourceBuffer,
 
             if (sourceBuffer.Rank == 1)
             {
-                if (sourceBuffer.GetLength(0) <= 0)
+                if (sourceBuffer.Length == 0)
                 {
                     if (backwardsCompat)
                     {
@@ -1104,7 +1104,7 @@ private void ValidateArrayAndGetInfo(Array sourceBuffer,
                     {
                         object exemplar = sourceBuffer.GetValue(0);
                         elementSize = Marshal.SizeOf(exemplar);
-                        sourceBufferSize = sourceBuffer.GetLength(0) * elementSize;
+                        sourceBufferSize = sourceBuffer.Length * elementSize;
                         elementType = exemplar.GetType();
                     }
                 }
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Parsers.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/Media/Parsers.cs
@@ -105,7 +105,7 @@ static private Color ParseContextColor(string trimmedColor, IFormatProvider form
             string tokens = trimmedColor.Substring(s_ContextColor.Length);
             tokens = tokens.Trim();
             string[] preSplit = tokens.Split(' ');
-            if (preSplit.GetLength(0)< 2)
+            if (preSplit.Length < 2)
             {
                 throw new FormatException(SR.Parsers_IllegalToken);
             }
@@ -114,7 +114,7 @@ static private Color ParseContextColor(string trimmedColor, IFormatProvider form
 
             TokenizerHelper th = new TokenizerHelper(tokens, formatProvider);
             string[] split = tokens.Split(new Char[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries);
-            int numTokens = split.GetLength(0);
+            int numTokens = split.Length;
 
             float alpha = Convert.ToSingle(th.NextTokenRequired(), formatProvider);
 
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/ColorTypeConverter.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/ColorTypeConverter.cs
@@ -185,10 +185,10 @@ Type                                destinationType
 
                 sb.AppendFormat(provider, "ContextColor {0} ", uriString);
                 sb.AppendFormat(provider, "{1:R}{0}", separator, color.ScA);
-                for (int i = 0; i < color.GetNativeColorValues().GetLength(0); ++i)
+                for (int i = 0; i < color.GetNativeColorValues().Length; ++i)
                 {
                     sb.AppendFormat(provider, "{0:R}", color.GetNativeColorValues()[i]);
-                    if (i < color.GetNativeColorValues().GetLength(0) - 1)
+                    if (i < color.GetNativeColorValues().Length - 1)
                     {
                         sb.AppendFormat(provider, "{0}", separator);
                     }
@@ -329,12 +329,12 @@ ColorContext                        colorContext
                         
                     XpsResourceStream resourceStream = manager.AcquireResourceStream(typeof(ColorContext), colorContextMimeType.ToString());
 
-                    byte [] buffer = new byte[512];
+                    byte[] buffer = new byte[512];
 
                     Stream profileStream = colorContext.OpenProfileStream();
                     int count;
                     
-                    while ( (count = profileStream.Read( buffer, 0, buffer.GetLength(0)) ) > 0 )
+                    while ( (count = profileStream.Read( buffer, 0, buffer.Length) ) > 0 )
                     {
                         resourceStream.Stream.Write(buffer,0,count);
                     }
diff --git a/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachSerializationCacheItems.cs b/src/Microsoft.DotNet.Wpf/src/ReachFramework/Serialization/manager/ReachSerializationCacheItems.cs
@@ -218,7 +218,7 @@ out DesignerSerializationOptionsAttribute designerSerializationFlagsAttr
             //    and that are not hidden
             //
             if (propertyInfo.CanRead && 
-                propertyInfo.GetIndexParameters().GetLength(0) == 0)
+                propertyInfo.GetIndexParameters().Length == 0)
             {
                 MemberInfo memberInfo          = (MemberInfo) propertyInfo;
 
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlSignatureProperties.cs b/src/Microsoft.DotNet.Wpf/src/WindowsBase/MS/Internal/IO/Packaging/XmlSignatureProperties.cs
@@ -382,7 +382,7 @@ private static DateTime XmlFormattedTimeToDateTime(String s, String format)
         /// <returns>-1 if not found</returns>
         private static int GetIndex(String format)
         {
-            for (int i = 0; i < _dateTimePatternMap.GetLength(0); i++)
+            for (int i = 0; i < _dateTimePatternMap.Length; i++)
             {
                 if (string.Equals(_dateTimePatternMap[i].Format, format, StringComparison.Ordinal))
                 {

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ private static Color FromProfile(Uri profileUri)`
`57`	`57`	`if (c1.context != null)`
`58`	`58`	`{`
`59`	`59`	`c1.nativeColorValue = new float[c1.context.NumChannels];`
`60`		`- for (int i = 0; i < c1.nativeColorValue.GetLength(0); i++)`
	`60`	`+ for (int i = 0; i < c1.nativeColorValue.Length; i++)`
`61`	`61`	`{`
`62`	`62`	`c1.nativeColorValue[i] = 0.0f;`
`63`	`63`	`}`
`@@ -80,12 +80,12 @@ public static Color FromAValues(float a, float[] values, Uri profileUri)`
`80`	`80`	`throw new ArgumentException(SR.Format(SR.Color_DimensionMismatch, null));`
`81`	`81`	`}`
`82`	`82`
`83`		`- if (values.GetLength(0) != c1.nativeColorValue.GetLength(0))`
	`83`	`+ if (values.Length != c1.nativeColorValue.Length)`
`84`	`84`	`{`
`85`	`85`	`throw new ArgumentException(SR.Format(SR.Color_DimensionMismatch, null));`
`86`	`86`	`}`
`87`	`87`
`88`		`- for (int numChannels = 0; numChannels < values.GetLength(0); numChannels++)`
	`88`	`+ for (int numChannels = 0; numChannels < values.Length; numChannels++)`
`89`	`89`	`{`
`90`	`90`	`c1.nativeColorValue[numChannels] = values[numChannels];`
`91`	`91`	`}`
`@@ -305,10 +305,10 @@ internal string ConvertToString(string format, IFormatProvider provider)`
`305`	`305`	`var sb = new StringBuilder();`
`306`	`306`	`sb.AppendFormat(provider, "{0}{1} ", Parsers.s_ContextColor, uriString);`
`307`	`307`	`sb.AppendFormat(provider,"{1:" + format + "}{0}",separator,scRgbColor.a);`
`308`		`- for (int i= 0; i< nativeColorValue.GetLength(0); ++i )`
	`308`	`+ for (int i = 0; i < nativeColorValue.Length; ++i )`
`309`	`309`	`{`
`310`	`310`	`sb.AppendFormat(provider,"{0:" + format + "}",nativeColorValue[i]);`
`311`		`- if (i< nativeColorValue.GetLength(0)-1 )`
	`311`	`+ if (i < nativeColorValue.Length - 1)`
`312`	`312`	`{`
`313`	`313`	`sb.AppendFormat(provider,"{0}",separator);`
`314`	`314`	`}`
`@@ -350,7 +350,7 @@ private bool IsClose(Color color)`
`350`	`350`	`}`
`351`	`351`	`else`
`352`	`352`	`{`
`353`		`- for (int i = 0; i < color.nativeColorValue.GetLength(0); i++)`
	`353`	`+ for (int i = 0; i < color.nativeColorValue.Length; i++)`
`354`	`354`	`result = result && FloatUtil.AreClose(nativeColorValue[i], color.nativeColorValue[i]);`
`355`	`355`	`}`
`356`	`356`
`@@ -421,9 +421,9 @@ public float[] GetNativeColorValues()`
`421`	`421`
`422`	`422`	`#pragma warning suppress 6506 // c1.context is obviously not null - both color1.context AND color2.context are not null`
`423`	`423`	`c1.nativeColorValue = new float[c1.context.NumChannels];`
`424`		`- for (int i = 0; i < c1.nativeColorValue.GetLength(0); i++)`
	`424`	`+ for (int i = 0; i < c1.nativeColorValue.Length; i++)`
`425`	`425`	`{`
`426`		`- c1.nativeColorValue[i] = color1.nativeColorValue[i] + color2.nativeColorValue[i] ;`
	`426`	`+ c1.nativeColorValue[i] = color1.nativeColorValue[i] + color2.nativeColorValue[i];`
`427`	`427`	`}`
`428`	`428`
`429`	`429`	`Color c2 = Color.FromRgb(0, 0, 0);`
`@@ -540,7 +540,7 @@ public static Color Add(Color color1, Color color2)`
`540`	`540`
`541`	`541`	`#pragma warning suppress 6506 // c1.context is obviously not null - both color1.context AND color2.context are not null`
`542`	`542`	`c1.nativeColorValue = new float[c1.context.NumChannels];`
`543`		`- for (int i = 0; i < c1.nativeColorValue.GetLength(0); i++)`
	`543`	`+ for (int i = 0; i < c1.nativeColorValue.Length; i++)`
`544`	`544`	`{`
`545`	`545`	`c1.nativeColorValue[i] = color1.nativeColorValue[i] - color2.nativeColorValue[i];`
`546`	`546`	`}`
`@@ -750,12 +750,12 @@ public override bool Equals(object o)`
`750`	`750`	`return false;`
`751`	`751`	`}`
`752`	`752`
`753`		`- if (color1.nativeColorValue.GetLength(0) != color2.nativeColorValue.GetLength(0))`
	`753`	`+ if (color1.nativeColorValue.Length != color2.nativeColorValue.Length)`
`754`	`754`	`{`
`755`	`755`	`return false;`
`756`	`756`	`}`
`757`	`757`
`758`		`- for (int i = 0; i < color1.nativeColorValue.GetLength(0); i++)`
	`758`	`+ for (int i = 0; i < color1.nativeColorValue.Length; i++)`
`759`	`759`	`{`
`760`	`760`	`if (color1.nativeColorValue[i] != color2.nativeColorValue[i])`
`761`	`761`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1085,7 +1085,7 @@ private void ValidateArrayAndGetInfo(Array sourceBuffer,`
`1085`	`1085`
`1086`	`1086`	`if (sourceBuffer.Rank == 1)`
`1087`	`1087`	`{`
`1088`		`- if (sourceBuffer.GetLength(0) <= 0)`
	`1088`	`+ if (sourceBuffer.Length == 0)`
`1089`	`1089`	`{`
`1090`	`1090`	`if (backwardsCompat)`
`1091`	`1091`	`{`
`@@ -1104,7 +1104,7 @@ private void ValidateArrayAndGetInfo(Array sourceBuffer,`
`1104`	`1104`	`{`
`1105`	`1105`	`object exemplar = sourceBuffer.GetValue(0);`
`1106`	`1106`	`elementSize = Marshal.SizeOf(exemplar);`
`1107`		`- sourceBufferSize = sourceBuffer.GetLength(0) * elementSize;`
	`1107`	`+ sourceBufferSize = sourceBuffer.Length * elementSize;`
`1108`	`1108`	`elementType = exemplar.GetType();`
`1109`	`1109`	`}`
`1110`	`1110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ static private Color ParseContextColor(string trimmedColor, IFormatProvider form`
`105`	`105`	`string tokens = trimmedColor.Substring(s_ContextColor.Length);`
`106`	`106`	`tokens = tokens.Trim();`
`107`	`107`	`string[] preSplit = tokens.Split(' ');`
`108`		`- if (preSplit.GetLength(0)< 2)`
	`108`	`+ if (preSplit.Length < 2)`
`109`	`109`	`{`
`110`	`110`	`throw new FormatException(SR.Parsers_IllegalToken);`
`111`	`111`	`}`
`@@ -114,7 +114,7 @@ static private Color ParseContextColor(string trimmedColor, IFormatProvider form`
`114`	`114`
`115`	`115`	`TokenizerHelper th = new TokenizerHelper(tokens, formatProvider);`
`116`	`116`	`string[] split = tokens.Split(new Char[] { ',', ' ' }, StringSplitOptions.RemoveEmptyEntries);`
`117`		`- int numTokens = split.GetLength(0);`
	`117`	`+ int numTokens = split.Length;`
`118`	`118`
`119`	`119`	`float alpha = Convert.ToSingle(th.NextTokenRequired(), formatProvider);`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -185,10 +185,10 @@ Type destinationType`
`185`	`185`
`186`	`186`	`sb.AppendFormat(provider, "ContextColor {0} ", uriString);`
`187`	`187`	`sb.AppendFormat(provider, "{1:R}{0}", separator, color.ScA);`
`188`		`- for (int i = 0; i < color.GetNativeColorValues().GetLength(0); ++i)`
	`188`	`+ for (int i = 0; i < color.GetNativeColorValues().Length; ++i)`
`189`	`189`	`{`
`190`	`190`	`sb.AppendFormat(provider, "{0:R}", color.GetNativeColorValues()[i]);`
`191`		`- if (i < color.GetNativeColorValues().GetLength(0) - 1)`
	`191`	`+ if (i < color.GetNativeColorValues().Length - 1)`
`192`	`192`	`{`
`193`	`193`	`sb.AppendFormat(provider, "{0}", separator);`
`194`	`194`	`}`
`@@ -329,12 +329,12 @@ ColorContext colorContext`
`329`	`329`
`330`	`330`	`XpsResourceStream resourceStream = manager.AcquireResourceStream(typeof(ColorContext), colorContextMimeType.ToString());`
`331`	`331`
`332`		`- byte [] buffer = new byte[512];`
	`332`	`+ byte[] buffer = new byte[512];`
`333`	`333`
`334`	`334`	`Stream profileStream = colorContext.OpenProfileStream();`
`335`	`335`	`int count;`
`336`	`336`
`337`		`- while ( (count = profileStream.Read( buffer, 0, buffer.GetLength(0)) ) > 0 )`
	`337`	`+ while ( (count = profileStream.Read( buffer, 0, buffer.Length) ) > 0 )`
`338`	`338`	`{`
`339`	`339`	`resourceStream.Stream.Write(buffer,0,count);`
`340`	`340`	`}`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ out DesignerSerializationOptionsAttribute designerSerializationFlagsAttr`
`218`	`218`	`// and that are not hidden`
`219`	`219`	`//`
`220`	`220`	`if (propertyInfo.CanRead &&`
`221`		`- propertyInfo.GetIndexParameters().GetLength(0) == 0)`
	`221`	`+ propertyInfo.GetIndexParameters().Length == 0)`
`222`	`222`	`{`
`223`	`223`	`MemberInfo memberInfo = (MemberInfo) propertyInfo;`
`224`	`224`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ private static DateTime XmlFormattedTimeToDateTime(String s, String format)`
`382`	`382`	`/// <returns>-1 if not found</returns>`
`383`	`383`	`private static int GetIndex(String format)`
`384`	`384`	`{`
`385`		`- for (int i = 0; i < _dateTimePatternMap.GetLength(0); i++)`
	`385`	`+ for (int i = 0; i < _dateTimePatternMap.Length; i++)`
`386`	`386`	`{`
`387`	`387`	`if (string.Equals(_dateTimePatternMap[i].Format, format, StringComparison.Ordinal))`
`388`	`388`	`{`