Skip to content

Commit 10c25be

Browse files
Copilotgfs
andauthored
Add .NET 10 support (#178)
* Add .NET 10 support to all projects and pipelines * Update CodeQL workflow to use .NET 10 SDK * Replace System.Linq.Async with System.Linq.AsyncEnumerable for .NET 10 compatibility * Update DotnetVersion to 10.0.x in pipeline * Update DotnetVersion to 10.0.x in pipeline --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: gfs <98900+gfs@users.noreply.github.com>
1 parent 6db3678 commit 10c25be

7 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup .NET Core SDK
2929
uses: actions/setup-dotnet@v1.7.2
3030
with:
31-
dotnet-version: 8.0.x
31+
dotnet-version: 10.0.x
3232

3333
- name: Initialize CodeQL
3434
uses: github/codeql-action/init@v2

Pipelines/recursive-extractor-pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ resources:
2121

2222
variables:
2323
BuildConfiguration: 'Release'
24-
DotnetVersion: '9.0.x'
24+
DotnetVersion: '10.0.x'
2525

2626
extends:
2727
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
@@ -40,7 +40,7 @@ extends:
4040
- template: dotnet-test-job.yml@templates
4141
parameters:
4242
jobName: 'lib_dotnet_test_windows'
43-
dotnetVersions: ['8.0.x', '9.0.x']
43+
dotnetVersions: ['8.0.x', '9.0.x', '10.0.x']
4444
projectPath: 'RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj'
4545
poolName: MSSecurity-1ES-Build-Agents-Pool
4646
poolImage: MSSecurity-1ES-Windows-2022
@@ -54,7 +54,7 @@ extends:
5454
- template: dotnet-test-job.yml@templates
5555
parameters:
5656
jobName: 'cli_dotnet_test_windows'
57-
dotnetVersions: ['8.0.x', '9.0.x']
57+
dotnetVersions: ['8.0.x', '9.0.x', '10.0.x']
5858
projectPath: 'RecursiveExtractor.Cli.Tests/RecursiveExtractor.Cli.Tests.csproj'
5959
poolName: MSSecurity-1ES-Build-Agents-Pool
6060
poolImage: MSSecurity-1ES-Windows-2022

Pipelines/recursive-extractor-release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ resources:
1515

1616
variables:
1717
BuildConfiguration: 'Release'
18-
DotnetVersion: '9.0.x'
18+
DotnetVersion: '10.0.x'
1919

2020
extends:
2121
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
@@ -38,7 +38,7 @@ extends:
3838
- template: dotnet-test-job.yml@templates
3939
parameters:
4040
jobName: 'lib_dotnet_test_windows'
41-
dotnetVersions: ['8.0.x', '9.0.x']
41+
dotnetVersions: ['8.0.x', '9.0.x', '10.0.x']
4242
projectPath: 'RecursiveExtractor.Tests/RecursiveExtractor.Tests.csproj'
4343
poolName: MSSecurity-1ES-Build-Agents-Pool
4444
poolImage: MSSecurity-1ES-Windows-2022
@@ -52,7 +52,7 @@ extends:
5252
- template: dotnet-test-job.yml@templates
5353
parameters:
5454
jobName: 'cli_dotnet_test_windows'
55-
dotnetVersions: ['8.0.x', '9.0.x']
55+
dotnetVersions: ['8.0.x', '9.0.x', '10.0.x']
5656
projectPath: 'RecursiveExtractor.Cli.Tests/RecursiveExtractor.Cli.Tests.csproj'
5757
poolName: MSSecurity-1ES-Build-Agents-Pool
5858
poolImage: MSSecurity-1ES-Windows-2022
@@ -197,4 +197,4 @@ extends:
197197
targetType: 'inline'
198198
script: |
199199
mv $env:BUILD_BINARIESDIRECTORY/*.nupkg $env:BUILD_STAGINGDIRECTORY/
200-
mv $env:BUILD_BINARIESDIRECTORY/*.snupkg $env:BUILD_STAGINGDIRECTORY/
200+
mv $env:BUILD_BINARIESDIRECTORY/*.snupkg $env:BUILD_STAGINGDIRECTORY/

RecursiveExtractor.Cli.Tests/RecursiveExtractor.Cli.Tests.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-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

RecursiveExtractor.Cli/RecursiveExtractor.Cli.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-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
66
<LangVersion>10.0</LangVersion>
77
<Nullable>enable</Nullable>
88
<RootNamespace>Microsoft.CST.RecursiveExtractor.Cli</RootNamespace>

RecursiveExtractor.Tests/RecursiveExtractor.Tests.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-
<TargetFrameworks>net48;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net48;net8.0;net9.0;net10.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<Nullable>enable</Nullable>
77
<LangVersion>10.0</LangVersion>

RecursiveExtractor/RecursiveExtractor.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
55
<RootNamespace>Microsoft.CST.RecursiveExtractor</RootNamespace>
66
<Version>0.0.0-placeholder</Version>
77
<Company>Microsoft</Company>
@@ -45,11 +45,11 @@
4545
<PackageReference Include="LTRData.DiscUtils.Wim" Version="1.0.64" />
4646
<PackageReference Include="LTRData.DiscUtils.Xfs" Version="1.0.64" />
4747
<PackageReference Include="Glob" Version="1.1.9" />
48-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.8" />
48+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
4949
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
5050
<PackageReference Include="NLog" Version="6.0.3" />
5151
<PackageReference Include="SharpCompress" Version="0.40.0" />
52-
<PackageReference Include="System.Linq.Async" Version="6.0.3" />
52+
<PackageReference Include="System.Linq.AsyncEnumerable" Version="10.0.0" />
5353
</ItemGroup>
5454

5555
<ItemGroup>

0 commit comments

Comments
 (0)