Skip to content

Commit 67f3052

Browse files
neon-nyanneon-nyan
authored
Update to .NET 10.0.1 (#843)
# Main Goal Update nugets to use .NET 10.0.1 packages. Also remove some packages that is included in the runtime (except for reflection-metadata on NotifyIcon as it will cause crash) ## PR Status : - Overall Status : Done - Commits : Done - Synced to base (Collapse:main) : Yes - Build status : OK - Crashing : No - Bug found caused by PR : 0 ### Templates <details> <summary>Changelog Prefixes</summary> ``` **[New]** **[Imp]** **[Fix]** **[Loc]** **[Doc]** ``` </details>
2 parents ad5435e + e8942c2 commit 67f3052

File tree

12 files changed

+78
-95
lines changed

12 files changed

+78
-95
lines changed

‎.idea/.idea.CollapseLauncher/.idea/vcs.xml‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CollapseLauncher/CollapseLauncher.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,9 +256,9 @@
256256
<ItemGroup>
257257
<PackageReference Include="Libsql.Client" Version="0.5.1" />
258258
<!-- Velopacks' outdated dependencies, remove this once they switched to .NET 9 -->
259-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
259+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
260260
<!-- Velopacks' outdated dependencies, remove this once they switched to .NET 9 -->
261-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.0" />
261+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
262262
<PackageReference Include="ThisAssembly.Constants" Version="2.1.2">
263263
<PrivateAssets>all</PrivateAssets>
264264
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -295,10 +295,7 @@
295295
<PackageReference Include="PhotoSauce.NativeCodecs.Libwebp" Version="*-*" />
296296
<PackageReference Include="Roman-Numerals" Version="2.0.1" />
297297
<PackageReference Include="System.CommandLine" Version="2.0.0" />
298-
<PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
299-
<PackageReference Include="System.Text.Json" Version="10.0.0" />
300-
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.0" />
301-
<PackageReference Include="System.Text.Encoding.CodePages" Version="10.0.0" />
298+
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.1" />
302299
</ItemGroup>
303300

304301
<ItemGroup>

‎CollapseLauncher/packages.lock.json‎

Lines changed: 45 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,17 @@
113113
},
114114
"Microsoft.Extensions.DependencyInjection.Abstractions": {
115115
"type": "Direct",
116-
"requested": "[10.0.0, )",
117-
"resolved": "10.0.0",
118-
"contentHash": "L3AdmZ1WOK4XXT5YFPEwyt0ep6l8lGIPs7F5OOBZc77Zqeo01Of7XXICy47628sdVl0v/owxYJTe86DTgFwKCA=="
116+
"requested": "[10.0.1, )",
117+
"resolved": "10.0.1",
118+
"contentHash": "oIy8fQxxbUsSrrOvgBqlVgOeCtDmrcynnTG+FQufcUWBrwyPfwlUkCDB2vaiBeYPyT+20u9/HeuHeBf+H4F/8g=="
119119
},
120120
"Microsoft.Extensions.Logging.Abstractions": {
121121
"type": "Direct",
122-
"requested": "[10.0.0, )",
123-
"resolved": "10.0.0",
124-
"contentHash": "FU/IfjDfwaMuKr414SSQNTIti/69bHEMb+QKrskRb26oVqpx3lNFXMjs/RC9ZUuhBhcwDM2BwOgoMw+PZ+beqQ==",
122+
"requested": "[10.0.1, )",
123+
"resolved": "10.0.1",
124+
"contentHash": "YkmyiPIWAXVb+lPIrM0LE5bbtLOJkCiRTFiHpkVOvhI7uTvCfoOHLEN0LcsY56GpSD7NqX3gJNpsaDe87/B3zg==",
125125
"dependencies": {
126-
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0"
126+
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.1"
127127
}
128128
},
129129
"Microsoft.Graphics.Win2D": {
@@ -218,29 +218,11 @@
218218
"resolved": "2.0.0",
219219
"contentHash": "Bjklzc5NoxqAGFi7BcGlY2TWAdB06Bq3a5sfRr3ubMRU80Mf98eyq3Y2UgR6xRV0TLznZmfe5T7mUjOunRNcdA=="
220220
},
221-
"System.Security.AccessControl": {
222-
"type": "Direct",
223-
"requested": "[6.0.1, )",
224-
"resolved": "6.0.1",
225-
"contentHash": "IQ4NXP/B3Ayzvw0rDQzVTYsCKyy0Jp9KI6aYcK7UnGVlR9+Awz++TIPCQtPYfLJfOpm8ajowMR09V7quD3sEHw=="
226-
},
227221
"System.Security.Cryptography.ProtectedData": {
228222
"type": "Direct",
229-
"requested": "[10.0.0, )",
230-
"resolved": "10.0.0",
231-
"contentHash": "qy6C3gQRTrfhFfuiIYU1jNwWfFdJpBVo1BARW7jgMm1zTEm3LRzLLyOLJGaAuKE+nZCGkEP71y4rj9NWjqLGdQ=="
232-
},
233-
"System.Text.Encoding.CodePages": {
234-
"type": "Direct",
235-
"requested": "[10.0.0, )",
236-
"resolved": "10.0.0",
237-
"contentHash": "QLP54mIATaBpjGlsZIxga38VPk1G9js0Kw651B+bvrXi2kSgGZYrxJSpM3whhTZCBK4HEBHX3fzfDQMw7CXHGQ=="
238-
},
239-
"System.Text.Json": {
240-
"type": "Direct",
241-
"requested": "[10.0.0, )",
242-
"resolved": "10.0.0",
243-
"contentHash": "1Dpjwq9peG/Wt5BNbrzIhTpclfOSqBWZsUO28vVr59yQlkvL5jLBWfpfzRmJ1OY+6DciaY0DUcltyzs4fuZHjw=="
223+
"requested": "[10.0.1, )",
224+
"resolved": "10.0.1",
225+
"contentHash": "9SqHNq+lAjZeyPcm69FTQEjr+wsRYvkS3aW8yxoEndVYwDRkCrsP/44QPqpWHwzevoX26rkOoQ6kr7GZWngw2A=="
244226
},
245227
"ThisAssembly.Constants": {
246228
"type": "Direct",
@@ -292,8 +274,8 @@
292274
},
293275
"Google.Protobuf": {
294276
"type": "Transitive",
295-
"resolved": "3.33.1",
296-
"contentHash": "RztiFmX9aOWDwfhxFzx/nS4fjs4DX7ZC7/XBEBl56k15lPGBftvbSwZkeo1mMCJHrNp1kK5iQYrFXB4MqCmBCA=="
277+
"resolved": "3.33.2",
278+
"contentHash": "vZXVbrZgBqUkP5iWQi0CS6pucIS2MQdEYPS1duWCo8fGrrt4th6HTiHfLFX2RmAWAQl1oUnzGgyDBsfq7fHQJA=="
297279
},
298280
"Hi3Helper.ZstdNet": {
299281
"type": "Transitive",
@@ -302,40 +284,40 @@
302284
},
303285
"Microsoft.Extensions.DependencyInjection": {
304286
"type": "Transitive",
305-
"resolved": "10.0.0",
306-
"contentHash": "f0RBabswJq+gRu5a+hWIobrLWiUYPKMhCD9WO3sYBAdSy3FFH14LMvLVFZc2kPSCimBLxSuitUhsd6tb0TAY6A==",
287+
"resolved": "10.0.1",
288+
"contentHash": "zerXV0GAR9LCSXoSIApbWn+Dq1/T+6vbXMHGduq1LoVQRHT0BXsGQEau0jeLUBUcsoF/NaUT8ADPu8b+eNcIyg==",
307289
"dependencies": {
308-
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0"
290+
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.1"
309291
}
310292
},
311293
"Microsoft.Extensions.Logging": {
312294
"type": "Transitive",
313-
"resolved": "10.0.0",
314-
"contentHash": "BStFkd5CcnEtarlcgYDBcFzGYCuuNMzPs02wN3WBsOFoYIEmYoUdAiU+au6opzoqfTYJsMTW00AeqDdnXH2CvA==",
295+
"resolved": "10.0.1",
296+
"contentHash": "9ItMpMLFZFJFqCuHLLbR3LiA4ahA8dMtYuXpXl2YamSDWZhYS9BruPprkftY0tYi2bQ0slNrixdFm+4kpz1g5w==",
315297
"dependencies": {
316-
"Microsoft.Extensions.DependencyInjection": "10.0.0",
317-
"Microsoft.Extensions.Logging.Abstractions": "10.0.0",
318-
"Microsoft.Extensions.Options": "10.0.0"
298+
"Microsoft.Extensions.DependencyInjection": "10.0.1",
299+
"Microsoft.Extensions.Logging.Abstractions": "10.0.1",
300+
"Microsoft.Extensions.Options": "10.0.1"
319301
}
320302
},
321303
"Microsoft.Extensions.Options": {
322304
"type": "Transitive",
323-
"resolved": "10.0.0",
324-
"contentHash": "8oCAgXOow5XDrY9HaXX1QmH3ORsyZO/ANVHBlhLyCeWTH5Sg4UuqZeOTWJi6484M+LqSx0RqQXDJtdYy2BNiLQ==",
305+
"resolved": "10.0.1",
306+
"contentHash": "G6VVwywpJI4XIobetGHwg7wDOYC2L2XBYdtskxLaKF/Ynb5QBwLl7Q//wxAR2aVCLkMpoQrjSP9VoORkyddsNQ==",
325307
"dependencies": {
326-
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0",
327-
"Microsoft.Extensions.Primitives": "10.0.0"
308+
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.1",
309+
"Microsoft.Extensions.Primitives": "10.0.1"
328310
}
329311
},
330312
"Microsoft.Extensions.Primitives": {
331313
"type": "Transitive",
332-
"resolved": "10.0.0",
333-
"contentHash": "inRnbpCS0nwO/RuoZIAqxQUuyjaknOOnCEZB55KSMMjRhl0RQDttSmLSGsUJN3RQ3ocf5NDLFd2mOQViHqMK5w=="
314+
"resolved": "10.0.1",
315+
"contentHash": "DO8XrJkp5x4PddDuc/CH37yDBCs9BYN6ijlKyR3vMb55BP1Vwh90vOX8bNfnKxr5B2qEI3D8bvbY1fFbDveDHQ=="
334316
},
335317
"Microsoft.Win32.SystemEvents": {
336318
"type": "Transitive",
337-
"resolved": "10.0.0",
338-
"contentHash": "bYdnhuD0XxcVTrxc8RyBjXo+AXYWJPnda3clhGz2Kakleyun1PyrzYV8RezT7ZYmR9OBSOgvpFQcvHo/K8Y90w=="
319+
"resolved": "10.0.1",
320+
"contentHash": "trU4LN2C04nj5qnl8HqoX0NJGPCFg9h2f5o+jjp3Xm8c8fQtu6Ga1/fNFMf3AapoHyLP1WlP21XnL2ij/TLKlg=="
339321
},
340322
"Microsoft.Windows.SDK.BuildTools.MSIX": {
341323
"type": "Transitive",
@@ -443,16 +425,16 @@
443425
},
444426
"System.Drawing.Common": {
445427
"type": "Transitive",
446-
"resolved": "10.0.0",
447-
"contentHash": "kohT9ZZlkB5R5ifihCBnPJLdIUQGiTj1ZI6z4LKatr+F4MmIJJu7qQpBkqt9280ivtnSvlTx9qZEY+CpJ0zMkA==",
428+
"resolved": "10.0.1",
429+
"contentHash": "cmkIduwyVPfuO8kNehu3xNcjo26nMgUoJyfso9S/zTO85YovvPPG0/AFLjanx1iVgQ80OpJVnLb1jU3aIKNLdg==",
448430
"dependencies": {
449-
"Microsoft.Win32.SystemEvents": "10.0.0"
431+
"Microsoft.Win32.SystemEvents": "10.0.1"
450432
}
451433
},
452434
"System.IO.Hashing": {
453435
"type": "Transitive",
454-
"resolved": "10.0.0",
455-
"contentHash": "MqSp5IfX9RdWVwTED0WSRL1kZDNB7GlFj64O/NAJs4uO1beBHWEAFLlC7j8Fw/PkI+SUzooLVNvAe4aEkSwsRg=="
436+
"resolved": "10.0.1",
437+
"contentHash": "Dy6ULPb2S0GmNndjKrEIpfibNsc8+FTOoZnqygtFDuyun8vWboQbfMpQtKUXpgTxokR5E4zFHETpNnGfeWY6NA=="
456438
},
457439
"System.Numerics.Tensors": {
458440
"type": "Transitive",
@@ -467,26 +449,26 @@
467449
"colorthief": {
468450
"type": "Project",
469451
"dependencies": {
470-
"System.Drawing.Common": "[10.0.0, )"
452+
"System.Drawing.Common": "[10.0.1, )"
471453
}
472454
},
473455
"discordrpc": {
474456
"type": "Project",
475457
"dependencies": {
476-
"Microsoft.Extensions.Logging": "[10.0.0, )"
458+
"Microsoft.Extensions.Logging": "[10.0.1, )"
477459
}
478460
},
479461
"h.generatedicons.system.drawing": {
480462
"type": "Project",
481463
"dependencies": {
482-
"System.Drawing.Common": "[10.0.0, )"
464+
"System.Drawing.Common": "[10.0.1, )"
483465
}
484466
},
485467
"h.notifyicon": {
486468
"type": "Project",
487469
"dependencies": {
488470
"H.GeneratedIcons.System.Drawing": "[1.0.0, )",
489-
"Microsoft.Extensions.Logging": "[10.0.0, )"
471+
"Microsoft.Extensions.Logging": "[10.0.1, )"
490472
}
491473
},
492474
"h.notifyicon.winui": {
@@ -508,10 +490,10 @@
508490
"hi3helper.enctool": {
509491
"type": "Project",
510492
"dependencies": {
511-
"Google.Protobuf": "[3.33.1, )",
493+
"Google.Protobuf": "[3.33.2, )",
512494
"Hi3Helper.Http": "[2.0.0, )",
513495
"Hi3Helper.Win32": "[1.0.0, )",
514-
"System.IO.Hashing": "[10.0.0, )"
496+
"System.IO.Hashing": "[10.0.1, )"
515497
}
516498
},
517499
"hi3helper.http": {
@@ -520,7 +502,7 @@
520502
"hi3helper.plugin.core": {
521503
"type": "Project",
522504
"dependencies": {
523-
"Microsoft.Extensions.Logging.Abstractions": "[10.0.0, )"
505+
"Microsoft.Extensions.Logging.Abstractions": "[10.0.1, )"
524506
}
525507
},
526508
"hi3helper.simpleziparchivereader": {
@@ -538,14 +520,15 @@
538520
"hi3helper.win32": {
539521
"type": "Project",
540522
"dependencies": {
541-
"Microsoft.Extensions.Logging.Abstractions": "[10.0.0, )"
523+
"Microsoft.Extensions.Logging.Abstractions": "[10.0.1, )"
542524
}
543525
},
544526
"hi3helper.win32.winrt": {
545527
"type": "Project",
546528
"dependencies": {
547529
"Hi3Helper.Win32": "[1.0.0, )",
548-
"Microsoft.Extensions.Logging.Abstractions": "[10.0.0, )"
530+
"Microsoft.Extensions.Logging.Abstractions": "[10.0.1, )",
531+
"Microsoft.Windows.CsWinRT": "[2.3.0-prerelease.250720.1, )"
549532
}
550533
},
551534
"ImageCropper": {
@@ -629,22 +612,10 @@
629612
"PhotoSauce.MagicScaler": "[0.15.0]"
630613
}
631614
},
632-
"System.Security.AccessControl": {
633-
"type": "Direct",
634-
"requested": "[6.0.1, )",
635-
"resolved": "6.0.1",
636-
"contentHash": "IQ4NXP/B3Ayzvw0rDQzVTYsCKyy0Jp9KI6aYcK7UnGVlR9+Awz++TIPCQtPYfLJfOpm8ajowMR09V7quD3sEHw=="
637-
},
638-
"System.Text.Encoding.CodePages": {
639-
"type": "Direct",
640-
"requested": "[10.0.0, )",
641-
"resolved": "10.0.0",
642-
"contentHash": "QLP54mIATaBpjGlsZIxga38VPk1G9js0Kw651B+bvrXi2kSgGZYrxJSpM3whhTZCBK4HEBHX3fzfDQMw7CXHGQ=="
643-
},
644615
"Microsoft.Win32.SystemEvents": {
645616
"type": "Transitive",
646-
"resolved": "10.0.0",
647-
"contentHash": "bYdnhuD0XxcVTrxc8RyBjXo+AXYWJPnda3clhGz2Kakleyun1PyrzYV8RezT7ZYmR9OBSOgvpFQcvHo/K8Y90w=="
617+
"resolved": "10.0.1",
618+
"contentHash": "trU4LN2C04nj5qnl8HqoX0NJGPCFg9h2f5o+jjp3Xm8c8fQtu6Ga1/fNFMf3AapoHyLP1WlP21XnL2ij/TLKlg=="
648619
},
649620
"Microsoft.WindowsAppSDK.Foundation": {
650621
"type": "Transitive",

‎ColorThief‎

‎H.NotifyIcon‎

‎Hi3Helper.Core/packages.lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
},
2828
"Microsoft.Extensions.DependencyInjection.Abstractions": {
2929
"type": "Transitive",
30-
"resolved": "10.0.0",
31-
"contentHash": "L3AdmZ1WOK4XXT5YFPEwyt0ep6l8lGIPs7F5OOBZc77Zqeo01Of7XXICy47628sdVl0v/owxYJTe86DTgFwKCA=="
30+
"resolved": "10.0.1",
31+
"contentHash": "oIy8fQxxbUsSrrOvgBqlVgOeCtDmrcynnTG+FQufcUWBrwyPfwlUkCDB2vaiBeYPyT+20u9/HeuHeBf+H4F/8g=="
3232
},
3333
"Microsoft.Extensions.Logging.Abstractions": {
3434
"type": "Transitive",
35-
"resolved": "10.0.0",
36-
"contentHash": "FU/IfjDfwaMuKr414SSQNTIti/69bHEMb+QKrskRb26oVqpx3lNFXMjs/RC9ZUuhBhcwDM2BwOgoMw+PZ+beqQ==",
35+
"resolved": "10.0.1",
36+
"contentHash": "YkmyiPIWAXVb+lPIrM0LE5bbtLOJkCiRTFiHpkVOvhI7uTvCfoOHLEN0LcsY56GpSD7NqX3gJNpsaDe87/B3zg==",
3737
"dependencies": {
38-
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.0"
38+
"Microsoft.Extensions.DependencyInjection.Abstractions": "10.0.1"
3939
}
4040
},
4141
"System.IO.Hashing": {
@@ -58,7 +58,7 @@
5858
"hi3helper.win32": {
5959
"type": "Project",
6060
"dependencies": {
61-
"Microsoft.Extensions.Logging.Abstractions": "[10.0.0, )"
61+
"Microsoft.Extensions.Logging.Abstractions": "[10.0.1, )"
6262
}
6363
}
6464
}

‎Hi3Helper.EncTool‎

‎Hi3Helper.EncTool.Test/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"net10.0": {
55
"Microsoft.NET.ILLink.Tasks": {
66
"type": "Direct",
7-
"requested": "[10.0.0, )",
8-
"resolved": "10.0.0",
9-
"contentHash": "kICGrGYEzCNI3wPzfEXcwNHgTvlvVn9yJDhSdRK+oZQy4jvYH529u7O0xf5ocQKzOMjfS07+3z9PKRIjrFMJDA=="
7+
"requested": "[10.0.1, )",
8+
"resolved": "10.0.1",
9+
"contentHash": "ISahzLHsHY7vrwqr2p1YWZ+gsxoBRtH7gWRDK8fDUst9pp2He0GiesaqEfeX0V8QMCJM3eNEHGGpnIcPjFo2NQ=="
1010
}
1111
}
1212
}

‎Hi3Helper.Plugin.Core‎

‎Hi3Helper.SharpDiscordRPC‎

0 commit comments

Comments
 (0)