Skip to content

Move UI and platform types out of System.Reactive #2084

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

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Move UI and platform types out of System.Reactive #2084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1146c96
Move UI and platform types out of System.Reactive
idg10 Feb 12, 2024
af836b7
Ensure Dispatcher available in test that presume it
idg10 Feb 13, 2024
e27c11d
Update verified API
idg10 Feb 13, 2024
8708edf
Add new integration package references to WindowsDesktopTests
idg10 Feb 13, 2024
56c6da7
Add missing s in WindowsForms
idg10 Feb 13, 2024
e28289b
Set version to 7.0 and update WindowsDesktopTests
idg10 Feb 14, 2024
23751e0
Change .Integration package names to .For
idg10 Mar 4, 2024
f9ce5f0
Merge main into feature/separate-ui-packages
idg10 Jun 12, 2025
35c735d
Fixes required now MSBuild.Extras.SDK has gone
idg10 Jun 12, 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
8 changes: 5 additions & 3 deletions Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
<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="7.0.0-preview*" />
<PackageReference Include="System.Reactive.For.WindowsForms" Version="7.0.0-preview*" />
<PackageReference Include="System.Reactive.For.Wpf" Version="7.0.0-preview*" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="7.0.0-preview*" />
<PackageReference Include="System.Reactive.Observable.Aliases" Version="7.0.0-preview*" />
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion Rx.NET/Source/CodeCoverage.runsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
Workaround for failure to run tests on .NET FX on v3.3.1 MSTest packages
-->
<RunConfiguration>
<DisableAppDomain>True</DisableAppDomain>
<DisableAppDomain>True</DisableAppDomain>
<ExecutionThreadApartmentState>STA</ExecutionThreadApartmentState>
</RunConfiguration>

<DataCollectionRunSettings>
Expand Down
102 changes: 102 additions & 0 deletions Rx.NET/Source/System.Reactive.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks.System.Reactive"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks", "{C8E480ED-B592-4341-A0C9-183E822EB6B9}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FrameworkIntegrations", "FrameworkIntegrations", "{1873A545-87AA-4C22-BA1A-8A6602F65749}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.For.WindowsForms", "src\System.Reactive.For.WindowsForms\System.Reactive.For.WindowsForms.csproj", "{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.For.Wpf", "src\System.Reactive.For.Wpf\System.Reactive.For.Wpf.csproj", "{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reactive.For.Uwp", "src\System.Reactive.For.Uwp\System.Reactive.For.Uwp.csproj", "{C3FC6098-AC7F-4825-B292-4049BC6FC76E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.For.WindowsRuntime", "src\System.Reactive.For.WindowsRuntime\System.Reactive.For.WindowsRuntime.csproj", "{EB27A089-56EC-4621-BF88-E3B0DA8E6557}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug (with UWP)|Any CPU = Debug (with UWP)|Any CPU
Expand Down Expand Up @@ -498,6 +508,94 @@ Global
{5C7906F6-232E-455C-9269-68EF84F393C9}.Release|x64.Build.0 = Rx.net 4.0|Any CPU
{5C7906F6-232E-455C-9269-68EF84F393C9}.Release|x86.ActiveCfg = Rx.net 4.0|Any CPU
{5C7906F6-232E-455C-9269-68EF84F393C9}.Release|x86.Build.0 = Rx.net 4.0|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug (with UWP)|Any CPU.ActiveCfg = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug (with UWP)|Any CPU.Build.0 = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug (with UWP)|ARM.ActiveCfg = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug (with UWP)|ARM.Build.0 = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug (with UWP)|x64.ActiveCfg = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug (with UWP)|x64.Build.0 = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug (with UWP)|x86.ActiveCfg = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug (with UWP)|x86.Build.0 = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug|ARM.ActiveCfg = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug|ARM.Build.0 = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug|x64.ActiveCfg = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug|x64.Build.0 = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug|x86.ActiveCfg = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Debug|x86.Build.0 = Debug|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Release|Any CPU.Build.0 = Release|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Release|ARM.ActiveCfg = Release|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Release|ARM.Build.0 = Release|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Release|x64.ActiveCfg = Release|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Release|x64.Build.0 = Release|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Release|x86.ActiveCfg = Release|Any CPU
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}.Release|x86.Build.0 = Release|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug (with UWP)|Any CPU.ActiveCfg = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug (with UWP)|Any CPU.Build.0 = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug (with UWP)|ARM.ActiveCfg = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug (with UWP)|ARM.Build.0 = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug (with UWP)|x64.ActiveCfg = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug (with UWP)|x64.Build.0 = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug (with UWP)|x86.ActiveCfg = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug (with UWP)|x86.Build.0 = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug|ARM.ActiveCfg = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug|ARM.Build.0 = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug|x64.ActiveCfg = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug|x64.Build.0 = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug|x86.ActiveCfg = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Debug|x86.Build.0 = Debug|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Release|Any CPU.Build.0 = Release|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Release|ARM.ActiveCfg = Release|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Release|ARM.Build.0 = Release|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Release|x64.ActiveCfg = Release|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Release|x64.Build.0 = Release|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Release|x86.ActiveCfg = Release|Any CPU
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}.Release|x86.Build.0 = Release|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug (with UWP)|Any CPU.ActiveCfg = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug (with UWP)|ARM.ActiveCfg = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug (with UWP)|x64.ActiveCfg = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug (with UWP)|x86.ActiveCfg = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug|ARM.ActiveCfg = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug|ARM.Build.0 = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug|x64.ActiveCfg = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug|x64.Build.0 = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug|x86.ActiveCfg = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Debug|x86.Build.0 = Debug|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Release|Any CPU.Build.0 = Release|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Release|ARM.ActiveCfg = Release|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Release|ARM.Build.0 = Release|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Release|x64.ActiveCfg = Release|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Release|x64.Build.0 = Release|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Release|x86.ActiveCfg = Release|Any CPU
{C3FC6098-AC7F-4825-B292-4049BC6FC76E}.Release|x86.Build.0 = Release|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug (with UWP)|Any CPU.ActiveCfg = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug (with UWP)|ARM.ActiveCfg = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug (with UWP)|x64.ActiveCfg = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug (with UWP)|x86.ActiveCfg = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug|ARM.ActiveCfg = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug|ARM.Build.0 = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug|x64.ActiveCfg = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug|x64.Build.0 = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug|x86.ActiveCfg = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Debug|x86.Build.0 = Debug|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Release|Any CPU.Build.0 = Release|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Release|ARM.ActiveCfg = Release|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Release|ARM.Build.0 = Release|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Release|x64.ActiveCfg = Release|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Release|x64.Build.0 = Release|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Release|x86.ActiveCfg = Release|Any CPU
{EB27A089-56EC-4621-BF88-E3B0DA8E6557}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -517,6 +615,10 @@ Global
{A31DDC7E-E883-4DBD-8FB8-D7DFC56059F6} = {A0F39260-B8F8-4FCB-9679-0ED917A22BDF}
{01CCDA6D-4D00-4DF2-82B0-359FD5E0CDC6} = {D324579D-CBE6-4867-8980-D7842C7C45A2}
{5C7906F6-232E-455C-9269-68EF84F393C9} = {C8E480ED-B592-4341-A0C9-183E822EB6B9}
{DCD4D74D-FEED-4606-B9C6-6669A5D70B85} = {1873A545-87AA-4C22-BA1A-8A6602F65749}
{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4} = {1873A545-87AA-4C22-BA1A-8A6602F65749}
{C3FC6098-AC7F-4825-B292-4049BC6FC76E} = {1873A545-87AA-4C22-BA1A-8A6602F65749}
{EB27A089-56EC-4621-BF88-E3B0DA8E6557} = {1873A545-87AA-4C22-BA1A-8A6602F65749}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2483F58F-A8D6-4FFE-A3C1-10F3A36DBE69}
Expand Down
73 changes: 73 additions & 0 deletions Rx.NET/Source/src/System.Reactive.For.Uwp/Strings_PlatformServices.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading