Skip to content

Commit 8d49669

Browse files
JoeRobichJoeRobich
authored
Merge branch 'master' into rsg-update
2 parents a2ebd08 + 9c6ab1b commit 8d49669

File tree

93 files changed

+685
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+685
-552
lines changed

‎.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")
103+
.UseDotNetSdks("3.1", "6.0", "8.0", "9.0")
104104
.AddNuGetCache()
105105
.AddVscodeExtensionTests()
106106
.PublishLogs<Solution>()

‎.config/dotnet-tools.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
]
1010
},
1111
"gitversion.tool": {
12-
"version": "5.12.0",
12+
"version": "6.1.0",
1313
"commands": [
1414
"dotnet-gitversion"
1515
]
1616
},
1717
"dotnet-reportgenerator-globaltool": {
18-
"version": "5.3.6",
18+
"version": "5.4.3",
1919
"commands": [
2020
"reportgenerator"
2121
]
2222
},
2323
"nuke.globaltool": {
24-
"version": "8.0.0",
24+
"version": "9.0.4",
2525
"commands": [
2626
"nuke"
2727
]
@@ -33,7 +33,7 @@
3333
]
3434
},
3535
"jetbrains.resharper.globaltools": {
36-
"version": "2024.1.3",
36+
"version": "2024.3.4",
3737
"commands": [
3838
"jb"
3939
]

‎.github/workflows/ci.yml

Lines changed: 30 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
runs-on: ${{ matrix.os }}
8080
steps:
8181
- name: Checkout
82-
uses: actions/checkout@v4.1.7
82+
uses: actions/checkout@v4.2.2
8383
with:
8484
clean: 'false'
8585
fetch-depth: '0'
@@ -91,17 +91,21 @@ jobs:
9191
restore-keys: |
9292
${{ runner.os }}-nuget-
9393
- name: 🔨 Use .NET Core 3.1 SDK
94-
uses: actions/setup-dotnet@v4.0.0
94+
uses: actions/setup-dotnet@v4.3.0
9595
with:
9696
dotnet-version: '3.1.x'
9797
- name: 🔨 Use .NET Core 6.0 SDK
98-
uses: actions/setup-dotnet@v4.0.0
98+
uses: actions/setup-dotnet@v4.3.0
9999
with:
100-
dotnet-version: '6.0.x'
100+
dotnet-version: '6.0.x'
101101
- name: 🔨 Use .NET Core 8.0 SDK
102-
uses: actions/setup-dotnet@v4.0.0
102+
uses: actions/setup-dotnet@v4.3.0
103103
with:
104104
dotnet-version: '8.0.x'
105+
- name: 🔨 Use .NET Core 9.0 SDK
106+
uses: actions/setup-dotnet@v4.3.0
107+
with:
108+
dotnet-version: '9.0.x'
105109
- name: 🎁 dotnet tool restore
106110
run: |
107111
dotnet tool restore
@@ -132,9 +136,9 @@ jobs:
132136
working-directory: 'vscode-testextension'
133137
- name: 🏺 Publish coverage data
134138
if: always()
135-
uses: actions/upload-artifact@v3
139+
uses: actions/upload-artifact@v4
136140
with:
137-
name: 'coverage'
141+
name: 'coverage-${{ matrix.os }}'
138142
path: 'coverage/'
139143
- name: 🐿 Publish Coverage
140144
if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || ((github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'dependabot[bot]')
@@ -143,31 +147,39 @@ jobs:
143147
name: 'actions-${{ matrix.os }}'
144148
- name: 🏺 Publish logs
145149
if: always()
146-
uses: actions/upload-artifact@v3
150+
uses: actions/upload-artifact@v4
147151
with:
148-
name: 'logs'
152+
name: 'logs-${{ matrix.os }}'
149153
path: 'artifacts/logs/'
150154
- name: 🏺 Publish test data
151155
if: always()
152-
uses: actions/upload-artifact@v3
156+
uses: actions/upload-artifact@v4
153157
with:
154-
name: 'test data'
158+
name: 'test data-${{ matrix.os }}'
155159
path: 'artifacts/test/'
156160
- name: 🏺 Publish NuGet Packages
157161
if: always()
158-
uses: actions/upload-artifact@v3
162+
uses: actions/upload-artifact@v4
159163
with:
160-
name: 'nuget'
164+
name: 'nuget-${{ matrix.os }}'
161165
path: 'artifacts/nuget/'
162166
- name: 🏺 Publish Documentation
163-
uses: actions/upload-artifact@v3
167+
uses: actions/upload-artifact@v4
164168
with:
165-
name: 'docs'
169+
name: 'docs-${{ matrix.os }}'
166170
path: 'artifacts/docs/'
171+
Merge:
172+
runs-on: ubuntu-latest
173+
needs: build
174+
steps:
175+
- name: Merge Artifacts
176+
uses: actions/upload-artifact/merge@v4
177+
with:
178+
name: nuget
179+
pattern: nuget-*
167180
Publish:
168-
needs:
169-
- Build
170-
uses: RocketSurgeonsGuild/actions/.github/workflows/publish-nuget.yml@v0.3.10
181+
needs: Merge
182+
uses: RocketSurgeonsGuild/actions/.github/workflows/publish-nuget.yml@v0.3.15
171183
secrets:
172184
RSG_NUGET_API_KEY: '${{ secrets.RSG_NUGET_API_KEY }}'
173185
RSG_AZURE_DEVOPS: '${{ secrets.RSG_AZURE_DEVOPS }}'

‎.github/workflows/close-milestone.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4.1.7
13+
uses: actions/checkout@v4.2.2
1414
with:
1515
fetch-depth: 0
1616

1717
- uses: actions/setup-dotnet@v4
1818

1919
- name: Install GitVersion
20-
uses: gittools/actions/gitversion/setup@v1.1.1
20+
uses: gittools/actions/gitversion/setup@v3.1.11
2121
with:
2222
versionSpec: '5.x'
2323

2424
- name: Install GitReleaseManager
25-
uses: gittools/actions/gitreleasemanager/setup@v1.1.1
25+
uses: gittools/actions/gitreleasemanager/setup@v3.1.11
2626
with:
2727
versionSpec: '0.15.x'
2828

2929
- name: Use GitVersion
3030
id: gitversion
31-
uses: gittools/actions/gitversion/execute@v1.1.1
31+
uses: gittools/actions/gitversion/execute@v3.1.11
3232

3333
# Ensure the milestone exists
3434
- name: Create Milestone

‎.github/workflows/draft-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout
20-
uses: actions/checkout@v4.1.7
20+
uses: actions/checkout@v4.2.2
2121
with:
2222
fetch-depth: 0
2323

@@ -27,13 +27,13 @@ jobs:
2727
run: git fetch --prune
2828

2929
- name: Install GitVersion
30-
uses: gittools/actions/gitversion/setup@v1.1.1
30+
uses: gittools/actions/gitversion/setup@v3.1.11
3131
with:
3232
versionSpec: '5.x'
3333

3434
- name: Use GitVersion
3535
id: gitversion
36-
uses: gittools/actions/gitversion/execute@v1.1.1
36+
uses: gittools/actions/gitversion/execute@v3.1.11
3737

3838
- name: Create Milestone
3939
uses: WyriHaximus/github-action-create-milestone@v1

‎.github/workflows/publish-nuget.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ jobs:
2323
with:
2424
nuget-version: '5.x'
2525

26-
- uses: actions/download-artifact@v3
26+
- uses: actions/download-artifact@v4
2727
with:
28-
name: nuget
28+
path: nuget
29+
pattern: nuget-*
30+
merge-multiple: true
2931

3032
- name: nuget.org
3133
# continue-on-error: true

‎.github/workflows/sync-labels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v4.1.7
19+
uses: actions/checkout@v4.2.2
2020

2121
- name: Run Labeler
2222
if: success()
23-
uses: crazy-max/ghaction-github-labeler@v5.0.0
23+
uses: crazy-max/ghaction-github-labeler@v5.1.0
2424
with:
2525
yaml-file: .github/labels.yml
2626
skip-delete: false

‎.github/workflows/update-milestone.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v4.1.7
16+
uses: actions/checkout@v4.2.2
1717
with:
1818
ref: ${{ github.sha }}
1919
fetch-depth: 0
@@ -25,20 +25,20 @@ jobs:
2525

2626
- name: Install GitVersion
2727
if: ${{ github.event.action == 'opened' }}
28-
uses: gittools/actions/gitversion/setup@v1.1.1
28+
uses: gittools/actions/gitversion/setup@v3.1.11
2929
with:
3030
versionSpec: '5.x'
3131

3232
- name: Install GitReleaseManager
3333
if: ${{ github.event.action == 'opened' }}
34-
uses: gittools/actions/gitreleasemanager/setup@v1.1.1
34+
uses: gittools/actions/gitreleasemanager/setup@v3.1.11
3535
with:
3636
versionSpec: '0.15.x'
3737

3838
- name: Use GitVersion
3939
if: ${{ github.event.action == 'opened' }}
4040
id: gitversion
41-
uses: gittools/actions/gitversion/execute@v1.1.1
41+
uses: gittools/actions/gitversion/execute@v3.1.11
4242

4343
- name: Create Milestone
4444
if: ${{ github.event.action == 'opened' }}

‎Directory.Packages.props

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
</ItemGroup>
1212
<!-- Samples -->
1313
<ItemGroup>
14-
<PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
15-
<PackageVersion Include="Serilog.Sinks.Debug" Version="2.0.0" />
14+
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
15+
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
1616
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
1717
<PackageVersion Include="System.IO" Version="4.3.0" />
1818
<PackageVersion Include="System.Runtime.Handles" Version="4.3.0" />
@@ -21,44 +21,44 @@
2121
<PackageVersion Include="System.Threading.Tasks" Version="4.3.0" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2024.1.3" />
25-
<PackageVersion Include="ReportGenerator" Version="5.3.6" />
26-
<PackageVersion Include="Rocket.Surgery.Nuke" Version="1.8.35" />
24+
<PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2024.3.4" />
25+
<PackageVersion Include="ReportGenerator" Version="5.4.3" />
26+
<PackageVersion Include="Rocket.Surgery.Nuke" Version="1.8.36" />
2727
</ItemGroup>
2828
<ItemGroup>
2929
<!-- backwards compat is maintained in Directory.Packages.supports.props -->
30-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
31-
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
30+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
31+
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
3232
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
33-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
33+
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
3434
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
3535
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
36-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
36+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
3737
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
38-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
39-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
40-
<PackageVersion Include="xunit" Version="2.8.1" />
41-
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
42-
<PackageVersion Include="Verify.Xunit" Version="22.11.5" />
43-
<PackageVersion Include="Verify.SourceGenerators" Version="2.2.0" />
44-
<PackageVersion Include="NSubstitute" Version="5.1.0" />
38+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
39+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
40+
<PackageVersion Include="xunit" Version="2.9.3" />
41+
<PackageVersion Include="FluentAssertions" Version="7.1.0" />
42+
<PackageVersion Include="Verify.Xunit" Version="28.0.0" />
43+
<PackageVersion Include="Verify.SourceGenerators" Version="2.4.3" />
44+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
4545
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
46-
<PackageVersion Include="Serilog.Sinks.Observable" Version="2.0.2" />
47-
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.5" />
48-
<PackageVersion Include="XunitXml.TestLogger" Version="3.1.20" />
49-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
50-
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
46+
<PackageVersion Include="Serilog.Sinks.Observable" Version="3.0.0" />
47+
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.19" />
48+
<PackageVersion Include="XunitXml.TestLogger" Version="5.0.0" />
49+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
50+
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
5151
<PackageVersion Include="System.Reactive" Version="6.0.1" />
5252
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
5353
<PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
5454
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.1" />
55-
<PackageVersion Include="MediatR" Version="9.0.0" />
56-
<PackageVersion Include="Bogus" Version="35.5.1" />
55+
<PackageVersion Include="MediatR" Version="12.4.1" />
56+
<PackageVersion Include="Bogus" Version="35.6.1" />
5757
<PackageVersion Include="Snapper" Version="2.4.1" />
58-
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
59-
<PackageVersion Include="Nerdbank.Streams" Version="2.10.72" />
60-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
61-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
58+
<PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
59+
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
60+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
61+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
6262
<PackageVersion Include="DryIoc.Internal" Version="5.4.3" />
6363
</ItemGroup>
6464
</Project>

‎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": "8.0.301",
3+
"version": "9.0.102",
44
"rollForward": "latestMinor"
55
}
6-
}
6+
}

0 commit comments

Comments
 (0)