Skip to content

Commit 933cdc8

Browse files
BertkBertk
committed
Introduce .NET 10 support (#1822)
1 parent 5274e64 commit 933cdc8

31 files changed

+296
-132
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@
4848

4949
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
5050
// "remoteUser": "root"
51-
}
51+
}

‎Directory.Build.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33
<PropertyGroup>
44
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
5-
<NetCurrent>net9.0</NetCurrent>
5+
<NetCurrent>net10.0</NetCurrent>
66
<NetMinimum>net8.0</NetMinimum>
77
<FullFrameworkTFM>net472</FullFrameworkTFM>
88
<!-- enforce CamelCase case string-->
@@ -18,7 +18,7 @@
1818
<AnalysisLevel>latest</AnalysisLevel>
1919
<CodeAnalysisTreatWarningsAsErrors>false</CodeAnalysisTreatWarningsAsErrors>
2020
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
21-
<LangVersion>12.0</LangVersion>
21+
<LangVersion>latest</LangVersion>
2222
<NoWarn>$(NoWarn);NU1507;NU5105;CS1591</NoWarn>
2323
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2424
<RestoreSources>
@@ -29,6 +29,7 @@
2929
<!-- C:\Program Files\dotnet\sdk\8.0.100\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.DefaultOutputPaths.targets -->
3030
<UseArtifactsOutput>true</UseArtifactsOutput>
3131
<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
32+
<ArtifactsBinOutputName>bin</ArtifactsBinOutputName>
3233
<CoverletVersion Condition="'$(CoverletVersion)'==''">8.0.0</CoverletVersion>
3334
<!-- Breaking change NET 8.0 InformationalVersion with SourceRevisionId -->
3435
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>

‎Directory.Packages.props‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,36 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup>
7-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.8.118" />
7+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.9.50" />
88
</ItemGroup>
99
<PropertyGroup>
10-
<MicrosoftBuildVersion>17.11.48</MicrosoftBuildVersion> <!-- .NET 8.0 support -->
11-
<MicrosoftCodeAnalysisVersion>4.13.0</MicrosoftCodeAnalysisVersion>
10+
<MicrosoftBuildVersion>17.11.48</MicrosoftBuildVersion>
1211
<!-- .NET 8.0 support -->
13-
<NugetPackageVersion>6.14.0</NugetPackageVersion>
12+
<MicrosoftCodeAnalysisVersion>5.0.0</MicrosoftCodeAnalysisVersion>
13+
<!-- .NET 8.0 support -->
14+
<NugetPackageVersion>7.3.0</NugetPackageVersion>
1415
<!-- Test Platform, .NET Test SDK and Object Model -->
1516
<MicrosoftNETTestSdkVersion>18.0.1</MicrosoftNETTestSdkVersion>
16-
<XunitV3Version>3.2.1</XunitV3Version>
17+
<XunitV3Version>3.2.2</XunitV3Version>
1718
<XunitRunnerVisualstudioVersion>3.1.5</XunitRunnerVisualstudioVersion>
18-
<MicrosoftTestingPlatformVersion>2.0.2</MicrosoftTestingPlatformVersion>
19+
<MicrosoftTestingPlatformVersion>2.1.0</MicrosoftTestingPlatformVersion>
1920
<MoqVersion>4.20.72</MoqVersion>
2021
</PropertyGroup>
2122
<ItemGroup>
2223
<PackageVersion Include="DotNetConfig" Version="1.2.0" />
23-
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
24+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.13" />
2425
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildVersion)" />
2526
<PackageVersion Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildVersion)" />
2627
<PackageVersion Include="Microsoft.Build.Locator" Version="1.11.2" />
2728
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
2829
<PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="5.0.0-1.25277.114" />
2930
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
3031
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.1" />
31-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
32-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
33-
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
32+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.13" />
33+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.13" />
34+
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.13" />
3435
<!--For test TestInstrument_NetstandardAwareAssemblyResolver_PreserveCompilationContext-->
35-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
36+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.13" />
3637
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
3738
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.5" />
3839
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftNETTestSdkVersion)" />
@@ -56,8 +57,8 @@
5657
<PackageVersion Include="Moq" Version="$(MoqVersion)" />
5758
<PackageVersion Include="ReportGenerator.Core" Version="5.3.11" />
5859
<!--For test issue 809 https://github.com/coverlet-coverage/coverlet/issues/809-->
59-
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="8.1.8" />
60-
<PackageVersion Include="System.CommandLine" Version="2.0.0" />
60+
<PackageVersion Include="LinqKit.Microsoft.EntityFrameworkCore" Version="9.0.11" />
61+
<PackageVersion Include="System.CommandLine" Version="2.0.3" />
6162
<!--To test issue 1104 https://github.com/coverlet-coverage/coverlet/issues/1104-->
6263
<!-- latest Tmds.ExecFunction package uses EnvDTE V17.8.37221 -->
6364
<PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
@@ -67,20 +68,20 @@
6768
<PackageVersion Include="xunit.v3.runner.msbuild" Version="$(XunitV3Version)" />
6869
<PackageVersion Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudioVersion)" />
6970
<PackageVersion Include="System.Buffers" Version="4.6.1" />
70-
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
71-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
72-
<PackageVersion Include="System.Diagnostics.EventLog" Version="8.0.2" />
71+
<PackageVersion Include="System.Collections.Immutable" Version="9.0.13" />
72+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.13" />
73+
<PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.13" />
7374
<PackageVersion Include="System.Formats.Asn1" Version="10.0.0" />
74-
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
75+
<PackageVersion Include="System.IO.Pipelines" Version="9.0.13" />
7576
<PackageVersion Include="System.Linq.Async" Version="7.0.0" />
7677
<PackageVersion Include="System.Memory" Version="4.6.3" />
7778
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
78-
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.1" />
79+
<PackageVersion Include="System.Reflection.Metadata" Version="9.0.13" />
7980
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
8081
<PackageVersion Include="System.Security.AccessControl" Version="6.0.1" />
81-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="10.0.0" />
82-
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
83-
<PackageVersion Include="System.Text.Json" Version="8.0.6" />
82+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.13" />
83+
<PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.13" />
84+
<PackageVersion Include="System.Text.Json" Version="9.0.13" />
8485
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
8586
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
8687
<!-- Could be removed - just used in Playground -->

‎eng/azure-pipelines-nightly.yml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ pool:
22
vmImage: 'windows-latest'
33

44
steps:
5-
- task: UseDotNet@2
6-
inputs:
7-
version: 8.0.417
8-
displayName: Install .NET Core SDK 8.0.417
9-
105
- task: UseDotNet@2
116
inputs:
127
useGlobalJson: true

‎eng/azure-pipelines.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ trigger:
66

77
variables:
88
system.debug: false
9+
frameworks: 'net8.0,net9.0,net10.0'
910

1011
jobs:
1112
- job: Windows

0 commit comments

Comments
 (0)