Skip to content

Commit aa1cac2

Browse files
authored
chore(deps): update dotnet monorepo (major) (#1637)
2 parents 9b515f7 + 2e5c13f commit aa1cac2

File tree

6 files changed

+28
-32
lines changed

6 files changed

+28
-32
lines changed

.azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ jobs:
7575
- template: support/install-dotnet.yml@rsg
7676
parameters:
7777
DotNetSdk:
78-
- '2.1.x'
79-
- '3.1.x'
80-
- '5.0.x'
78+
- '8.0.x'
79+
- '9.0.x'
80+
- '10.0.x'
8181

8282
- task: DotNetCoreCLI@2
8383
displayName: 'dotnet tool restore'

.build/Solution.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ RocketSurgeonGitHubActionsConfiguration configuration
100100
.Jobs.OfType<RocketSurgeonsGithubActionsJob>()
101101
.First(z => z.Name.Equals("Build", StringComparison.OrdinalIgnoreCase))
102102
.ConfigureStep<CheckoutStep>(step => step.FetchDepth = 0)
103-
.UseDotNetSdks("3.1", "6.0", "8.0", "9.0")
103+
.UseDotNetSdks("8.0", "9.0", "10.0")
104104
.AddNuGetCache()
105105
.AddVscodeExtensionTests()
106106
.PublishLogs<Solution>()

.github/workflows/ci.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,18 @@ jobs:
8989
with:
9090
path: '${{ github.workspace }}/.nuget/packages'
9191
key: "${{ runner.os }}-nuget-${{ hashFiles('**/Directory.Packages.props') }}-${{ hashFiles('**/dotnet-tools.json') }}"
92-
- name: 🔨 Use .NET Core 3.1 SDK
93-
uses: actions/setup-dotnet@v5.0.0
94-
with:
95-
dotnet-version: '3.1.x'
96-
- name: 🔨 Use .NET Core 6.0 SDK
97-
uses: actions/setup-dotnet@v5.0.0
98-
with:
99-
dotnet-version: '6.0.x'
100-
- name: 🔨 Use .NET Core 8.0 SDK
92+
- name: 🔨 Use .NET 8.0 SDK
10193
uses: actions/setup-dotnet@v5.0.0
10294
with:
10395
dotnet-version: '8.0.x'
104-
- name: 🔨 Use .NET Core 9.0 SDK
96+
- name: 🔨 Use .NET 9.0 SDK
10597
uses: actions/setup-dotnet@v5.0.0
10698
with:
10799
dotnet-version: '9.0.x'
100+
- name: 🔨 Use .NET 10.0 SDK
101+
uses: actions/setup-dotnet@v5.0.0
102+
with:
103+
dotnet-version: '10.0.x'
108104
- name: 🎁 dotnet tool restore
109105
run: |
110106
dotnet tool restore

Directory.Packages.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
</ItemGroup>
2929
<ItemGroup>
3030
<!-- backwards compat is maintained in Directory.Packages.supports.props -->
31-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.11" />
32-
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.11" />
33-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.11" />
34-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.11" />
35-
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.11" />
36-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.11" />
37-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.11" />
31+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0" />
32+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
33+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
34+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
35+
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0" />
36+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
37+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
3838
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
3939
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
4040
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
@@ -50,15 +50,15 @@
5050
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
5151
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
5252
<PackageVersion Include="System.Reactive" Version="6.1.0" />
53-
<PackageVersion Include="System.Collections.Immutable" Version="9.0.11" />
54-
<PackageVersion Include="System.Threading.Channels" Version="9.0.11" />
53+
<PackageVersion Include="System.Collections.Immutable" Version="10.0.0" />
54+
<PackageVersion Include="System.Threading.Channels" Version="10.0.0" />
5555
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.1.0" />
5656
<PackageVersion Include="MediatR" Version="12.4.1" />
5757
<PackageVersion Include="Bogus" Version="35.6.5" />
5858
<PackageVersion Include="Snapper" Version="2.4.1" />
5959
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
6060
<PackageVersion Include="Nerdbank.Streams" Version="2.13.16" />
61-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
61+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0" />
6262
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
6363
<PackageVersion Include="DryIoc.Internal" Version="5.4.3" />
6464
</ItemGroup>

Directory.Packages.supports.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<Project>
33
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
44
<!-- Lower bound for most target frameworks -->
5-
<PackageVersion Update="Microsoft.Extensions.Logging" Version="2.2.0" />
6-
<PackageVersion Update="Microsoft.Extensions.Logging.Debug" Version="2.2.0" />
7-
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="2.2.0" />
8-
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="2.2.4" />
9-
<PackageVersion Update="Microsoft.Extensions.Options" Version="2.2.0" />
10-
<PackageVersion Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.2.0" />
11-
<PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
5+
<PackageVersion Update="Microsoft.Extensions.Logging" Version="10.0.0" />
6+
<PackageVersion Update="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
7+
<PackageVersion Update="Microsoft.Extensions.Configuration" Version="10.0.0" />
8+
<PackageVersion Update="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
9+
<PackageVersion Update="Microsoft.Extensions.Options" Version="10.0.0" />
10+
<PackageVersion Update="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.0" />
11+
<PackageVersion Update="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
1212
</ItemGroup>
1313
</Project>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.307",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

0 commit comments

Comments
 (0)