Skip to content

Commit b57621d

Browse files
ExaniteExanite
committed
Squashed commit of the following:
commit cafaccf Merge: b9cabce b994a1f Author: William Chen <exanite78012@gmail.com> Date: Fri Jun 12 09:38:49 2026 -0400 Merge branch 'develop/3.0' into feature/update-dependencies commit b9cabce Merge: c401b91 89841e7 Author: William Chen <exanite78012@gmail.com> Date: Fri Jun 12 03:06:29 2026 -0400 Merge branch 'develop/3.0' into feature/update-dependencies commit c401b91 Author: William Chen <exanite78012@gmail.com> Date: Thu Jun 11 10:57:28 2026 -0400 Update solution path in generator.json commit 5229ecc Author: William Chen <exanite78012@gmail.com> Date: Thu Jun 11 08:57:13 2026 -0400 Revert update to System.CommandLine The code copied verbatim from ClangSharp uses an old version of System.CommandLine (v2.0.0-beta3.22114.1). Since this code is copied verbatim, I don't want to update it to compile with the new version of System.CommandLine (v2.0.9). This commit reverts the package to use v2.0.0-beta4.22272.1, which is the one we used before this PR. commit 61fe9d5 Author: William Chen <exanite78012@gmail.com> Date: Thu Jun 11 08:49:52 2026 -0400 Fix error caused by updating Microsoft.Build.Locator Error in question: Microsoft.Build.Locator.targets(19,5): Error MSBL001 : A PackageReference to the package 'Microsoft.NET.StringTools' at version '18.7.1' is present in this project without ExcludeAssets="runtime" and PrivateAssets="all" set. This can cause errors at run-time due to MSBuild assembly-loading. I'm not sure what's the proper way to solve this, but I also had this error in my personal repos and this was how I solved it there. commit f3077d6 Author: William Chen <exanite78012@gmail.com> Date: Thu Jun 11 08:44:26 2026 -0400 Update rest of dependencies in Directory.Packages.props commit 44e2078 Author: William Chen <exanite78012@gmail.com> Date: Thu Jun 11 08:29:30 2026 -0400 Update Nuke and build system dependencies commit 7df9f3a Author: William Chen <exanite78012@gmail.com> Date: Thu Jun 11 08:24:24 2026 -0400 Remove .sln version of the solution file Note: The Silk.NET.sln.DotSettings files must not be renamed. Rider still looks for the .sln version. commit 0ef164d Author: William Chen <exanite78012@gmail.com> Date: Thu Jun 11 08:16:08 2026 -0400 Generate SLNX using Rider's save as SLNX feature commit 3322066 Author: William Chen <exanite78012@gmail.com> Date: Thu Jun 11 07:57:20 2026 -0400 Update CSharpier and Roslyn packages commit 06a8484 Author: William Chen <exanite78012@gmail.com> Date: Thu Jun 11 07:26:59 2026 -0400 Start of feature/update-dependencies branch
1 parent b994a1f commit b57621d

9 files changed

Lines changed: 141 additions & 312 deletions

File tree

‎.nuke/parameters.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "build.schema.json",
3-
"Solution": "Silk.NET.sln"
3+
"Solution": "Silk.NET.slnx"
44
}

‎Directory.Packages.props‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,51 @@
11
<Project>
22
<ItemGroup>
33
<!-- Common -->
4-
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.39" />
5-
<PackageVersion Include="DotNet.ReproducibleBuilds.Isolated" Version="1.2.39" />
4+
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="2.0.2" />
5+
<PackageVersion Include="DotNet.ReproducibleBuilds.Isolated" Version="2.0.2" />
66
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
7-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
8-
<PackageVersion Include="NAudio.Core" Version="2.2.1" />
9-
<PackageVersion Include="NUnit3TestAdapter" Version="6.0.1" />
10-
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
11-
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
12-
<PackageVersion Include="NUnit" Version="4.4.0" />
13-
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.1" />
7+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
8+
<PackageVersion Include="NAudio.Core" Version="2.3.0" />
9+
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
10+
<PackageVersion Include="NUnit.Analyzers" Version="4.14.0" />
11+
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
12+
<PackageVersion Include="NUnit" Version="4.6.1" />
13+
<PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
1414
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
1515
<!-- eng/benchmarks -->
16-
<PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
16+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
1717
<!-- Silk.NET.Core -->
1818
<PackageVersion Include="Fody" Version="6.9.3" PrivateAssets="all" />
19-
<PackageVersion Include="InlineIL.Fody" Version="1.10.1" PrivateAssets="all" />
19+
<PackageVersion Include="InlineIL.Fody" Version="1.10.2" PrivateAssets="all" />
2020
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.0.0-1.25277.114" />
2121
<!-- Analyzers -->
22-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.25218.8" />
22+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
2323
<!-- SilkTouch -->
2424
<PackageVersion Include="ClangSharp.PInvokeGenerator" Version="21.1.8.3" />
25-
<PackageVersion Include="CSharpier.Core" Version="0.30.2" />
25+
<PackageVersion Include="CSharpier.Core" Version="1.3.0" />
2626
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
27-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.11.1" />
28-
<PackageVersion Include="Microsoft.Build.Framework" Version="18.0.2" />
29-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
30-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
31-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0" />
32-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
33-
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.0" />
34-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
35-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
36-
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0" />
37-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
27+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.11.2" />
28+
<PackageVersion Include="Microsoft.Build.Framework" Version="18.7.1" />
29+
<PackageVersion Include="Microsoft.NET.StringTools" Version="18.7.1" />
30+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
31+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0" />
32+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.3.0" />
33+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
34+
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.9" />
35+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.9" />
36+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
37+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.9" />
38+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.9" />
3839
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />
3940
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
40-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.0" />
41-
<PackageVersion Include="System.IO.Hashing" Version="10.0.0" />
41+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="10.0.9" />
42+
<PackageVersion Include="System.IO.Hashing" Version="10.0.9" />
4243
<!-- SilkTouch Unit Tests -->
4344
<PackageVersion Include="Silk.NET.BuildTools" Version="2.23.0-pr2526.5226" />
44-
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
45-
<PackageVersion Include="Verify.NUnit" Version="31.6.0" />
46-
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
47-
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
48-
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
45+
<PackageVersion Include="Verify.DiffPlex" Version="3.2.0" />
46+
<PackageVersion Include="Verify.NUnit" Version="31.19.1" />
47+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.2.3" />
48+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.8.0" />
49+
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.9" />
4950
</ItemGroup>
5051
</Project>

0 commit comments

Comments
 (0)