Skip to content

Commit 3506ba1

Browse files
authored
Update Rx.NET to .NET 10 SDK (#2267)
* Update Rx.NET to .NET 10 SDK * Add .NET 9.0 install to CI
1 parent b32cb59 commit 3506ba1

File tree

4 files changed

+25
-9
lines changed

4 files changed

+25
-9
lines changed

Rx.NET/Source/src/System.Reactive/Linq/Observable/FromEvent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ protected override TDelegate GetHandler(Action<TEventArgs> onNext)
178178

179179
if (_conversion == null)
180180
{
181-
handler = ReflectionUtils.CreateDelegate<TDelegate>(onNext, typeof(Action<TEventArgs>).GetMethod(nameof(Action<TEventArgs>.Invoke))!);
181+
handler = ReflectionUtils.CreateDelegate<TDelegate>(onNext, typeof(Action<TEventArgs>).GetMethod(nameof(Action<>.Invoke))!);
182182
}
183183
else
184184
{

Rx.NET/Source/src/System.Reactive/Linq/Observable/FromEventPattern.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ protected override TDelegate GetHandler(Action<EventPattern<TEventArgs>> onNext)
3737
if (_conversion == null)
3838
{
3939
Action<object, TEventArgs> h = (sender, eventArgs) => onNext(new EventPattern<TEventArgs>(sender, eventArgs));
40-
handler = ReflectionUtils.CreateDelegate<TDelegate>(h, typeof(Action<object, TEventArgs>).GetMethod(nameof(Action<object, TEventArgs>.Invoke))!);
40+
handler = ReflectionUtils.CreateDelegate<TDelegate>(h, typeof(Action<object, TEventArgs>).GetMethod(nameof(Action<,>.Invoke))!);
4141
}
4242
else
4343
{
@@ -58,7 +58,7 @@ public Impl(Action<TDelegate> addHandler, Action<TDelegate> removeHandler, ISche
5858
protected override TDelegate GetHandler(Action<EventPattern<TSender, TEventArgs>> onNext)
5959
{
6060
Action<TSender, TEventArgs> h = (sender, eventArgs) => onNext(new EventPattern<TSender, TEventArgs>(sender, eventArgs));
61-
return ReflectionUtils.CreateDelegate<TDelegate>(h, typeof(Action<TSender, TEventArgs>).GetMethod(nameof(Action<TSender, TEventArgs>.Invoke))!);
61+
return ReflectionUtils.CreateDelegate<TDelegate>(h, typeof(Action<TSender, TEventArgs>).GetMethod(nameof(Action<,>.Invoke))!);
6262
}
6363
}
6464

@@ -85,7 +85,7 @@ public Handler(object? target, Type delegateType, MethodInfo addMethod, MethodIn
8585
protected override Delegate GetHandler(Action<TResult> onNext)
8686
{
8787
Action<TSender, TEventArgs> h = (sender, eventArgs) => onNext(_getResult(sender, eventArgs));
88-
return ReflectionUtils.CreateDelegate(_delegateType, h, typeof(Action<TSender, TEventArgs>).GetMethod(nameof(Action<TSender, TEventArgs>.Invoke))!);
88+
return ReflectionUtils.CreateDelegate(_delegateType, h, typeof(Action<TSender, TEventArgs>).GetMethod(nameof(Action<,>.Invoke))!);
8989
}
9090

9191
protected override IDisposable AddHandler(Delegate handler)

Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.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>net472;net8.0;net8.0-windows10.0.19041;net9.0;net9.0-windows10.0.19041</TargetFrameworks>
4+
<TargetFrameworks>net472;net8.0;net8.0-windows10.0.19041;net9.0;net9.0-windows10.0.19041;net10.0;net10.0-windows10.0.19041</TargetFrameworks>
55

66
<!-- IDE0330: Prefer 'System.Threading.Lock': not applicable for as long as we support .NET 8.0 or .NET FX, because it is unavailable on those targets.
77
MSTEST0049: Consider overload accepting a CancellationToken - there are 136 of these, and since I've not yet run into a situation that this would have helped in, it's not a priority.

azure-pipelines.rx.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,19 @@ stages:
3434

3535
steps:
3636
- task: UseDotNet@2
37-
displayName: Use .NET 9.0.x SDK
37+
displayName: Use .NET Core 10.x SDK
3838
inputs:
39-
version: 9.0.x
40-
performMultiLevelLookup: true
39+
version: 10.x
4140
includePreviewVersions: true
4241

43-
# We need .NET 8.0 to be able to run all tests.
42+
# We need .NET 8.0 and 9.0 to be able to run all tests.
4443
# We can't just use the runtime package because we need the desktop framework,
4544
# and the only way to get that into a build agent seems to be to install the SDK.
45+
- task: UseDotNet@2
46+
displayName: Use .NET 9.0 SDK
47+
inputs:
48+
version: '9.0.x'
49+
4650
- task: UseDotNet@2
4751
displayName: Use .NET 8.0 SDK
4852
inputs:
@@ -126,6 +130,12 @@ stages:
126130
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
127131

128132
steps:
133+
- task: UseDotNet@2
134+
displayName: Use .NET Core 10.x SDK
135+
inputs:
136+
version: 10.x
137+
includePreviewVersions: true
138+
129139
- task: UseDotNet@2
130140
displayName: Use .NET 9.0 SDK
131141
inputs:
@@ -192,6 +202,12 @@ stages:
192202
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
193203

194204
steps:
205+
- task: UseDotNet@2
206+
displayName: Use .NET Core 10.x SDK
207+
inputs:
208+
version: 10.x
209+
includePreviewVersions: true
210+
195211
- task: UseDotNet@2
196212
displayName: Use .NET 9.0 SDK
197213
inputs:

0 commit comments

Comments
 (0)