Skip to content

Commit a0af4fe

Browse files
bagusnlbagusnl
committed
NuGet changes
- [INTENTIONAL] Downgrade SDK BuildTools Its to match the SDK we actually use to build the app - Explicitly use .NET ILLink Task v9.0.1 Idk why the SDK is so ADAMANT on using v9.0.0
1 parent 1343fce commit a0af4fe

File tree

11 files changed

+56
-26
lines changed

11 files changed

+56
-26
lines changed

‎CollapseLauncher/CollapseLauncher.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@
157157
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.1" />
158158
<!-- Velopacks' outdated dependencies, remove this once they switched to .NET 9 -->
159159
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.1" />
160+
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.1" />
160161
<PackageReference Include="Velopack" Version="0.0.1053" Condition="$(DefineConstants.Contains('USEVELOPACK'))" />
161162

162163
<PackageReference Include="CommunityToolkit.Common" Version="8.4.0" />
@@ -181,7 +182,7 @@
181182
<PackageReference Include="Microsoft.NETCore.Targets" Version="6.0.0-preview.4.21253.7" />
182183
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2957.106" />
183184
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
184-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
185+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
185186
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.250108002" />
186187
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.0-preview2" />
187188
<PackageReference Include="PhotoSauce.MagicScaler" Version="0.15.0" />

‎CollapseLauncher/packages.lock.json‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@
161161
},
162162
"Microsoft.Windows.SDK.BuildTools": {
163163
"type": "Direct",
164-
"requested": "[10.0.26100.1742, )",
165-
"resolved": "10.0.26100.1742",
166-
"contentHash": "ypcHjr4KEi6xQhgClnbXoANHcyyX/QsC4Rky4igs6M4GiDa+weegPo8JuV/VMxqrZCV4zlqDsp2krgkN7ReAAg=="
164+
"requested": "[10.0.22621.3233, )",
165+
"resolved": "10.0.22621.3233",
166+
"contentHash": "v67zwCb9JOpfPxdSroZukIKHruU6FUB+KwcmSPcVvUFyYtcyvcUign5y8jPQNi54CVzWvaTg646e62LbanUkxg=="
167167
},
168168
"Microsoft.WindowsAppSDK": {
169169
"type": "Direct",
@@ -409,36 +409,41 @@
409409
"colorthief": {
410410
"type": "Project",
411411
"dependencies": {
412+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )",
412413
"System.Drawing.Common": "[9.0.1, )"
413414
}
414415
},
415416
"discordrpc": {
416417
"type": "Project",
417418
"dependencies": {
418419
"Microsoft.Extensions.Logging": "[9.0.1, )",
420+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )",
419421
"System.Text.Json": "[9.0.1, )"
420422
}
421423
},
422424
"h.generatedicons.system.drawing": {
423425
"type": "Project",
424426
"dependencies": {
427+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )",
425428
"System.Drawing.Common": "[9.0.1, )"
426429
}
427430
},
428431
"h.notifyicon": {
429432
"type": "Project",
430433
"dependencies": {
431434
"H.GeneratedIcons.System.Drawing": "[1.0.0, )",
432-
"Microsoft.Extensions.Logging.Abstractions": "[9.0.1, )"
435+
"Microsoft.Extensions.Logging.Abstractions": "[9.0.1, )",
436+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )"
433437
}
434438
},
435439
"h.notifyicon.winui": {
436440
"type": "Project",
437441
"dependencies": {
438442
"H.NotifyIcon": "[0.0.0, )",
439443
"Microsoft.Extensions.Logging.Abstractions": "[9.0.1, )",
444+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )",
440445
"Microsoft.Web.WebView2": "[1.0.2957.106, )",
441-
"Microsoft.Windows.SDK.BuildTools": "[10.0.26100.1742, )",
446+
"Microsoft.Windows.SDK.BuildTools": "[10.0.22621.3233, )",
442447
"Microsoft.WindowsAppSDK": "[1.6.250108002, )"
443448
}
444449
},
@@ -447,6 +452,7 @@
447452
"dependencies": {
448453
"Hi3Helper.EncTool": "[1.0.0, )",
449454
"Hi3Helper.Win32": "[1.0.0, )",
455+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )",
450456
"Microsoft.Windows.CsWinRT": "[2.2.0, )",
451457
"Sentry": "[5.0.1, )"
452458
}
@@ -456,24 +462,30 @@
456462
"dependencies": {
457463
"Google.Protobuf": "[3.29.3, )",
458464
"Hi3Helper.Http": "[2.0.0, )",
459-
"Hi3Helper.Win32": "[1.0.0, )"
465+
"Hi3Helper.Win32": "[1.0.0, )",
466+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )"
460467
}
461468
},
462469
"hi3helper.http": {
463-
"type": "Project"
470+
"type": "Project",
471+
"dependencies": {
472+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )"
473+
}
464474
},
465475
"hi3helper.sophon": {
466476
"type": "Project",
467477
"dependencies": {
468478
"Google.Protobuf": "[*, )",
469479
"Hi3Helper.ZstdNet": "[*, )",
480+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )",
470481
"System.IO.Hashing": "[*, )"
471482
}
472483
},
473484
"hi3helper.win32": {
474485
"type": "Project",
475486
"dependencies": {
476-
"Microsoft.Extensions.Logging.Abstractions": "[9.0.1, )"
487+
"Microsoft.Extensions.Logging.Abstractions": "[9.0.1, )",
488+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )"
477489
}
478490
},
479491
"ImageCropper": {
@@ -483,9 +495,10 @@
483495
"CommunityToolkit.WinUI.Extensions": "[8.2.241112-preview1, )",
484496
"CommunityToolkit.WinUI.Media": "[8.2.241112-preview1, )",
485497
"Microsoft.Graphics.Win2D": "[1.3.1, )",
498+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )",
486499
"Microsoft.Web.WebView2": "[1.0.2957.106, )",
487500
"Microsoft.Windows.CsWinRT": "[2.2.0, )",
488-
"Microsoft.Windows.SDK.BuildTools": "[10.0.26100.1742, )",
501+
"Microsoft.Windows.SDK.BuildTools": "[10.0.22621.3233, )",
489502
"Microsoft.WindowsAppSDK": "[1.6.250108002, )"
490503
}
491504
},
@@ -494,14 +507,16 @@
494507
"dependencies": {
495508
"CommunityToolkit.Common": "[8.4.0, )",
496509
"CommunityToolkit.WinUI.Extensions": "[8.2.241112-preview1, )",
510+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )",
497511
"Microsoft.Web.WebView2": "[1.0.2957.106, )",
498-
"Microsoft.Windows.SDK.BuildTools": "[10.0.26100.1742, )",
512+
"Microsoft.Windows.SDK.BuildTools": "[10.0.22621.3233, )",
499513
"Microsoft.WindowsAppSDK": "[1.6.250108002, )"
500514
}
501515
},
502516
"innosetuphelper": {
503517
"type": "Project",
504518
"dependencies": {
519+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )",
505520
"System.IO.Hashing": "[9.0.1, )"
506521
}
507522
},
@@ -510,14 +525,18 @@
510525
"dependencies": {
511526
"CommunityToolkit.Common": "[8.4.0, )",
512527
"CommunityToolkit.WinUI.Triggers": "[8.2.241112-preview1, )",
528+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )",
513529
"Microsoft.Web.WebView2": "[1.0.2957.106, )",
514530
"Microsoft.Windows.CsWinRT": "[2.2.0, )",
515-
"Microsoft.Windows.SDK.BuildTools": "[10.0.26100.1742, )",
531+
"Microsoft.Windows.SDK.BuildTools": "[10.0.22621.3233, )",
516532
"Microsoft.WindowsAppSDK": "[1.6.250108002, )"
517533
}
518534
},
519535
"sevenzipextractor": {
520-
"type": "Project"
536+
"type": "Project",
537+
"dependencies": {
538+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )"
539+
}
521540
}
522541
},
523542
"net9.0-windows10.0.22621/win-x64": {

‎H.NotifyIcon‎

‎Hi3Helper.CommunityToolkit/ImageCropper/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
},
6060
"Microsoft.Windows.SDK.BuildTools": {
6161
"type": "Direct",
62-
"requested": "[10.0.26100.1742, )",
63-
"resolved": "10.0.26100.1742",
64-
"contentHash": "ypcHjr4KEi6xQhgClnbXoANHcyyX/QsC4Rky4igs6M4GiDa+weegPo8JuV/VMxqrZCV4zlqDsp2krgkN7ReAAg=="
62+
"requested": "[10.0.22621.3233, )",
63+
"resolved": "10.0.22621.3233",
64+
"contentHash": "v67zwCb9JOpfPxdSroZukIKHruU6FUB+KwcmSPcVvUFyYtcyvcUign5y8jPQNi54CVzWvaTg646e62LbanUkxg=="
6565
},
6666
"Microsoft.WindowsAppSDK": {
6767
"type": "Direct",

‎Hi3Helper.CommunityToolkit/SettingsControls/packages.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
},
3939
"Microsoft.Windows.SDK.BuildTools": {
4040
"type": "Direct",
41-
"requested": "[10.0.26100.1742, )",
42-
"resolved": "10.0.26100.1742",
43-
"contentHash": "ypcHjr4KEi6xQhgClnbXoANHcyyX/QsC4Rky4igs6M4GiDa+weegPo8JuV/VMxqrZCV4zlqDsp2krgkN7ReAAg=="
41+
"requested": "[10.0.22621.3233, )",
42+
"resolved": "10.0.22621.3233",
43+
"contentHash": "v67zwCb9JOpfPxdSroZukIKHruU6FUB+KwcmSPcVvUFyYtcyvcUign5y8jPQNi54CVzWvaTg646e62LbanUkxg=="
4444
},
4545
"Microsoft.WindowsAppSDK": {
4646
"type": "Direct",

‎Hi3Helper.Core/Hi3Helper.Core.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
</ItemGroup>
4343

4444
<ItemGroup>
45+
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.1" />
4546
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.2.0" />
4647
<PackageReference Include="Sentry" Version="5.0.1" />
4748
</ItemGroup>

‎Hi3Helper.Core/packages.lock.json‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,21 @@
4343
"dependencies": {
4444
"Google.Protobuf": "[3.29.3, )",
4545
"Hi3Helper.Http": "[2.0.0, )",
46-
"Hi3Helper.Win32": "[1.0.0, )"
46+
"Hi3Helper.Win32": "[1.0.0, )",
47+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )"
4748
}
4849
},
4950
"hi3helper.http": {
50-
"type": "Project"
51+
"type": "Project",
52+
"dependencies": {
53+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )"
54+
}
5155
},
5256
"hi3helper.win32": {
5357
"type": "Project",
5458
"dependencies": {
55-
"Microsoft.Extensions.Logging.Abstractions": "[9.0.1, )"
59+
"Microsoft.Extensions.Logging.Abstractions": "[9.0.1, )",
60+
"Microsoft.NET.ILLink.Tasks": "[9.0.1, )"
5661
}
5762
}
5863
},

‎Hi3Helper.EncTool.Test/Hi3Helper.EncTool.Test.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@
99
<IsAotCompatible>true</IsAotCompatible>
1010
</PropertyGroup>
1111

12+
<ItemGroup>
13+
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.1" />
14+
</ItemGroup>
15+
1216
</Project>

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"resolved": "9.0.1",
99
"contentHash": "BKFAkdhUUJivAoKuSWcT23WH9E+AWQMJootzt9X+lnesOD2a2yNIe1ZQFtxB8H3ayskLBD5gYyIbj5GIfw7rZg=="
1010
}
11-
},
12-
"net9.0/win-x64": {}
11+
}
1312
}
1413
}

‎ImageEx‎

0 commit comments

Comments
 (0)