Merge pull request #15 from AzureAD/MacBuildWarnings

ArvindHarinder1 · web-flow · commit 6b2de39fd65d · 2020-04-30T09:46:27.000-07:00
Fixed build warnings
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Microsoft.SCIM.csproj b/Microsoft.SystemForCrossDomainIdentityManagement/Microsoft.SCIM.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <NeutralLanguage>en</NeutralLanguage>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Filter.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Filter.cs
@@ -134,7 +134,7 @@ private set
                 string encodedValue = this.comparisonValue;
                 foreach (KeyValuePair<string, string> encoding in Filter.ReservedCharacterEncodingsPerRfc2396.Value)
                 {
-                    encodedValue = encodedValue.Replace(encoding.Key, encoding.Value);
+                    encodedValue = encodedValue.Replace(encoding.Key, encoding.Value, StringComparison.InvariantCulture);
                 }
                 this.comparisonValueEncoded = encodedValue;
             }
@@ -185,7 +185,7 @@ private static IReadOnlyDictionary<string, string> InitializeReservedCharacter39
                 new Dictionary<string, string>(Filter.ReservedCharactersPerRfc3986.Value.Length);
             foreach (char character in Filter.ReservedCharactersPerRfc3986.Value)
             {
-                string from = character.ToString();
+                string from = character.ToString(CultureInfo.InvariantCulture);
                 string to = HttpUtility.UrlEncode(from);
                 result.Add(from, to);
             }
@@ -299,7 +299,7 @@ public static string ToString(IReadOnlyCollection<IFilter> filters)
                 Filter clone = new Filter(filter);
                 clone.ComparisonValue = placeholder;
                 string currentFilter = clone.Serialize();
-                string encodedFilter = HttpUtility.UrlEncode(currentFilter).Replace(placeholder, filter.ComparisonValueEncoded);
+                string encodedFilter = HttpUtility.UrlEncode(currentFilter).Replace(placeholder, filter.ComparisonValueEncoded, StringComparison.InvariantCulture);
                 if (string.IsNullOrWhiteSpace(allFilters))
                 {
                     allFilters =
@@ -333,6 +333,10 @@ public static string ToString(IReadOnlyCollection<IFilter> filters)
 
         public static bool TryParse(string filterExpression, out IReadOnlyCollection<IFilter> filters)
         {
+            if(filterExpression == null)
+            {
+                throw new ArgumentNullException(nameof(filterExpression));
+            }
             string expression = filterExpression.Trim().Unquote();
             try
             {
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/FilterExpression.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/FilterExpression.cs
@@ -225,7 +225,9 @@ private int Group
                            CultureInfo.InvariantCulture,
                            SystemForCrossDomainIdentityManagementProtocolResources.ExceptionInvalidFilterTemplate,
                            this.Text);
+#pragma warning disable CA1303 // Do not pass literals as localized parameters
                     throw new ArgumentOutOfRangeException(message, nameof(this.Group));
+#pragma warning restore CA1303 // Do not pass literals as localized parameters
                 }
                 this.groupValue = value;
             }
@@ -247,7 +249,9 @@ private int Level
                            CultureInfo.InvariantCulture,
                            SystemForCrossDomainIdentityManagementProtocolResources.ExceptionInvalidFilterTemplate,
                            this.Text);
+#pragma warning disable CA1303 // Do not pass literals as localized parameters
                     throw new ArgumentOutOfRangeException(message, nameof(this.Level));
+#pragma warning restore CA1303 // Do not pass literals as localized parameters
                 }
                 this.levelValue = value;
             }
@@ -604,7 +608,7 @@ private void Initialize(Group left, Group @operator, Group right)
             }
 
             string nextExpression = remainder.Substring(indexNextFilter);
-            int indexClosingBracket = remainder.IndexOf(FilterExpression.BracketClose);
+            int indexClosingBracket = remainder.IndexOf(FilterExpression.BracketClose, StringComparison.InvariantCulture);
             int nextExpressionLevel;
             int nextExpressionGroup;
             if (indexClosingBracket >= 0 && indexClosingBracket < indexLogicalOperator)
@@ -738,7 +742,7 @@ private static bool TryParse(string input, out string comparisonValue)
             }
             else
             {
-                int index = input.IndexOf(FilterExpression.Space);
+                int index = input.IndexOf(FilterExpression.Space, StringComparison.InvariantCulture);
                 if (index >= 0)
                 {
                     // If unquoted string comparison values were to be rejected,
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Path.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Path.cs
@@ -157,7 +157,7 @@ public static bool TryParse(string pathExpression, out IPath path)
                 buffer.SchemaIdentifier = schemaIdentifier;
             }
 
-            int seperatorIndex = expression.IndexOf(Path.SeperatorAttributes);
+            int seperatorIndex = expression.IndexOf(Path.SeperatorAttributes, StringComparison.InvariantCulture);
             if (seperatorIndex >= 0)
             {
                 string valuePathExpression = expression.Substring(seperatorIndex + 1);
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/ProtocolExtensions.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/ProtocolExtensions.cs
@@ -1235,9 +1235,11 @@ public static async Task<string> SerializeAsync(this HttpRequestMessage request,
             TextWriter textWriter = null;
             try
             {
-#pragma warning disable IDE0068 // Use recommended dispose pattern
+
+#pragma warning disable CA2000 // Dispose objects before losing scope
                 textWriter = new StringWriter(buffer);
-#pragma warning restore IDE0068 // Use recommended dispose pattern
+#pragma warning restore CA2000 // Dispose objects before losing scope
+
                 IHttpRequestMessageWriter requestWriter = null;
                 try
                 {
@@ -1277,7 +1279,7 @@ public static async Task<string> SerializeAsync(this HttpRequestMessage request)
                 throw new ArgumentNullException(nameof(request));
             }
 
-            string result = await request.SerializeAsync(false);
+            string result = await request.SerializeAsync(false).ConfigureAwait(false);
             return result;
         }
 
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Query.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/Query.cs
@@ -133,7 +133,7 @@ public override string ToString()
             string result = parameters.ToString();
             foreach (KeyValuePair<string, string> placeholder in placeHolders)
             {
-                result = result.Replace(placeholder.Key, placeholder.Value);
+                result = result.Replace(placeholder.Key, placeholder.Value, StringComparison.InvariantCulture);
             }
             return result;
         }
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/ResourceIdentifier.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/ResourceIdentifier.cs
@@ -69,8 +69,8 @@ public override bool Equals(object obj)
 
         public override int GetHashCode()
         {
-            int identifierCode = string.IsNullOrWhiteSpace(this.Identifier) ? 0 : this.Identifier.GetHashCode();
-            int schemaIdentifierCode = string.IsNullOrWhiteSpace(this.SchemaIdentifier) ? 0 : this.SchemaIdentifier.GetHashCode();
+            int identifierCode = string.IsNullOrWhiteSpace(this.Identifier) ? 0 : this.Identifier.GetHashCode(StringComparison.InvariantCulture);
+            int schemaIdentifierCode = string.IsNullOrWhiteSpace(this.SchemaIdentifier) ? 0 : this.SchemaIdentifier.GetHashCode(StringComparison.InvariantCulture);
             int result = identifierCode ^ schemaIdentifierCode;
             return result;
         }
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/SchematizedJsonDeserializingFactory.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Protocol/SchematizedJsonDeserializingFactory.cs
@@ -254,10 +254,12 @@ private static bool TryCreatePatchRequest2Compliant(
             {
                 throw;
             }
+#pragma warning disable CA1031 // Do not catch general exception types
             catch
             {
                 return false;
             }
+#pragma warning restore CA1031 // Do not catch general exception types
 
             return true;
         }
@@ -289,10 +291,12 @@ private bool TryCreatePatchRequest2Legacy(
             {
                 throw;
             }
+#pragma warning disable CA1031 // Do not catch general exception types
             catch
             {
                 return false;
             }
+#pragma warning restore CA1031 // Do not catch general exception types
 
             return true;
         }
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Schemas/AttributeDataType.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Schemas/AttributeDataType.cs
@@ -4,6 +4,7 @@
 
 namespace Microsoft.SCIM
 {
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1720:Identifier contains type name", Justification = "Enum of type names will contain type names")]
     public enum AttributeDataType
     {
         String,
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Schemas/ConfigurationFactory.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Schemas/ConfigurationFactory.cs
@@ -11,6 +11,6 @@ public abstract class ConfigurationFactory<TConfiguration, TException>
     {
         public abstract TConfiguration Create(
             Lazy<TConfiguration> defaultConfiguration,
-            out TException error);
+            out TException configurationError);
     }
 }
diff --git a/Microsoft.SystemForCrossDomainIdentityManagement/Service/SchematizedMediaTypeFormatter.cs b/Microsoft.SystemForCrossDomainIdentityManagement/Service/SchematizedMediaTypeFormatter.cs
@@ -181,10 +181,12 @@ private async Task<object> ReadFromStream(Type type, Stream readStream, HttpCont
             {
                 return new HttpResponseException(HttpStatusCode.BadRequest);
             }
+#pragma warning disable CA1031 // Do not catch general exception types
             catch
             {
                 return new HttpResponseException(HttpStatusCode.BadRequest);
             }
+#pragma warning restore CA1031 // Do not catch general exception types
         }
 
         public override Task<object> ReadFromStreamAsync(

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ private set`
`134`	`134`	`string encodedValue = this.comparisonValue;`
`135`	`135`	`foreach (KeyValuePair<string, string> encoding in Filter.ReservedCharacterEncodingsPerRfc2396.Value)`
`136`	`136`	`{`
`137`		`- encodedValue = encodedValue.Replace(encoding.Key, encoding.Value);`
	`137`	`+ encodedValue = encodedValue.Replace(encoding.Key, encoding.Value, StringComparison.InvariantCulture);`
`138`	`138`	`}`
`139`	`139`	`this.comparisonValueEncoded = encodedValue;`
`140`	`140`	`}`
`@@ -185,7 +185,7 @@ private static IReadOnlyDictionary<string, string> InitializeReservedCharacter39`
`185`	`185`	`new Dictionary<string, string>(Filter.ReservedCharactersPerRfc3986.Value.Length);`
`186`	`186`	`foreach (char character in Filter.ReservedCharactersPerRfc3986.Value)`
`187`	`187`	`{`
`188`		`- string from = character.ToString();`
	`188`	`+ string from = character.ToString(CultureInfo.InvariantCulture);`
`189`	`189`	`string to = HttpUtility.UrlEncode(from);`
`190`	`190`	`result.Add(from, to);`
`191`	`191`	`}`
`@@ -299,7 +299,7 @@ public static string ToString(IReadOnlyCollection<IFilter> filters)`
`299`	`299`	`Filter clone = new Filter(filter);`
`300`	`300`	`clone.ComparisonValue = placeholder;`
`301`	`301`	`string currentFilter = clone.Serialize();`
`302`		`- string encodedFilter = HttpUtility.UrlEncode(currentFilter).Replace(placeholder, filter.ComparisonValueEncoded);`
	`302`	`+ string encodedFilter = HttpUtility.UrlEncode(currentFilter).Replace(placeholder, filter.ComparisonValueEncoded, StringComparison.InvariantCulture);`
`303`	`303`	`if (string.IsNullOrWhiteSpace(allFilters))`
`304`	`304`	`{`
`305`	`305`	`allFilters =`
`@@ -333,6 +333,10 @@ public static string ToString(IReadOnlyCollection<IFilter> filters)`
`333`	`333`
`334`	`334`	`public static bool TryParse(string filterExpression, out IReadOnlyCollection<IFilter> filters)`
`335`	`335`	`{`
	`336`	`+ if(filterExpression == null)`
	`337`	`+ {`
	`338`	`+ throw new ArgumentNullException(nameof(filterExpression));`
	`339`	`+ }`
`336`	`340`	`string expression = filterExpression.Trim().Unquote();`
`337`	`341`	`try`
`338`	`342`	`{`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,9 @@ private int Group`
`225`	`225`	`CultureInfo.InvariantCulture,`
`226`	`226`	`SystemForCrossDomainIdentityManagementProtocolResources.ExceptionInvalidFilterTemplate,`
`227`	`227`	`this.Text);`
	`228`	`+#pragma warning disable CA1303 // Do not pass literals as localized parameters`
`228`	`229`	`throw new ArgumentOutOfRangeException(message, nameof(this.Group));`
	`230`	`+#pragma warning restore CA1303 // Do not pass literals as localized parameters`
`229`	`231`	`}`
`230`	`232`	`this.groupValue = value;`
`231`	`233`	`}`
`@@ -247,7 +249,9 @@ private int Level`
`247`	`249`	`CultureInfo.InvariantCulture,`
`248`	`250`	`SystemForCrossDomainIdentityManagementProtocolResources.ExceptionInvalidFilterTemplate,`
`249`	`251`	`this.Text);`
	`252`	`+#pragma warning disable CA1303 // Do not pass literals as localized parameters`
`250`	`253`	`throw new ArgumentOutOfRangeException(message, nameof(this.Level));`
	`254`	`+#pragma warning restore CA1303 // Do not pass literals as localized parameters`
`251`	`255`	`}`
`252`	`256`	`this.levelValue = value;`
`253`	`257`	`}`
`@@ -604,7 +608,7 @@ private void Initialize(Group left, Group @operator, Group right)`
`604`	`608`	`}`
`605`	`609`
`606`	`610`	`string nextExpression = remainder.Substring(indexNextFilter);`
`607`		`- int indexClosingBracket = remainder.IndexOf(FilterExpression.BracketClose);`
	`611`	`+ int indexClosingBracket = remainder.IndexOf(FilterExpression.BracketClose, StringComparison.InvariantCulture);`
`608`	`612`	`int nextExpressionLevel;`
`609`	`613`	`int nextExpressionGroup;`
`610`	`614`	`if (indexClosingBracket >= 0 && indexClosingBracket < indexLogicalOperator)`
`@@ -738,7 +742,7 @@ private static bool TryParse(string input, out string comparisonValue)`
`738`	`742`	`}`
`739`	`743`	`else`
`740`	`744`	`{`
`741`		`- int index = input.IndexOf(FilterExpression.Space);`
	`745`	`+ int index = input.IndexOf(FilterExpression.Space, StringComparison.InvariantCulture);`
`742`	`746`	`if (index >= 0)`
`743`	`747`	`{`
`744`	`748`	`// If unquoted string comparison values were to be rejected,`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ public static bool TryParse(string pathExpression, out IPath path)`
`157`	`157`	`buffer.SchemaIdentifier = schemaIdentifier;`
`158`	`158`	`}`
`159`	`159`
`160`		`- int seperatorIndex = expression.IndexOf(Path.SeperatorAttributes);`
	`160`	`+ int seperatorIndex = expression.IndexOf(Path.SeperatorAttributes, StringComparison.InvariantCulture);`
`161`	`161`	`if (seperatorIndex >= 0)`
`162`	`162`	`{`
`163`	`163`	`string valuePathExpression = expression.Substring(seperatorIndex + 1);`
Original file line number	Diff line number	Diff line change
`@@ -1235,9 +1235,11 @@ public static async Task<string> SerializeAsync(this HttpRequestMessage request,`
`1235`	`1235`	`TextWriter textWriter = null;`
`1236`	`1236`	`try`
`1237`	`1237`	`{`
`1238`		`-#pragma warning disable IDE0068 // Use recommended dispose pattern`
	`1238`	`+`
	`1239`	`+#pragma warning disable CA2000 // Dispose objects before losing scope`
`1239`	`1240`	`textWriter = new StringWriter(buffer);`
`1240`		`-#pragma warning restore IDE0068 // Use recommended dispose pattern`
	`1241`	`+#pragma warning restore CA2000 // Dispose objects before losing scope`
	`1242`	`+`
`1241`	`1243`	`IHttpRequestMessageWriter requestWriter = null;`
`1242`	`1244`	`try`
`1243`	`1245`	`{`
`@@ -1277,7 +1279,7 @@ public static async Task<string> SerializeAsync(this HttpRequestMessage request)`
`1277`	`1279`	`throw new ArgumentNullException(nameof(request));`
`1278`	`1280`	`}`
`1279`	`1281`
`1280`		`- string result = await request.SerializeAsync(false);`
	`1282`	`+ string result = await request.SerializeAsync(false).ConfigureAwait(false);`
`1281`	`1283`	`return result;`
`1282`	`1284`	`}`
`1283`	`1285`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public override string ToString()`
`133`	`133`	`string result = parameters.ToString();`
`134`	`134`	`foreach (KeyValuePair<string, string> placeholder in placeHolders)`
`135`	`135`	`{`
`136`		`- result = result.Replace(placeholder.Key, placeholder.Value);`
	`136`	`+ result = result.Replace(placeholder.Key, placeholder.Value, StringComparison.InvariantCulture);`
`137`	`137`	`}`
`138`	`138`	`return result;`
`139`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ public override bool Equals(object obj)`
`69`	`69`
`70`	`70`	`public override int GetHashCode()`
`71`	`71`	`{`
`72`		`- int identifierCode = string.IsNullOrWhiteSpace(this.Identifier) ? 0 : this.Identifier.GetHashCode();`
`73`		`- int schemaIdentifierCode = string.IsNullOrWhiteSpace(this.SchemaIdentifier) ? 0 : this.SchemaIdentifier.GetHashCode();`
	`72`	`+ int identifierCode = string.IsNullOrWhiteSpace(this.Identifier) ? 0 : this.Identifier.GetHashCode(StringComparison.InvariantCulture);`
	`73`	`+ int schemaIdentifierCode = string.IsNullOrWhiteSpace(this.SchemaIdentifier) ? 0 : this.SchemaIdentifier.GetHashCode(StringComparison.InvariantCulture);`
`74`	`74`	`int result = identifierCode ^ schemaIdentifierCode;`
`75`	`75`	`return result;`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -254,10 +254,12 @@ private static bool TryCreatePatchRequest2Compliant(`
`254`	`254`	`{`
`255`	`255`	`throw;`
`256`	`256`	`}`
	`257`	`+#pragma warning disable CA1031 // Do not catch general exception types`
`257`	`258`	`catch`
`258`	`259`	`{`
`259`	`260`	`return false;`
`260`	`261`	`}`
	`262`	`+#pragma warning restore CA1031 // Do not catch general exception types`
`261`	`263`
`262`	`264`	`return true;`
`263`	`265`	`}`
`@@ -289,10 +291,12 @@ private bool TryCreatePatchRequest2Legacy(`
`289`	`291`	`{`
`290`	`292`	`throw;`
`291`	`293`	`}`
	`294`	`+#pragma warning disable CA1031 // Do not catch general exception types`
`292`	`295`	`catch`
`293`	`296`	`{`
`294`	`297`	`return false;`
`295`	`298`	`}`
	`299`	`+#pragma warning restore CA1031 // Do not catch general exception types`
`296`	`300`
`297`	`301`	`return true;`
`298`	`302`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Microsoft.SCIM`
`6`	`6`	`{`
	`7`	`+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Naming", "CA1720:Identifier contains type name", Justification = "Enum of type names will contain type names")]`
`7`	`8`	`public enum AttributeDataType`
`8`	`9`	`{`
`9`	`10`	`String,`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ public abstract class ConfigurationFactory<TConfiguration, TException>`
`11`	`11`	`{`
`12`	`12`	`public abstract TConfiguration Create(`
`13`	`13`	`Lazy<TConfiguration> defaultConfiguration,`
`14`		`- out TException error);`
	`14`	`+ out TException configurationError);`
`15`	`15`	`}`
`16`	`16`	`}`