Skip to content

Commit 25364af

Browse files
ExaniteExanite
committed
Update to .NET 10 and DISABLE TreatWarningsAsErrors in Silk.Net.Core.csproj
Also, updated most packages except System.CommandLine since it had breaking changes I didn't want to fix
1 parent d6b981b commit 25364af

File tree

23 files changed

+62
-63
lines changed

23 files changed

+62
-63
lines changed

‎Directory.Packages.props‎

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,46 @@
11
<Project>
22
<ItemGroup>
33
<!-- Common -->
4-
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1" />
5-
<PackageVersion Include="DotNet.ReproducibleBuilds.Isolated" Version="1.1.1" />
6-
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
7-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
4+
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.39" />
5+
<PackageVersion Include="DotNet.ReproducibleBuilds.Isolated" Version="1.2.39" />
6+
<PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
7+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
88
<PackageVersion Include="NAudio.Core" Version="2.2.1" />
9-
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
10-
<PackageVersion Include="NUnit.Analyzers" Version="4.4.0" />
11-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
12-
<PackageVersion Include="NUnit" Version="4.2.2" />
13-
<PackageVersion Include="xunit" Version="2.9.2" />
14-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
9+
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
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" Version="2.9.3" />
14+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
1515
<!-- eng/benchmarks -->
16-
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
16+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
1717
<!-- Silk.NET.Core -->
18-
<PackageVersion Include="Fody" Version="6.8.2" PrivateAssets="all" />
19-
<PackageVersion Include="InlineIL.Fody" Version="1.9.0" PrivateAssets="all" />
18+
<PackageVersion Include="Fody" Version="6.9.3" PrivateAssets="all" />
19+
<PackageVersion Include="InlineIL.Fody" Version="1.10.1" PrivateAssets="all" />
20+
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.0.0-1.25277.114" />
2021
<!-- Analyzers -->
21-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
22+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.25218.8" />
2223
<!-- SilkTouch -->
23-
<PackageVersion Include="ClangSharp.PInvokeGenerator" Version="18.1.0.2" />
24+
<PackageVersion Include="ClangSharp.PInvokeGenerator" Version="20.1.2.4" />
2425
<PackageVersion Include="CSharpier.Core" Version="0.30.2" />
2526
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
26-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
27-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
28-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
29-
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.11.0" />
30-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
31-
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="8.0.0" />
32-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
33-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
34-
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
35-
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
36-
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2149" />
27+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.10.12" />
28+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
29+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
30+
<PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0" />
31+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
32+
<PackageVersion Include="Microsoft.Extensions.Configuration.CommandLine" Version="10.0.0" />
33+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0" />
34+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
35+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.0" />
36+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
37+
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />
3738
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
38-
<PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
39-
<!-- This is not used but it is used transitively and the version pulled in has a vulnerability -->
40-
<PackageVersion Include="System.Formats.Asn1" Version="9.0.0" />
39+
<PackageVersion Include="System.IO.Hashing" Version="10.0.0" />
4140
<!-- SilkTouch Unit Tests -->
4241
<PackageVersion Include="Silk.NET.BuildTools" Version="2.22.0" />
43-
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
42+
<PackageVersion Include="System.Linq.Async" Version="6.0.3" />
4443
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
45-
<PackageVersion Include="Verify.NUnit" Version="28.3.2" />
44+
<PackageVersion Include="Verify.NUnit" Version="31.6.0" />
4645
</ItemGroup>
47-
</Project>
46+
</Project>

‎eng/benchmarks/Silk.NET.Maths.Benchmarks/Silk.NET.Maths.Benchmarks.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<DefineConstants>$(DefineConstants);MATHF</DefineConstants>
77
</PropertyGroup>
88

‎eng/build/Silk.NET.NUKE.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<RootNamespace></RootNamespace>
77
<NoWarn>CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006</NoWarn>
88
<NukeRootDirectory>..\..</NukeRootDirectory>
@@ -13,9 +13,10 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
16-
<PackageReference Include="Markdig" Version="0.39.0" />
17-
<PackageReference Include="Nuke.Common" Version="9.0.3" />
18-
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
16+
<PackageReference Include="Markdig" Version="0.43.0" />
17+
<PackageReference Include="Microsoft.Build" Version="17.14.28" />
18+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.14.28" />
19+
<PackageReference Include="Nuke.Common" Version="9.0.4" />
1920
<PackageReference Include="YamlDotNet" Version="16.3.0" />
2021
</ItemGroup>
2122
</Project>

‎examples/CSharp/OpenAL/Tutorial001.HelloSound/Tutorial001.HelloSound.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.100",
44
"rollForward": "major"
55
}
6-
}
6+
}

‎sources/Core/Core/PublicAPI/net10.0/PublicAPI.Shipped.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#nullable enable

‎sources/Core/Core/PublicAPI/net10.0/PublicAPI.Unshipped.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#nullable enable

‎sources/Core/Core/Silk.NET.Core.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<!-- NOTE: Multitargeting here will be a PITA due to the references to TFM below -->
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
@@ -22,6 +22,7 @@
2222
<!-- Public API Tracking -->
2323
<PropertyGroup>
2424
<SilkTrackPublicAPI>true</SilkTrackPublicAPI>
25+
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
2526
</PropertyGroup>
2627
<ItemGroup Condition="'$(TargetFramework)' != ''">
2728
<AdditionalFiles Include="PublicAPI/$(TargetFramework)/PublicAPI.Shipped.txt" />

‎sources/Core/Silk.NET/Silk.NET.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<SilkDescription>A package that will pull in all non-extension Silk.NET packages for every API.</SilkDescription>

‎sources/Maths/Maths/Silk.NET.Maths.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>

0 commit comments

Comments
 (0)