mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-05 10:46:33 +02:00
.NET 8 Upgrade Silenced Errors Fix (#30469)
* [Dev][Build] .NET 8 Upgrade Silenced errors first fix. * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1859 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1854. * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1860 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1861 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1862 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1863 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1864 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA1865 * [Dev][Build] .NET 8 Upgrade Silenced errors. CA2208 * [Dev][Build] .NET 8 Upgrade Silenced errors. CS9191 * [Dev][Build] .NET 8 Upgrade Silenced errors. Spell check * [Dev][Build] .NET 8 Upgrade Silenced errors. Spell check * [Dev][Build] .NET 8 Upgrade Silenced errors. - CompositeFormat variables used more than once in the same file were assigned to a single variable. - GetProcessesByName logic fix. - String comparion fix. - ArgumentOutOfRangeException message change. * [Dev][Build] .NET 8 Upgrade Silenced errors. - Null check added. - static readonly CompositeFormat added for all fields.
This commit is contained in:
@@ -29,6 +29,11 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
||||
|
||||
public DateTime LastBackupStartTime { get; set; }
|
||||
|
||||
private static readonly JsonSerializerOptions _serializerOptions = new JsonSerializerOptions
|
||||
{
|
||||
WriteIndented = true,
|
||||
};
|
||||
|
||||
private SettingsBackupAndRestoreUtils()
|
||||
{
|
||||
LastBackupStartTime = DateTime.MinValue;
|
||||
@@ -378,7 +383,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
||||
return settingsBackupAndRestoreDir;
|
||||
}
|
||||
|
||||
private IList<string> GetBackupSettingsFiles(string settingsBackupAndRestoreDir)
|
||||
private List<string> GetBackupSettingsFiles(string settingsBackupAndRestoreDir)
|
||||
{
|
||||
return Directory.GetFiles(settingsBackupAndRestoreDir, "settings_*.ptb", SearchOption.TopDirectoryOnly).ToList().Where(f => Regex.IsMatch(f, "settings_(\\d{1,19}).ptb")).ToList();
|
||||
}
|
||||
@@ -745,7 +750,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
||||
UnchangedFiles = skippedSettingsFiles.Keys.ToList(),
|
||||
};
|
||||
|
||||
var manifest = JsonSerializer.Serialize(manifestData, new JsonSerializerOptions() { WriteIndented = true });
|
||||
var manifest = JsonSerializer.Serialize(manifestData, _serializerOptions);
|
||||
|
||||
if (!dryRun)
|
||||
{
|
||||
@@ -993,7 +998,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
||||
public static string Normalize(string json)
|
||||
{
|
||||
var doc1 = JsonNormalizer.Deserialize(json);
|
||||
var newJson1 = JsonSerializer.Serialize(doc1, new JsonSerializerOptions { WriteIndented = true });
|
||||
var newJson1 = JsonSerializer.Serialize(doc1, _serializerOptions);
|
||||
return newJson1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user