Skip to content

Commit a96fdd3

Browse files
JoeRobichJoeRobich
authored
Merge branch 'master' into renovate/serilog.extensions.logging-9.x
2 parents 31efafb + 6b34abe commit a96fdd3

File tree

84 files changed

+315
-320
lines changed

Some content is hidden

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

84 files changed

+315
-320
lines changed

‎.config/dotnet-tools.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
]
1010
},
1111
"gitversion.tool": {
12-
"version": "6.0.5",
12+
"version": "6.1.0",
1313
"commands": [
1414
"dotnet-gitversion"
1515
]
1616
},
1717
"dotnet-reportgenerator-globaltool": {
18-
"version": "5.4.1",
18+
"version": "5.4.3",
1919
"commands": [
2020
"reportgenerator"
2121
]
@@ -33,7 +33,7 @@
3333
]
3434
},
3535
"jetbrains.resharper.globaltools": {
36-
"version": "2024.3.0",
36+
"version": "2024.3.4",
3737
"commands": [
3838
"jb"
3939
]

‎.github/workflows/ci.yml

+25-17
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,19 @@ jobs:
9191
restore-keys: |
9292
${{ runner.os }}-nuget-
9393
- name: 🔨 Use .NET Core 3.1 SDK
94-
uses: actions/setup-dotnet@v4.1.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.1.0
98+
uses: actions/setup-dotnet@v4.3.0
9999
with:
100100
dotnet-version: '6.0.x'
101101
- name: 🔨 Use .NET Core 8.0 SDK
102-
uses: actions/setup-dotnet@v4.1.0
102+
uses: actions/setup-dotnet@v4.3.0
103103
with:
104104
dotnet-version: '8.0.x'
105105
- name: 🔨 Use .NET Core 9.0 SDK
106-
uses: actions/setup-dotnet@v4.1.0
106+
uses: actions/setup-dotnet@v4.3.0
107107
with:
108108
dotnet-version: '9.0.x'
109109
- name: 🎁 dotnet tool restore
@@ -136,9 +136,9 @@ jobs:
136136
working-directory: 'vscode-testextension'
137137
- name: 🏺 Publish coverage data
138138
if: always()
139-
uses: actions/upload-artifact@v3
139+
uses: actions/upload-artifact@v4
140140
with:
141-
name: 'coverage'
141+
name: 'coverage-${{ matrix.os }}'
142142
path: 'coverage/'
143143
- name: 🐿 Publish Coverage
144144
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]')
@@ -147,31 +147,39 @@ jobs:
147147
name: 'actions-${{ matrix.os }}'
148148
- name: 🏺 Publish logs
149149
if: always()
150-
uses: actions/upload-artifact@v3
150+
uses: actions/upload-artifact@v4
151151
with:
152-
name: 'logs'
152+
name: 'logs-${{ matrix.os }}'
153153
path: 'artifacts/logs/'
154154
- name: 🏺 Publish test data
155155
if: always()
156-
uses: actions/upload-artifact@v3
156+
uses: actions/upload-artifact@v4
157157
with:
158-
name: 'test data'
158+
name: 'test data-${{ matrix.os }}'
159159
path: 'artifacts/test/'
160160
- name: 🏺 Publish NuGet Packages
161161
if: always()
162-
uses: actions/upload-artifact@v3
162+
uses: actions/upload-artifact@v4
163163
with:
164-
name: 'nuget'
164+
name: 'nuget-${{ matrix.os }}'
165165
path: 'artifacts/nuget/'
166166
- name: 🏺 Publish Documentation
167-
uses: actions/upload-artifact@v3
167+
uses: actions/upload-artifact@v4
168168
with:
169-
name: 'docs'
169+
name: 'docs-${{ matrix.os }}'
170170
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-*
171180
Publish:
172-
needs:
173-
- Build
174-
uses: RocketSurgeonsGuild/actions/.github/workflows/[email protected]
181+
needs: Merge
182+
uses: RocketSurgeonsGuild/actions/.github/workflows/[email protected]
175183
secrets:
176184
RSG_NUGET_API_KEY: '${{ secrets.RSG_NUGET_API_KEY }}'
177185
RSG_AZURE_DEVOPS: '${{ secrets.RSG_AZURE_DEVOPS }}'

‎.github/workflows/close-milestone.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ jobs:
1717
- uses: actions/setup-dotnet@v4
1818

1919
- name: Install GitVersion
20-
uses: gittools/actions/gitversion/setup@v3.0.2
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@v3.0.2
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@v3.0.2
31+
uses: gittools/actions/gitversion/execute@v3.1.11
3232

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

‎.github/workflows/draft-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
run: git fetch --prune
2828

2929
- name: Install GitVersion
30-
uses: gittools/actions/gitversion/setup@v3.0.2
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@v3.0.2
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

+4-2
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/update-milestone.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ jobs:
2525

2626
- name: Install GitVersion
2727
if: ${{ github.event.action == 'opened' }}
28-
uses: gittools/actions/gitversion/setup@v3.0.2
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@v3.0.2
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@v3.0.2
41+
uses: gittools/actions/gitversion/execute@v3.1.11
4242

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

‎Directory.Packages.props

+13-13
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<PackageVersion Include="System.Threading.Tasks" Version="4.3.0" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageVersion Include="GitVersion.Tool" Version="6.0.5" />
25-
<PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2024.3.0" />
26-
<PackageVersion Include="ReportGenerator" Version="5.4.1" />
24+
<PackageVersion Include="GitVersion.Tool" Version="6.1.0" />
25+
<PackageVersion Include="JetBrains.ReSharper.CommandLineTools" Version="2024.3.4" />
26+
<PackageVersion Include="ReportGenerator" Version="5.4.3" />
2727
<PackageVersion Include="Rocket.Surgery.Nuke" Version="1.7.4" />
2828
</ItemGroup>
2929
<ItemGroup>
@@ -37,29 +37,29 @@
3737
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
3838
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
3939
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
40-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
41-
<PackageVersion Include="xunit" Version="2.9.2" />
42-
<PackageVersion Include="FluentAssertions" Version="6.12.2" />
40+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
41+
<PackageVersion Include="xunit" Version="2.9.3" />
42+
<PackageVersion Include="FluentAssertions" Version="7.1.0" />
4343
<PackageVersion Include="Verify.Xunit" Version="28.0.0" />
4444
<PackageVersion Include="Verify.SourceGenerators" Version="2.4.3" />
4545
<PackageVersion Include="NSubstitute" Version="5.3.0" />
4646
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
4747
<PackageVersion Include="Serilog.Sinks.Observable" Version="3.0.0" />
48-
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.5" />
49-
<PackageVersion Include="XunitXml.TestLogger" Version="4.0.254" />
50-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
51-
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
48+
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.19" />
49+
<PackageVersion Include="XunitXml.TestLogger" Version="5.0.0" />
50+
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
51+
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
5252
<PackageVersion Include="System.Reactive" Version="6.0.1" />
5353
<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
5454
<PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
5555
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.1" />
56-
<PackageVersion Include="MediatR" Version="9.0.0" />
56+
<PackageVersion Include="MediatR" Version="12.4.1" />
5757
<PackageVersion Include="Bogus" Version="35.6.1" />
5858
<PackageVersion Include="Snapper" Version="2.4.1" />
5959
<PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
6060
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
61-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
62-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
61+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
62+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
6363
<PackageVersion Include="DryIoc.Internal" Version="5.4.3" />
6464
</ItemGroup>
6565
</Project>

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "9.0.102",
44
"rollForward": "latestMinor"
55
}
66
}

0 commit comments

Comments
 (0)