Skip to content

Fix RefCount bugs #2216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
idg10 merged 15 commits into from
Aug 29, 2025
Merged

Fix RefCount bugs #2216

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f0cfde1
Fix missing TargetPlatformSdkPath
idg10 Aug 20, 2025
25219c8
Fix crash when eager RefCount crosses min observer threshold more tha…
idg10 Aug 20, 2025
bbeabd6
Bump version since we already released 6.0.1
idg10 Aug 20, 2025
79e191f
Update integration tests to use Rx 6.0.2 preview
idg10 Aug 20, 2025
d825544
Make RefCount tests more comprehensive
idg10 Aug 27, 2025
9ba43f6
Fix RefCount with delayedDisconnect InvalidOperationException bugs
idg10 Aug 27, 2025
389d845
Address compiler messages. Remove commented out code.
idg10 Aug 27, 2025
16f94b2
Fix bug in RefCountTests
idg10 Aug 27, 2025
665a48f
Tidy up some comments
idg10 Aug 28, 2025
d3b8505
Fix duplicate net8.0 target framework in LinuxTest
idg10 Aug 29, 2025
9876dd6
Move a test over to SerialSingleNotificationConnectable
idg10 Aug 29, 2025
72abbfd
Add release notes for 6.0.2
idg10 Aug 29, 2025
b16387c
Attempt to fix 9.0 build errors on Linux integration tests
idg10 Aug 29, 2025
88baccf
Move 'runtime' setting into right place for Linux tests
idg10 Aug 29, 2025
5cb2f3a
Fix typo in comment
idg10 Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Rx.NET/Integration/LinuxTests/LinuxTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<NoWarn>$(NoWarn);CS0618</NoWarn>
<LangVersion>latest</LangVersion>
<AssemblyName>Tests.System.Reactive</AssemblyName>
Expand All @@ -12,7 +12,7 @@
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<DefineConstants>$(DefineConstants);</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net9.0'">
<DefineConstants>$(DefineConstants);LINUX</DefineConstants>
</PropertyGroup>

Expand All @@ -28,8 +28,8 @@
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
<PackageReference Include="xunit.assert" Version="2.4.2" />
<PackageReference Include="System.Reactive" Version="6.0.0-preview*" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0-preview*" />
<PackageReference Include="System.Reactive.Observable.Aliases" Version="6.0.0-preview*" />
<PackageReference Include="System.Reactive" Version="6.0.2-preview*" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.2-preview*" />
<PackageReference Include="System.Reactive.Observable.Aliases" Version="6.0.2-preview*" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net6.0-windows10.0.19041;net7.0;net7.0-windows10.0.19041;net8.0;net8.0-windows10.0.19041</TargetFrameworks>
<TargetFrameworks>net8.0;net8.0-windows10.0.19041;net9.0;net9.0-windows10.0.19041</TargetFrameworks>
<NoWarn>$(NoWarn);CS0618</NoWarn>
<LangVersion>latest</LangVersion>
<AssemblyName>Tests.System.Reactive</AssemblyName>
Expand All @@ -9,7 +9,7 @@
<AssemblyOriginatorKeyFile>..\..\Source\ReactiveX.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net7.0-windows')) or $(TargetFramework.StartsWith('net8.0-windows'))">
<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-windows')) or $(TargetFramework.StartsWith('net9.0-windows'))">
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<DefineConstants>$(DefineConstants);HAS_TRACE;HAS_WINRT;PREFER_ASYNC;HAS_TPL46;NO_REMOTING;HAS_WINFORMS;HAS_WPF;HAS_DISPATCHER;DESKTOPCLR;WINDOWS;CSWINRT</DefineConstants>
Expand All @@ -27,8 +27,8 @@
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
<PackageReference Include="xunit.assert" Version="2.4.2" />
<PackageReference Include="System.Reactive" Version="6.0.0-preview*" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0-preview*" />
<PackageReference Include="System.Reactive.Observable.Aliases" Version="6.0.0-preview*" />
<PackageReference Include="System.Reactive" Version="6.0.2-preview*" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.2-preview*" />
<PackageReference Include="System.Reactive.Observable.Aliases" Version="6.0.2-preview*" />
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions Rx.NET/Source/Directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@

<DefineConstants>$(DefineConstants);WINDOWS_UWP</DefineConstants>

<!-- At some point, it looks like a fully-qualified version number stopped resolving the TargetPlatformSdkPath
and now it only works with 10.0, so the SDK no longer sets this for us in UAP targets. -->
<TargetPlatformSdkPath Condition="'$(TargetPlatformSdkPath)' == ''">$([Microsoft.Build.Utilities.ToolLocationHelper]::GetPlatformSDKLocation('Windows', '10.0'))</TargetPlatformSdkPath>
</PropertyGroup>


Expand Down
191 changes: 176 additions & 15 deletions Rx.NET/Source/src/System.Reactive/Linq/Observable/RefCount.cs
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

<PropertyGroup>
<TargetFrameworks>net472;net8.0;net8.0-windows10.0.19041;net9.0;net9.0-windows10.0.19041</TargetFrameworks>
<NoWarn>$(NoWarn);CS0618</NoWarn>

<!-- 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. -->
<NoWarn>$(NoWarn);CS0618;IDE0330</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('net8.0-windows')) or $(TargetFramework.StartsWith('net9.0-windows')) or '$(TargetFramework)' == 'net472'">
Expand Down
Loading
Loading