使用 NET8 新语法

Corona-Studio · Nov 16, 2023 · aeb4447 · aeb4447
1 parent 2ba95be
commit aeb4447
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 25 deletions.
diff --git a/ProjBobcat/ProjBobcat/Class/Helper/DownloadHelper.cs b/ProjBobcat/ProjBobcat/Class/Helper/DownloadHelper.cs
@@ -301,7 +301,7 @@ public static async Task MultiPartDownloadTaskAsync(
 
                 #region Calculate ranges
 
-                readRanges = new List<DownloadRange>();
+                readRanges = [];
                 var partSize = responseLength / downloadSettings.DownloadParts;
                 var totalSize = responseLength;
 

diff --git a/ProjBobcat/ProjBobcat/Class/Helper/GameResourcesResolveHelper.cs b/ProjBobcat/ProjBobcat/Class/Helper/GameResourcesResolveHelper.cs
@@ -87,12 +87,11 @@ public static async IAsyncEnumerable<GameModResolvedInfo> ResolveModListAsync(IE
                     case JsonValueKind.Object:
                         var val = doc.RootElement.Deserialize(GameModInfoModelContext.Default.GameModInfoModel);
 
-                        if (val != null) model = new List<GameModInfoModel> { val };
+                        if (val != null) model = [val];
 
                         break;
                     case JsonValueKind.Array:
-                        model = doc.RootElement.Deserialize(GameModInfoModelContext.Default.ListGameModInfoModel) ??
-                                new List<GameModInfoModel>();
+                        model = doc.RootElement.Deserialize(GameModInfoModelContext.Default.ListGameModInfoModel) ?? [];
                         break;
                 }
 

diff --git a/ProjBobcat/ProjBobcat/Class/Model/GameConfigurationManager.cs b/ProjBobcat/ProjBobcat/Class/Model/GameConfigurationManager.cs
@@ -13,7 +13,7 @@ public class GameConfigurationManager : IEnumerable<KeyValuePair<string, string>
 
     public GameConfigurationManager()
     {
-        _configuration = new Dictionary<string, string>();
+        _configuration = [];
     }
 
     public GameConfigurationManager(string path)

diff --git a/ProjBobcat/ProjBobcat/Class/Model/Version/ComparableVersion.cs b/ProjBobcat/ProjBobcat/Class/Model/Version/ComparableVersion.cs
@@ -51,7 +51,7 @@ public class ComparableVersion : IComparable<ComparableVersion>
     const int MaxIntItemLength = 9;
     const int MaxLongItemLength = 18;
 
-    readonly ListItem _items = new();
+    readonly ListItem _items = [];
 
     string? _canonical;
     string _value = null!;
@@ -104,7 +104,7 @@ void ParseVersion(string version)
                         : ParseItem(isDigit, version[startIndex..i]));
                     startIndex = i + 1;
 
-                    list.Add(list = new ListItem());
+                    list.Add(list = []);
                     stack.Push(list);
                     break;
                 default:
@@ -116,7 +116,7 @@ void ParseVersion(string version)
                             list.Add(new StringItem(version[startIndex..i], true));
                             startIndex = i;
 
-                            list.Add(list = new ListItem());
+                            list.Add(list = []);
                             stack.Push(list);
                         }
 
@@ -129,7 +129,7 @@ void ParseVersion(string version)
                             list.Add(ParseItem(true, version[startIndex..i]));
                             startIndex = i;
 
-                            list.Add(list = new ListItem());
+                            list.Add(list = []);
                             stack.Push(list);
                         }
 

diff --git a/ProjBobcat/ProjBobcat/Class/Model/Version/Item/StringItem.cs b/ProjBobcat/ProjBobcat/Class/Model/Version/Item/StringItem.cs
@@ -6,16 +6,16 @@ namespace ProjBobcat.Class.Model.Version.Item;
 
 public class StringItem : IItem
 {
-    static readonly List<string> Qualifiers = new()
-    {
+    static readonly List<string> Qualifiers =
+    [
         "alpha",
         "beta",
         "milestone",
         "rc",
         "snapshot",
         Empty,
         "sp"
-    };
+    ];
 
     static readonly Dictionary<string, string> Aliases = new()
     {

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/DefaultResourceCompleter.cs b/ProjBobcat/ProjBobcat/DefaultComponent/DefaultResourceCompleter.cs
@@ -23,7 +23,7 @@ public class DefaultResourceCompleter : IResourceCompleter
     static readonly object ChangedEventKey = new();
     static readonly object CompletedEventKey = new();
 
-    readonly ConcurrentBag<DownloadFile> _failedFiles = new();
+    readonly ConcurrentBag<DownloadFile> _failedFiles = [];
     readonly EventHandlerList _listEventDelegates = new();
 
     bool _disposedValue;

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/HighVersionForgeInstaller.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ForgeInstaller/HighVersionForgeInstaller.cs
@@ -37,7 +37,7 @@ static readonly Regex
 
 #endif
 
-    readonly ConcurrentBag<DownloadFile> _failedFiles = new();
+    readonly ConcurrentBag<DownloadFile> _failedFiles = [];
     int _totalDownloaded, _needToDownload, _totalProcessed, _needToProcess;
 
     public string? JavaExecutablePath { get; init; }

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ModPackInstaller/ModPackInstallerBase.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Installer/ModPackInstaller/ModPackInstallerBase.cs
@@ -6,7 +6,7 @@ namespace ProjBobcat.DefaultComponent.Installer.ModPackInstaller;
 
 public class ModPackInstallerBase : InstallerBase
 {
-    protected readonly ConcurrentBag<DownloadFile> FailedFiles = new();
+    protected readonly ConcurrentBag<DownloadFile> FailedFiles = [];
     protected int TotalDownloaded, NeedToDownload;
 
     protected void WhenCompleted(object? sender, DownloadFileCompletedEventArgs e)

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultLauncherAccountParser.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultLauncherAccountParser.cs
@@ -29,7 +29,7 @@ public DefaultLauncherAccountParser(string rootPath, Guid clientToken)
         {
             var launcherAccount = new LauncherAccountModel
             {
-                Accounts = new Dictionary<string, AccountModel>(),
+                Accounts = [],
                 MojangClientToken = clientToken.ToString("N")
             };
 
@@ -74,7 +74,7 @@ public bool AddNewAccount(string uuid, AccountModel account, out Guid? id)
             return false;
         }
 
-        LauncherAccount.Accounts ??= new Dictionary<string, AccountModel>();
+        LauncherAccount.Accounts ??= [];
 
         if (LauncherAccount.Accounts.ContainsKey(uuid))
         {

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultLauncherProfileParser.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultLauncherProfileParser.cs
@@ -40,7 +40,7 @@ public DefaultLauncherProfileParser(string rootPath, Guid clientToken)
                     Format = 1,
                     Name = string.Empty
                 },
-                Profiles = new Dictionary<string, GameProfileModel>()
+                Profiles = []
             };
 
             LauncherProfile = launcherProfile;

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Launch/DefaultVersionLocator.cs
@@ -341,7 +341,7 @@ public override (List<NativeFileInfo>, List<FileInfo>) GetNatives(IEnumerable<Li
             // 存在继承关系。
             // Inheritance exists.
 
-            inherits = new List<RawVersionModel?>();
+            inherits = [];
             var current = rawVersion;
             var first = true;
 
@@ -370,8 +370,8 @@ public override (List<NativeFileInfo>, List<FileInfo>) GetNatives(IEnumerable<Li
             Assets = rawVersion.AssetsVersion,
             AssetInfo = rawVersion.AssetIndex,
             MainClass = rawVersion.MainClass,
-            Libraries = new List<FileInfo>(),
-            Natives = new List<NativeFileInfo>(),
+            Libraries = [],
+            Natives = [],
             Logging = rawVersion.Logging,
             Id = rawVersion.Id,
             DirName = id,
@@ -484,11 +484,11 @@ public override (List<NativeFileInfo>, List<FileInfo>) GetNatives(IEnumerable<Li
                 result.MainClass = inherits[i]!.MainClass ?? result.MainClass;
             }
 
-            var finalJvmArgs = result.JvmArguments?.ToList() ?? new List<string>();
+            var finalJvmArgs = result.JvmArguments?.ToList() ?? [];
             finalJvmArgs.AddRange(jvmArgList);
             result.JvmArguments = finalJvmArgs;
 
-            var finalGameArgs = result.GameArguments?.ToList() ?? new List<string>();
+            var finalGameArgs = result.GameArguments?.ToList() ?? [];
             finalGameArgs.AddRange(gameArgList);
             finalGameArgs = finalGameArgs.Select(arg => arg.Split(' ')).SelectMany(a => a).Distinct().ToList();
             result.GameArguments = finalGameArgs;

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/LogAnalysis/DefaultLogAnalyzer.cs b/ProjBobcat/ProjBobcat/DefaultComponent/LogAnalysis/DefaultLogAnalyzer.cs
@@ -75,7 +75,7 @@ public IEnumerable<IAnalysisReport> GenerateReport()
         foreach (var (logFileType, lines) in GetAllLogs())
         {
             if (!logs.ContainsKey(logFileType))
-                logs[logFileType] = new List<(string, string)>();
+                logs[logFileType] = [];
 
             logs[logFileType].Add(lines);
         }

diff --git a/ProjBobcat/ProjBobcat/DefaultComponent/Service/ServerPingService.cs b/ProjBobcat/ProjBobcat/DefaultComponent/Service/ServerPingService.cs
@@ -65,7 +65,7 @@ public ServerPingResult Run()
             return null;
         }
 
-        _buffer = new List<byte>();
+        _buffer = [];
         _stream = client.GetStream();
 
         InvokeStatusChangedEvent("发送请求...", 30);