Use ordinal comparison when searching strings

NathanBaulch · NathanBaulch · commit 6cf95417d79e · 2015-03-05T17:03:07.000+11:00
diff --git a/Saleslogix.SData.Client/Content/ContentHelper.cs b/Saleslogix.SData.Client/Content/ContentHelper.cs
@@ -417,7 +417,7 @@ public override bool TrySerializeNonPrimitiveObject(object input, out object out
                         value = surrogate.Value;
                     }
 
-                    if (item.Key.StartsWith("$"))
+                    if (item.Key.StartsWith("$", StringComparison.Ordinal))
                     {
                         if (infoCreated)
                         {
diff --git a/Saleslogix.SData.Client/Content/JsonContentHandler.cs b/Saleslogix.SData.Client/Content/JsonContentHandler.cs
@@ -100,7 +100,7 @@ private static SDataResource ReadResource(IDictionary<string, object> obj)
                 resource.SyncState = ContentHelper.Deserialize<SyncState>(value);
             }
 
-            foreach (var item in obj.Where(item => !item.Key.StartsWith("$")))
+            foreach (var item in obj.Where(item => !item.Key.StartsWith("$", StringComparison.Ordinal)))
             {
                 resource[item.Key] = ReadObject(item.Value);
             }
@@ -152,7 +152,7 @@ private static IList<SDataLink> ReadLinks(IEnumerable<KeyValuePair<string, objec
             foreach (var pair in obj)
             {
                 var str = pair.Value as string;
-                if (pair.Key.StartsWith("$") && str != null)
+                if (pair.Key.StartsWith("$", StringComparison.Ordinal) && str != null)
                 {
                     var name = pair.Key.Substring(1);
                     Uri uri;
diff --git a/Saleslogix.SData.Client/Framework/UriFormatter.cs b/Saleslogix.SData.Client/Framework/UriFormatter.cs
@@ -337,7 +337,7 @@ public string Path
             {
                 CheckParsePath();
 
-                if (value != null && value.StartsWith(PathSegmentPrefix))
+                if (value != null && value.StartsWith(PathSegmentPrefix, StringComparison.Ordinal))
                 {
                     _pathInternal = value.Substring(PathSegmentPrefix.Length);
                 }
@@ -808,7 +808,7 @@ protected virtual void OnBuildUri()
             CheckRebuildPath();
             if (!string.IsNullOrEmpty(_pathInternal))
             {
-                if (!_pathInternal.StartsWith(PathSegmentPrefix))
+                if (!_pathInternal.StartsWith(PathSegmentPrefix, StringComparison.Ordinal))
                 {
                     uri.Append(PathSegmentPrefix);
                 }
@@ -826,7 +826,7 @@ protected virtual void OnBuildUri()
             // http://<host><:port>/<path><?query><#fragment>
             if (!string.IsNullOrEmpty(_fragment))
             {
-                if (!_fragment.StartsWith(FragmentPrefix))
+                if (!_fragment.StartsWith(FragmentPrefix, StringComparison.Ordinal))
                 {
                     uri.Append(FragmentPrefix);
                 }
@@ -876,20 +876,20 @@ protected virtual void OnParseUri()
                 _host = _uri.Host;
 
                 var path = Uri.UnescapeDataString(_uri.AbsolutePath);
-                if (path.StartsWith(PathSegmentPrefix))
+                if (path.StartsWith(PathSegmentPrefix, StringComparison.Ordinal))
                 {
                     path = path.Substring(PathSegmentPrefix.Length);
                 }
                 _pathInternal = path;
 
                 _fragment = _uri.Fragment;
-                if (_fragment.StartsWith(FragmentPrefix))
+                if (_fragment.StartsWith(FragmentPrefix, StringComparison.Ordinal))
                 {
                     _fragment = _fragment.Substring(FragmentPrefix.Length);
                 }
 
                 _query = _uri.Query;
-                if (_query.StartsWith(QueryPrefix))
+                if (_query.StartsWith(QueryPrefix, StringComparison.Ordinal))
                 {
                     _query = _query.Substring(QueryPrefix.Length);
                 }
@@ -1058,7 +1058,7 @@ protected virtual void OnParseQuery()
 
             if (!string.IsNullOrEmpty(_query))
             {
-                if (_query.StartsWith(QueryPrefix))
+                if (_query.StartsWith(QueryPrefix, StringComparison.Ordinal))
                 {
                     _query = _query.Substring(QueryPrefix.Length);
                 }
diff --git a/Saleslogix.SData.Client/Framework/UriPathSegment.cs b/Saleslogix.SData.Client/Framework/UriPathSegment.cs
@@ -286,7 +286,7 @@ public static string AppendPath(string path, string segment)
         {
             Guard.ArgumentNotNullOrEmptyString(segment, "segment");
 
-            if (segment.StartsWith(UriFormatter.PathSegmentPrefix))
+            if (segment.StartsWith(UriFormatter.PathSegmentPrefix, StringComparison.Ordinal))
             {
                 return segment.Substring(UriFormatter.PathSegmentPrefix.Length);
             }
@@ -310,7 +310,7 @@ public static void AppendPath(StringBuilder path, string segment)
             Guard.ArgumentNotNull(path, "path");
             Guard.ArgumentNotNullOrEmptyString(segment, "segment");
 
-            if (segment.StartsWith(UriFormatter.PathSegmentPrefix))
+            if (segment.StartsWith(UriFormatter.PathSegmentPrefix, StringComparison.Ordinal))
             {
                 path.Length = 0;
                 path.Append(segment.Substring(UriFormatter.PathSegmentPrefix.Length));
diff --git a/Saleslogix.SData.Client/Linq/PropertyPathExtractionVisitor.cs b/Saleslogix.SData.Client/Linq/PropertyPathExtractionVisitor.cs
@@ -174,7 +174,7 @@ private void CompletePath()
         {
             if (_parts.Count > 0)
             {
-                if (!_includeProtocolProps && _parts[0].StartsWith("$"))
+                if (!_includeProtocolProps && _parts[0].StartsWith("$", StringComparison.Ordinal))
                 {
                     _parts.RemoveAt(0);
                 }
diff --git a/Saleslogix.SData.Client/Properties/AssemblyInfo.cs b/Saleslogix.SData.Client/Properties/AssemblyInfo.cs
@@ -25,8 +25,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.0.1.1548")]
-[assembly: AssemblyFileVersion("2.0.1.1548")]
+[assembly: AssemblyVersion("2.0.1.1549")]
+[assembly: AssemblyFileVersion("2.0.1.1549")]
 [assembly: NeutralResourcesLanguage("en-US")]
 [assembly: AssemblyInformationalVersion("2.0")]
 [assembly: InternalsVisibleTo("Saleslogix.SData.Client.Test, PublicKey=" +
diff --git a/demos/SlxFileBrowser/FileSystem/AttachmentFileInfo.cs b/demos/SlxFileBrowser/FileSystem/AttachmentFileInfo.cs
@@ -90,7 +90,7 @@ public override void Save(Stream stream)
                 foreach (var prop in typeof (Attachment).GetProperties())
                 {
                     var name = _client.NamingScheme.GetName(prop);
-                    if (!name.StartsWith("$") && !new[] {"physicalFileName", "fileExists", "fileSize", "createDate", "createUser", "modifyDate", "modifyUser"}.Contains(name))
+                    if (!name.StartsWith("$", StringComparison.Ordinal) && !new[] {"physicalFileName", "fileExists", "fileSize", "createDate", "createUser", "modifyDate", "modifyUser"}.Contains(name, StringComparer.Ordinal))
                     {
                         var value = prop.GetValue(_attachment, null);
                         if (value != null)
diff --git a/demos/SlxFileBrowser/FileSystem/LibraryDirectoryInfo.cs b/demos/SlxFileBrowser/FileSystem/LibraryDirectoryInfo.cs
@@ -104,7 +104,7 @@ void ICachedDirectoryInfo.Remove(IFileInfo file)
 
         public IDirectoryInfo CreateSubdirectory(string path)
         {
-            if (!path.Contains("\\"))
+            if (path.IndexOf("\\", StringComparison.Ordinal) < 0)
             {
                 var subDir = new LibraryDirectory
                     {
diff --git a/demos/SlxFileBrowser/FileSystem/LibraryFileInfo.cs b/demos/SlxFileBrowser/FileSystem/LibraryFileInfo.cs
@@ -90,7 +90,7 @@ public override void Save(Stream stream)
                 foreach (var prop in typeof (LibraryDocument).GetProperties())
                 {
                     var name = _client.NamingScheme.GetName(prop);
-                    if (!name.StartsWith("$") && !new[] {"createDate", "createUser", "modifyDate", "modifyUser"}.Contains(name))
+                    if (!name.StartsWith("$", StringComparison.Ordinal) && !new[] {"createDate", "createUser", "modifyDate", "modifyUser"}.Contains(name, StringComparer.Ordinal))
                     {
                         var value = prop.GetValue(_document, null);
                         if (value != null)

Original file line number	Diff line number	Diff line change
`@@ -417,7 +417,7 @@ public override bool TrySerializeNonPrimitiveObject(object input, out object out`
`417`	`417`	`value = surrogate.Value;`
`418`	`418`	`}`
`419`	`419`
`420`		`- if (item.Key.StartsWith("$"))`
	`420`	`+ if (item.Key.StartsWith("$", StringComparison.Ordinal))`
`421`	`421`	`{`
`422`	`422`	`if (infoCreated)`
`423`	`423`	`{`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private static SDataResource ReadResource(IDictionary<string, object> obj)`
`100`	`100`	`resource.SyncState = ContentHelper.Deserialize<SyncState>(value);`
`101`	`101`	`}`
`102`	`102`
`103`		`- foreach (var item in obj.Where(item => !item.Key.StartsWith("$")))`
	`103`	`+ foreach (var item in obj.Where(item => !item.Key.StartsWith("$", StringComparison.Ordinal)))`
`104`	`104`	`{`
`105`	`105`	`resource[item.Key] = ReadObject(item.Value);`
`106`	`106`	`}`
`@@ -152,7 +152,7 @@ private static IList<SDataLink> ReadLinks(IEnumerable<KeyValuePair<string, objec`
`152`	`152`	`foreach (var pair in obj)`
`153`	`153`	`{`
`154`	`154`	`var str = pair.Value as string;`
`155`		`- if (pair.Key.StartsWith("$") && str != null)`
	`155`	`+ if (pair.Key.StartsWith("$", StringComparison.Ordinal) && str != null)`
`156`	`156`	`{`
`157`	`157`	`var name = pair.Key.Substring(1);`
`158`	`158`	`Uri uri;`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ public string Path`
`337`	`337`	`{`
`338`	`338`	`CheckParsePath();`
`339`	`339`
`340`		`- if (value != null && value.StartsWith(PathSegmentPrefix))`
	`340`	`+ if (value != null && value.StartsWith(PathSegmentPrefix, StringComparison.Ordinal))`
`341`	`341`	`{`
`342`	`342`	`_pathInternal = value.Substring(PathSegmentPrefix.Length);`
`343`	`343`	`}`
`@@ -808,7 +808,7 @@ protected virtual void OnBuildUri()`
`808`	`808`	`CheckRebuildPath();`
`809`	`809`	`if (!string.IsNullOrEmpty(_pathInternal))`
`810`	`810`	`{`
`811`		`- if (!_pathInternal.StartsWith(PathSegmentPrefix))`
	`811`	`+ if (!_pathInternal.StartsWith(PathSegmentPrefix, StringComparison.Ordinal))`
`812`	`812`	`{`
`813`	`813`	`uri.Append(PathSegmentPrefix);`
`814`	`814`	`}`
`@@ -826,7 +826,7 @@ protected virtual void OnBuildUri()`
`826`	`826`	`// http://<host><:port>/<path><?query><#fragment>`
`827`	`827`	`if (!string.IsNullOrEmpty(_fragment))`
`828`	`828`	`{`
`829`		`- if (!_fragment.StartsWith(FragmentPrefix))`
	`829`	`+ if (!_fragment.StartsWith(FragmentPrefix, StringComparison.Ordinal))`
`830`	`830`	`{`
`831`	`831`	`uri.Append(FragmentPrefix);`
`832`	`832`	`}`
`@@ -876,20 +876,20 @@ protected virtual void OnParseUri()`
`876`	`876`	`_host = _uri.Host;`
`877`	`877`
`878`	`878`	`var path = Uri.UnescapeDataString(_uri.AbsolutePath);`
`879`		`- if (path.StartsWith(PathSegmentPrefix))`
	`879`	`+ if (path.StartsWith(PathSegmentPrefix, StringComparison.Ordinal))`
`880`	`880`	`{`
`881`	`881`	`path = path.Substring(PathSegmentPrefix.Length);`
`882`	`882`	`}`
`883`	`883`	`_pathInternal = path;`
`884`	`884`
`885`	`885`	`_fragment = _uri.Fragment;`
`886`		`- if (_fragment.StartsWith(FragmentPrefix))`
	`886`	`+ if (_fragment.StartsWith(FragmentPrefix, StringComparison.Ordinal))`
`887`	`887`	`{`
`888`	`888`	`_fragment = _fragment.Substring(FragmentPrefix.Length);`
`889`	`889`	`}`
`890`	`890`
`891`	`891`	`_query = _uri.Query;`
`892`		`- if (_query.StartsWith(QueryPrefix))`
	`892`	`+ if (_query.StartsWith(QueryPrefix, StringComparison.Ordinal))`
`893`	`893`	`{`
`894`	`894`	`_query = _query.Substring(QueryPrefix.Length);`
`895`	`895`	`}`
`@@ -1058,7 +1058,7 @@ protected virtual void OnParseQuery()`
`1058`	`1058`
`1059`	`1059`	`if (!string.IsNullOrEmpty(_query))`
`1060`	`1060`	`{`
`1061`		`- if (_query.StartsWith(QueryPrefix))`
	`1061`	`+ if (_query.StartsWith(QueryPrefix, StringComparison.Ordinal))`
`1062`	`1062`	`{`
`1063`	`1063`	`_query = _query.Substring(QueryPrefix.Length);`
`1064`	`1064`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ public static string AppendPath(string path, string segment)`
`286`	`286`	`{`
`287`	`287`	`Guard.ArgumentNotNullOrEmptyString(segment, "segment");`
`288`	`288`
`289`		`- if (segment.StartsWith(UriFormatter.PathSegmentPrefix))`
	`289`	`+ if (segment.StartsWith(UriFormatter.PathSegmentPrefix, StringComparison.Ordinal))`
`290`	`290`	`{`
`291`	`291`	`return segment.Substring(UriFormatter.PathSegmentPrefix.Length);`
`292`	`292`	`}`
`@@ -310,7 +310,7 @@ public static void AppendPath(StringBuilder path, string segment)`
`310`	`310`	`Guard.ArgumentNotNull(path, "path");`
`311`	`311`	`Guard.ArgumentNotNullOrEmptyString(segment, "segment");`
`312`	`312`
`313`		`- if (segment.StartsWith(UriFormatter.PathSegmentPrefix))`
	`313`	`+ if (segment.StartsWith(UriFormatter.PathSegmentPrefix, StringComparison.Ordinal))`
`314`	`314`	`{`
`315`	`315`	`path.Length = 0;`
`316`	`316`	`path.Append(segment.Substring(UriFormatter.PathSegmentPrefix.Length));`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ private void CompletePath()`
`174`	`174`	`{`
`175`	`175`	`if (_parts.Count > 0)`
`176`	`176`	`{`
`177`		`- if (!_includeProtocolProps && _parts[0].StartsWith("$"))`
	`177`	`+ if (!_includeProtocolProps && _parts[0].StartsWith("$", StringComparison.Ordinal))`
`178`	`178`	`{`
`179`	`179`	`_parts.RemoveAt(0);`
`180`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public override void Save(Stream stream)`
`90`	`90`	`foreach (var prop in typeof (Attachment).GetProperties())`
`91`	`91`	`{`
`92`	`92`	`var name = _client.NamingScheme.GetName(prop);`
`93`		`- if (!name.StartsWith("$") && !new[] {"physicalFileName", "fileExists", "fileSize", "createDate", "createUser", "modifyDate", "modifyUser"}.Contains(name))`
	`93`	`+ if (!name.StartsWith("$", StringComparison.Ordinal) && !new[] {"physicalFileName", "fileExists", "fileSize", "createDate", "createUser", "modifyDate", "modifyUser"}.Contains(name, StringComparer.Ordinal))`
`94`	`94`	`{`
`95`	`95`	`var value = prop.GetValue(_attachment, null);`
`96`	`96`	`if (value != null)`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ void ICachedDirectoryInfo.Remove(IFileInfo file)`
`104`	`104`
`105`	`105`	`public IDirectoryInfo CreateSubdirectory(string path)`
`106`	`106`	`{`
`107`		`- if (!path.Contains("\\"))`
	`107`	`+ if (path.IndexOf("\\", StringComparison.Ordinal) < 0)`
`108`	`108`	`{`
`109`	`109`	`var subDir = new LibraryDirectory`
`110`	`110`	`{`