Skip to content

Commit 5c8cb02

Browse files
authored
Merge pull request #1439 from sheffer21/DEV/alon/UpgradeMediatRVersion
Upgrade MediatR version to 12.4.1
2 parents 64ca131 + f84189e commit 5c8cb02

File tree

76 files changed

+170
-162
lines changed

Some content is hidden

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

76 files changed

+170
-162
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -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,26 +147,26 @@ 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/'
171171
Publish:
172172
needs:

.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

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
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" />

src/Dap.Protocol/AbstractHandlers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public abstract class Request<TParams, TResult> :
1515
}
1616

1717
public abstract class Notification<TParams> : IJsonRpcRequestHandler<TParams>
18-
where TParams : IRequest
18+
where TParams : IRequest<Unit>
1919
{
2020
public abstract Task<Unit> Handle(TParams request, CancellationToken cancellationToken);
2121
}

src/Dap.Protocol/Feature/Events/BreakpointFeature.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ namespace Events
8383
[GenerateHandler]
8484
[GenerateHandlerMethods]
8585
[GenerateRequestMethods]
86-
public record BreakpointEvent : IRequest
86+
public record BreakpointEvent : IRequest<Unit>
8787
{
8888
/// <summary>
8989
/// The reason for the event.

src/Dap.Protocol/Feature/Events/CapabilitiesFeature.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MediatR;
1+
using MediatR;
22
using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
33
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
44
using OmniSharp.Extensions.JsonRpc;
@@ -238,7 +238,7 @@ namespace Events
238238
[GenerateHandler]
239239
[GenerateHandlerMethods]
240240
[GenerateRequestMethods]
241-
public record CapabilitiesEvent : IRequest
241+
public record CapabilitiesEvent : IRequest<Unit>
242242
{
243243
/// <summary>
244244
/// The set of updated capabilities.

src/Dap.Protocol/Feature/Events/ContinuedFeature.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MediatR;
1+
using MediatR;
22
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
33
using OmniSharp.Extensions.JsonRpc;
44
using OmniSharp.Extensions.JsonRpc.Generation;
@@ -15,7 +15,7 @@ namespace Events
1515
GenerateHandlerMethods,
1616
GenerateRequestMethods
1717
]
18-
public record ContinuedEvent : IRequest
18+
public record ContinuedEvent : IRequest<Unit>
1919
{
2020
/// <summary>
2121
/// The thread which was continued.

src/Dap.Protocol/Feature/Events/ExitedFeature.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MediatR;
1+
using MediatR;
22
using OmniSharp.Extensions.JsonRpc;
33
using OmniSharp.Extensions.JsonRpc.Generation;
44

@@ -14,7 +14,7 @@ namespace Events
1414
GenerateHandlerMethods,
1515
GenerateRequestMethods
1616
]
17-
public record ExitedEvent : IRequest
17+
public record ExitedEvent : IRequest<Unit>
1818
{
1919
/// <summary>
2020
/// The exit code returned from the debuggee.

src/Dap.Protocol/Feature/Events/InitializedFeature.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MediatR;
1+
using MediatR;
22
using OmniSharp.Extensions.JsonRpc;
33
using OmniSharp.Extensions.JsonRpc.Generation;
44

@@ -12,6 +12,6 @@ namespace Events
1212
[GenerateHandler(Name = "DebugAdapterInitialized")]
1313
[GenerateHandlerMethods]
1414
[GenerateRequestMethods]
15-
public record InitializedEvent : IRequest;
15+
public record InitializedEvent : IRequest<Unit>;
1616
}
1717
}

src/Dap.Protocol/Feature/Events/InvalidatedFeature.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using MediatR;
1+
using MediatR;
22
using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
33
using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
44
using OmniSharp.Extensions.JsonRpc;
@@ -16,7 +16,7 @@ namespace Events
1616
GenerateHandlerMethods,
1717
GenerateRequestMethods
1818
]
19-
public record InvalidatedEvent : IRequest
19+
public record InvalidatedEvent : IRequest<Unit>
2020
{
2121
/// <summary>
2222
/// Optional set of logical areas that got invalidated. This property has a

0 commit comments

Comments
 (0)