Skip to content

Commit 6f077c4

Browse files
bdukesbdukes
committed
Resolve CA1305: Specify IFormatProvider
1 parent fd8c09c commit 6f077c4

558 files changed

Lines changed: 8962 additions & 8715 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Build/Build.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
44
<PackAsTool>true</PackAsTool>
@@ -11,7 +11,7 @@
1111
<AnalysisLevel>latest</AnalysisLevel>
1212
<AnalysisMode>Recommended</AnalysisMode>
1313
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
14-
<WarningsNotAsErrors>CS0618,CA1305,CA1716,CA1725,CA5351</WarningsNotAsErrors>
14+
<WarningsNotAsErrors>CS0618,CA1716,CA1725,CA5351</WarningsNotAsErrors>
1515
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1616
</PropertyGroup>
1717
<ItemGroup>

‎Build/Tasks/CreateDatabase.cs‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace DotNetNuke.Build.Tasks
55
{
66
using System;
7+
using System.Globalization;
78
using System.Linq;
89

910
using Cake.Common.Diagnostics;
@@ -21,23 +22,23 @@ public sealed class CreateDatabase : FrostingTask<Context>
2122
/// <inheritdoc/>
2223
public override void Run(Context context)
2324
{
24-
var deleteScript = "if db_id('Dnn_Platform') is not null DROP DATABASE Dnn_Platform;";
25+
const string deleteScript = "if db_id('Dnn_Platform') is not null DROP DATABASE Dnn_Platform;";
2526

2627
context.Information("Dropping LocalDb: {0}", this.ExecuteSqlScript(context, deleteScript));
2728

28-
var createDbScript = string.Format(
29-
@"
30-
CREATE DATABASE
31-
[Dnn_Platform]
32-
ON PRIMARY (
33-
NAME=Dnn_data,
34-
FILENAME = '{0}\Dnn_Platform.mdf'
35-
)
36-
LOG ON (
37-
NAME=Dnn_log,
38-
FILENAME = '{0}\Dnn_Platform.ldf'
39-
)",
40-
context.TempDir);
29+
var createDbScript =
30+
$"""
31+
CREATE DATABASE
32+
[Dnn_Platform]
33+
ON PRIMARY (
34+
NAME=Dnn_data,
35+
FILENAME = '{context.TempDir}\Dnn_Platform.mdf'
36+
)
37+
LOG ON (
38+
NAME=Dnn_log,
39+
FILENAME = '{context.TempDir}\Dnn_Platform.ldf'
40+
)
41+
""";
4142
var createDbStatus = this.ExecuteSqlScript(context, createDbScript);
4243
context.Information("Created LocalDb: {0}", createDbStatus);
4344

@@ -64,7 +65,7 @@ LOG ON (
6465
+ ".SqlDataProvider");
6566

6667
var sqlDelimiterRegex = new System.Text.RegularExpressions.Regex(
67-
"(?<=(?:[^\\w]+|^))GO(?=(?: |\\t)*?(?:\\r?\\n|$))",
68+
@"(?<=(?:[^\w]+|^))GO(?=(?: |\t)*?(?:\r?\n|$))",
6869
System.Text.RegularExpressions.RegexOptions.IgnoreCase | System.Text.RegularExpressions.RegexOptions.Multiline);
6970
string[] sqlStatements = sqlDelimiterRegex.Split(fileContents);
7071
foreach (string statement in sqlStatements)
@@ -109,19 +110,15 @@ LOG ON (
109110
.ToString();
110111
var fileBits = currentFileToProcess.Split('.');
111112

112-
int firstBit;
113-
int secondBit;
114-
int thirdBit;
115-
116-
if (int.TryParse(fileBits[0], out firstBit)
117-
&& int.TryParse(fileBits[1], out secondBit)
118-
&& int.TryParse(fileBits[2], out thirdBit))
113+
if (int.TryParse(fileBits[0], out var firstBit)
114+
&& int.TryParse(fileBits[1], out var secondBit)
115+
&& int.TryParse(fileBits[2], out var thirdBit))
119116
{
120117
var schemaVersionBits = schemaVersion.Split('.');
121118

122-
int schemaFirstBit = int.Parse(schemaVersionBits[0]);
123-
int schemaSecondBit = int.Parse(schemaVersionBits[1]);
124-
int schemaThirdBit = int.Parse(schemaVersionBits[2]);
119+
int schemaFirstBit = int.Parse(schemaVersionBits[0], CultureInfo.InvariantCulture);
120+
int schemaSecondBit = int.Parse(schemaVersionBits[1], CultureInfo.InvariantCulture);
121+
int schemaThirdBit = int.Parse(schemaVersionBits[2], CultureInfo.InvariantCulture);
125122

126123
if ((firstBit == schemaFirstBit && (secondBit >= schemaSecondBit && thirdBit >= schemaThirdBit))
127124
|| firstBit > schemaFirstBit)

‎Build/Tasks/GeneratePackagesChecksums.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace DotNetNuke.Build.Tasks
55
{
66
using System;
7+
using System.Globalization;
78
using System.IO;
89
using System.Linq;
910
using System.Security.Cryptography;
@@ -49,7 +50,7 @@ public override void Run(Context context)
4950
}
5051
}
5152

52-
sb.AppendLine($"| {fileName} | {hash} |");
53+
sb.AppendLine(CultureInfo.InvariantCulture, $"| {fileName} | {hash} |");
5354
}
5455

5556
sb.AppendLine();

‎DNN Platform/Connectors/Azure/Components/AzureConnector.cs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ namespace Dnn.AzureConnector.Components
66
using System;
77
using System.Collections;
88
using System.Collections.Generic;
9+
using System.Globalization;
910
using System.Linq;
1011

1112
using DotNetNuke.Collections;
@@ -99,11 +100,11 @@ public IEnumerable<IConnector> GetConnectors(int portalId)
99100
var connectors = this.FindAzureFolderMappings(portalId);
100101
if (connectors != null && connectors.Count != 0)
101102
{
102-
connectors.ForEach(x => { this.Id = x.FolderMappingID.ToString(); });
103+
connectors.ForEach(x => { this.Id = x.FolderMappingID.ToString(CultureInfo.InvariantCulture); });
103104
var finalCon = connectors.Select(x => (IConnector)Activator.CreateInstance(this.GetType())).ToList();
104105
finalCon.ForEach(x =>
105106
{
106-
x.Id = connectors[finalCon.IndexOf(x)].FolderMappingID.ToString();
107+
x.Id = connectors[finalCon.IndexOf(x)].FolderMappingID.ToString(CultureInfo.InvariantCulture);
107108
x.DisplayName = connectors[finalCon.IndexOf(x)].MappingName;
108109
});
109110
return finalCon;
@@ -130,7 +131,7 @@ public void DeleteConnector(int portalId)
130131
public bool HasConfig(int portalId)
131132
{
132133
var folderMapping = this.FindAzureFolderMapping(portalId, false, true);
133-
this.Id = Convert.ToString(folderMapping?.FolderMappingID);
134+
this.Id = Convert.ToString(folderMapping?.FolderMappingID, CultureInfo.InvariantCulture);
134135
return this.GetConfig(portalId)["Connected"] == "true";
135136
}
136137

@@ -150,7 +151,7 @@ public IDictionary<string, string> GetConfig(int portalId)
150151

151152
// This setting will improve the UI to set password-type inputs on secure settings
152153
configs.Add("SecureSettings", "AccountKey");
153-
configs.Add("Id", Convert.ToString(folderMapping?.FolderMappingID));
154+
configs.Add("Id", Convert.ToString(folderMapping?.FolderMappingID, CultureInfo.InvariantCulture));
154155
return configs;
155156
}
156157

@@ -182,7 +183,7 @@ public bool SaveConfig(int portalId, IDictionary<string, string> values, ref boo
182183
return true;
183184
}
184185

185-
if (this.FolderMappingNameExists(portalId, this.DisplayName, Convert.ToInt32(!string.IsNullOrEmpty(this.Id) ? this.Id : null)))
186+
if (this.FolderMappingNameExists(portalId, this.DisplayName, Convert.ToInt32(!string.IsNullOrEmpty(this.Id) ? this.Id : null, CultureInfo.InvariantCulture)))
186187
{
187188
throw new AzureConnectorException(Localization.GetString("ErrorMappingNameExists", Constants.LocalResourceFile));
188189
}
@@ -193,7 +194,7 @@ public bool SaveConfig(int portalId, IDictionary<string, string> values, ref boo
193194
FolderMappingInfo folderMapping;
194195
if (this.SupportsMultiple && !string.IsNullOrEmpty(this.Id))
195196
{
196-
folderMapping = folderMappings.FirstOrDefault(x => x.FolderMappingID.ToString() == this.Id);
197+
folderMapping = folderMappings.FirstOrDefault(x => x.FolderMappingID.ToString(CultureInfo.InvariantCulture) == this.Id);
197198
}
198199
else
199200
{
@@ -251,7 +252,7 @@ public bool SaveConfig(int portalId, IDictionary<string, string> values, ref boo
251252

252253
if (!folderMapping.FolderMappingSettings.ContainsKey(Constants.SyncBatchSize))
253254
{
254-
folderMapping.FolderMappingSettings[Constants.SyncBatchSize] = Constants.DefaultSyncBatchSize.ToString();
255+
folderMapping.FolderMappingSettings[Constants.SyncBatchSize] = Constants.DefaultSyncBatchSize.ToString(CultureInfo.InvariantCulture);
255256
}
256257

257258
this.folderMappingController.UpdateFolderMapping(folderMapping);
@@ -486,7 +487,7 @@ private FolderMappingInfo FindAzureFolderMapping(int portalId, bool autoCreate =
486487
return folderMappings.FirstOrDefault();
487488
}
488489

489-
var folderMapping = folderMappings.FirstOrDefault(x => x.FolderMappingID.ToString() == this.Id);
490+
var folderMapping = folderMappings.FirstOrDefault(x => x.FolderMappingID.ToString(CultureInfo.InvariantCulture) == this.Id);
490491

491492
if (folderMapping == null && autoCreate)
492493
{
@@ -514,7 +515,7 @@ private bool FolderMappingNameExists(int portalId, string mappingName, int? exce
514515
private FolderMappingInfo CreateAzureFolderMapping(int portalId, string mappingName = "")
515516
{
516517
var folderMapping = CreateAzureFolderMappingStatic(this.folderMappingController, portalId, mappingName);
517-
this.Id = folderMapping.FolderMappingID.ToString();
518+
this.Id = folderMapping.FolderMappingID.ToString(CultureInfo.InvariantCulture);
518519
return folderMapping;
519520
}
520521
}

‎DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AnalysisMode>Recommended</AnalysisMode>
1212
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1313
<NoWarn>CS1591</NoWarn>
14-
<WarningsNotAsErrors>CA1305,CA1310,CA1725</WarningsNotAsErrors>
14+
<WarningsNotAsErrors>CA1310,CA1725</WarningsNotAsErrors>
1515
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1616
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1717
</PropertyGroup>

‎DNN Platform/Controls/CountryListBox/CountryListBox.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AnalysisMode>Recommended</AnalysisMode>
1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1111
<NoWarn>CS1591</NoWarn>
12-
<WarningsNotAsErrors>CA1305,CA1707</WarningsNotAsErrors>
12+
<WarningsNotAsErrors>CA1707</WarningsNotAsErrors>
1313
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1414
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1515
</PropertyGroup>

‎DNN Platform/Controls/CountryListBox/CountryLookup.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace DotNetNuke.UI.WebControls
55
{
66
using System;
7+
using System.Globalization;
78
using System.IO;
89
using System.Net;
910

@@ -272,7 +273,7 @@ private static long ConvertIPAddressToNumber(IPAddress ipAddress)
272273
var address = ipAddress.ToString().Split('.');
273274
if (address.Length == 4)
274275
{
275-
return Convert.ToInt64((16777216 * Convert.ToDouble(address[0])) + (65536 * Convert.ToDouble(address[1])) + (256 * Convert.ToDouble(address[2])) + Convert.ToDouble(address[3]));
276+
return Convert.ToInt64((16777216 * Convert.ToDouble(address[0], CultureInfo.InvariantCulture)) + (65536 * Convert.ToDouble(address[1], CultureInfo.InvariantCulture)) + (256 * Convert.ToDouble(address[2], CultureInfo.InvariantCulture)) + Convert.ToDouble(address[3], CultureInfo.InvariantCulture));
276277
}
277278
else
278279
{
@@ -283,11 +284,11 @@ private static long ConvertIPAddressToNumber(IPAddress ipAddress)
283284
private static string ConvertIPNumberToAddress(long ipNumber)
284285
{
285286
// Convert an IP Number to the IP Address equivalent
286-
string ipNumberPart1 = Convert.ToString(((int)(ipNumber / 16777216)) % 256);
287-
string ipNumberPart2 = Convert.ToString(((int)(ipNumber / 65536)) % 256);
288-
string ipNumberPart3 = Convert.ToString(((int)(ipNumber / 256)) % 256);
289-
string ipNumberPart4 = Convert.ToString(((int)ipNumber) % 256);
290-
return ipNumberPart1 + "." + ipNumberPart2 + "." + ipNumberPart3 + "." + ipNumberPart4;
287+
string ipNumberPart1 = Convert.ToString(((int)(ipNumber / 16777216)) % 256, CultureInfo.InvariantCulture);
288+
string ipNumberPart2 = Convert.ToString(((int)(ipNumber / 65536)) % 256, CultureInfo.InvariantCulture);
289+
string ipNumberPart3 = Convert.ToString(((int)(ipNumber / 256)) % 256, CultureInfo.InvariantCulture);
290+
string ipNumberPart4 = Convert.ToString(((int)ipNumber) % 256, CultureInfo.InvariantCulture);
291+
return $"{ipNumberPart1}.{ipNumberPart2}.{ipNumberPart3}.{ipNumberPart4}";
291292
}
292293
}
293294
}

‎DNN Platform/DotNetNuke.Abstractions/DotNetNuke.Abstractions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AnalysisLevel>latest</AnalysisLevel>
1010
<AnalysisMode>Recommended</AnalysisMode>
1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
12-
<WarningsNotAsErrors>CA1018,CA1305,CA1707,CA1710,CA1716,CA1720</WarningsNotAsErrors>
12+
<WarningsNotAsErrors>CA1018,CA1707,CA1710,CA1716,CA1720</WarningsNotAsErrors>
1313
<DocumentationFile>bin/$(Configuration)/$(TargetFramework)/DotNetNuke.Abstractions.xml</DocumentationFile>
1414
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
1515
</PropertyGroup>

‎DNN Platform/DotNetNuke.Abstractions/Portals/StyleColor.cs‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@
55
namespace DotNetNuke.Abstractions.Portals
66
{
77
using System;
8+
using System.Globalization;
89
using System.Text.RegularExpressions;
910

10-
/// <summary>
11-
/// Represents a CSS color and its components.
12-
/// </summary>
11+
/// <summary>Represents a CSS color and its components.</summary>
1312
public struct StyleColor
1413
{
1514
private static readonly Regex HexColorRegex = new Regex(@"([\da-f]{3}){1,2}", RegexOptions.IgnoreCase | RegexOptions.Compiled);
@@ -19,26 +18,22 @@ public struct StyleColor
1918
private readonly byte blue;
2019
private string hex;
2120

22-
/// <summary>
23-
/// Initializes a new instance of the <see cref="StyleColor"/> struct.
24-
/// </summary>
21+
/// <summary> Initializes a new instance of the <see cref="StyleColor"/> struct.</summary>
2522
public StyleColor()
2623
: this("FFFFFF")
2724
{
2825
}
2926

30-
/// <summary>
31-
/// Initializes a new instance of the <see cref="StyleColor"/> struct.
32-
/// </summary>
27+
/// <summary>Initializes a new instance of the <see cref="StyleColor"/> struct.</summary>
3328
/// <param name="hexValue">The hex value to use.</param>
3429
public StyleColor(string hexValue)
3530
{
3631
AssertIsValidCssColor(hexValue);
3732

3833
this.HexValue = hexValue;
39-
this.red = byte.Parse(this.HexValue.Substring(0, 2), System.Globalization.NumberStyles.HexNumber);
40-
this.green = byte.Parse(this.HexValue.Substring(2, 2), System.Globalization.NumberStyles.HexNumber);
41-
this.blue = byte.Parse(this.HexValue.Substring(4, 2), System.Globalization.NumberStyles.HexNumber);
34+
this.red = byte.Parse(this.HexValue.Substring(0, 2), System.Globalization.NumberStyles.HexNumber, CultureInfo.InvariantCulture);
35+
this.green = byte.Parse(this.HexValue.Substring(2, 2), System.Globalization.NumberStyles.HexNumber, CultureInfo.InvariantCulture);
36+
this.blue = byte.Parse(this.HexValue.Substring(4, 2), System.Globalization.NumberStyles.HexNumber, CultureInfo.InvariantCulture);
4237
}
4338

4439
private enum Component

0 commit comments

Comments
 (0)