Skip to content

Commit f4f727c

Browse files
authored
Add experimental netstandard2.0 target to AsyncRx.NET (#1955)
1 parent 7d71852 commit f4f727c

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

AsyncRx.NET/ApiCompare/ApiCompare.csproj

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
<TargetFramework>net6.0</TargetFramework>
1010
</PropertyGroup>
1111

12-
<ItemGroup>
13-
<PackageReference Include="System.Reactive" Version="6.0.0-preview.1" />
14-
</ItemGroup>
15-
1612
<ItemGroup>
1713
<ProjectReference Include="..\System.Reactive.Async\System.Reactive.Async.csproj" />
1814
</ItemGroup>

AsyncRx.NET/System.Reactive.Async/Linq/Operators/CombineLatest.Generated.tt

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ for (var j = 1; j <= i; j++)
161161
}
162162
#>
163163

164-
var gate = new AsyncLock();
164+
var gate = new AsyncGate();
165165

166166
return
167167
(
@@ -248,7 +248,7 @@ for (var j = 1; j <= i; j++)
248248
}
249249
#>
250250

251-
var gate = new AsyncLock();
251+
var gate = new AsyncGate();
252252

253253
return
254254
(

AsyncRx.NET/System.Reactive.Async/Linq/Operators/Zip.Generated.tt

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ for (var i = 2; i <= 15; i++)
152152
if (observer == null)
153153
throw new ArgumentNullException(nameof(observer));
154154

155-
var gate = new AsyncLock();
155+
var gate = new AsyncGate();
156156

157157
<#
158158
for (var j = 1; j <= i; j++)
@@ -258,7 +258,7 @@ for (var j = 1; j <= i; j++)
258258
if (selector == null)
259259
throw new ArgumentNullException(nameof(selector));
260260

261-
var gate = new AsyncLock();
261+
var gate = new AsyncGate();
262262

263263
<#
264264
for (var j = 1; j <= i; j++)

AsyncRx.NET/System.Reactive.Async/System.Reactive.Async.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
55

66
<RootNamespace>System.Reactive</RootNamespace>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="System.Reactive" Version="6.0.0-preview.1" />
10+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition="$(TargetFramework) == 'netstandard2.0'" />
11+
<PackageReference Include="System.Reactive" Version="6.0.0" />
1112
</ItemGroup>
1213

1314
<ItemGroup>

0 commit comments

Comments
 (0)