瀏覽代碼

Change .Integration package names to .For

Ian Griffiths 1 年之前
父節點
當前提交
23751e018c
共有 54 個文件被更改,包括 207 次插入186 次删除
  1. 2 2
      Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
  2. 4 4
      Rx.NET/Source/System.Reactive.sln
  3. 2 2
      Rx.NET/Source/src/System.Reactive.For.Uwp/Strings_PlatformServices.Designer.cs
  4. 0 0
      Rx.NET/Source/src/System.Reactive.For.Uwp/Strings_PlatformServices.resx
  5. 1 1
      Rx.NET/Source/src/System.Reactive.For.Uwp/Stubs.cs
  6. 2 2
      Rx.NET/Source/src/System.Reactive.For.Uwp/System.Reactive.For.Uwp.csproj
  7. 1 1
      Rx.NET/Source/src/System.Reactive.For.Uwp/ThreadPoolTimerExtensions.cs
  8. 2 2
      Rx.NET/Source/src/System.Reactive.For.Uwp/UwpThreadPoolScheduler.cs
  9. 0 0
      Rx.NET/Source/src/System.Reactive.For.Uwp/build/NuGet.Readme.md
  10. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsForms/ControlScheduler.cs
  11. 0 0
      Rx.NET/Source/src/System.Reactive.For.WindowsForms/System.Reactive.For.WindowsForms.csproj
  12. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsForms/System.Reactive.Linq/WindowsFormsControlObservable.cs
  13. 26 0
      Rx.NET/Source/src/System.Reactive.For.WindowsForms/build/NuGet.Readme.md
  14. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/AsyncInfoExtensions.cs
  15. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/AsyncInfoObservableExtensions.cs
  16. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/AsyncInfoToObservableBridge.cs
  17. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/CoreDispatcherScheduler.cs
  18. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/EventPatternSource.cs
  19. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/ITypedEventPatternSource.cs
  20. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/StableCompositeDisposable.cs
  21. 2 2
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/Strings_WindowsThreading.Designer.cs
  22. 0 0
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/Strings_WindowsThreading.resx
  23. 0 0
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/System.Reactive.For.WindowsRuntime.csproj
  24. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeAsyncInfoObservable.cs
  25. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeCoreDispatcherObservable.cs
  26. 2 2
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeObservable.Events.cs
  27. 1 1
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeObservable.StandardSequenceOperators.cs
  28. 0 0
      Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/build/NuGet.Readme.md
  29. 1 1
      Rx.NET/Source/src/System.Reactive.For.Wpf/DispatcherScheduler.cs
  30. 2 2
      Rx.NET/Source/src/System.Reactive.For.Wpf/Strings_WindowsThreading.Designer.cs
  31. 0 0
      Rx.NET/Source/src/System.Reactive.For.Wpf/Strings_WindowsThreading.resx
  32. 0 0
      Rx.NET/Source/src/System.Reactive.For.Wpf/System.Reactive.For.Wpf.csproj
  33. 1 1
      Rx.NET/Source/src/System.Reactive.For.Wpf/System.Reactive.Linq/WpfDispatcherObservable.cs
  34. 0 0
      Rx.NET/Source/src/System.Reactive.For.Wpf/build/NuGet.Readme.md
  35. 5 5
      Rx.NET/Source/src/System.Reactive/Concurrency/ThreadPoolScheduler.Windows.cs
  36. 3 3
      Rx.NET/Source/src/System.Reactive/Platforms/Desktop/Concurrency/ControlScheduler.cs
  37. 3 3
      Rx.NET/Source/src/System.Reactive/Platforms/Desktop/Concurrency/DispatcherScheduler.cs
  38. 6 6
      Rx.NET/Source/src/System.Reactive/Platforms/Desktop/Linq/ControlObservable.cs
  39. 30 30
      Rx.NET/Source/src/System.Reactive/Platforms/Desktop/Linq/DispatcherObservable.cs
  40. 3 3
      Rx.NET/Source/src/System.Reactive/Platforms/UWP/Concurrency/CoreDispatcherScheduler.cs
  41. 4 4
      Rx.NET/Source/src/System.Reactive/Platforms/UWP/Foundation/AsyncInfoExtensions.cs
  42. 5 5
      Rx.NET/Source/src/System.Reactive/Platforms/UWP/IEventPatternSource.cs
  43. 16 16
      Rx.NET/Source/src/System.Reactive/Platforms/UWP/Linq/AsyncInfoObservable.cs
  44. 26 26
      Rx.NET/Source/src/System.Reactive/Platforms/UWP/Linq/CoreDispatcherObservable.cs
  45. 5 5
      Rx.NET/Source/src/System.Reactive/Platforms/UWP/Linq/WindowsObservable.Events.cs
  46. 4 4
      Rx.NET/Source/src/System.Reactive/Platforms/UWP/Linq/WindowsObservable.StandardSequenceOperators.cs
  47. 24 29
      Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Core.verified.cs
  48. 2 2
      Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj
  49. 1 1
      Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/ControlSchedulerTest.cs
  50. 1 1
      Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/DispatcherSchedulerTest.cs
  51. 2 2
      Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs
  52. 2 2
      Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ObserveOnTest.cs
  53. 3 3
      Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeOnTest.cs
  54. 2 2
      Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/QbservableTest.cs

+ 2 - 2
Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj

@@ -28,8 +28,8 @@
     <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
     <PackageReference Include="xunit.assert" Version="2.4.2" />
     <PackageReference Include="System.Reactive" Version="7.0.0-preview*" />
-    <PackageReference Include="System.Reactive.Integration.WindowsForms" Version="7.0.0-preview*" />
-    <PackageReference Include="System.Reactive.Integration.Wpf" 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>

+ 4 - 4
Rx.NET/Source/System.Reactive.sln

@@ -68,13 +68,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benchmarks", "Benchmarks",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FrameworkIntegrations", "FrameworkIntegrations", "{1873A545-87AA-4C22-BA1A-8A6602F65749}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Integration.WindowsForms", "src\System.Reactive.Integration.WindowsForms\System.Reactive.Integration.WindowsForms.csproj", "{DCD4D74D-FEED-4606-B9C6-6669A5D70B85}"
+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.Integration.Wpf", "src\System.Reactive.Integration.Wpf\System.Reactive.Integration.Wpf.csproj", "{D548C2CA-5C32-4FFF-B9E9-A251971ED7B4}"
+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.Integration.Uwp", "src\System.Reactive.Integration.Uwp\System.Reactive.Integration.Uwp.csproj", "{C3FC6098-AC7F-4825-B292-4049BC6FC76E}"
+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.Integration.WindowsRuntime", "src\System.Reactive.Integration.WindowsRuntime\System.Reactive.Integration.WindowsRuntime.csproj", "{EB27A089-56EC-4621-BF88-E3B0DA8E6557}"
+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

+ 2 - 2
Rx.NET/Source/src/System.Reactive.Integration.Uwp/Strings_PlatformServices.Designer.cs → Rx.NET/Source/src/System.Reactive.For.Uwp/Strings_PlatformServices.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace System.Reactive.Integration.Uwp {
+namespace System.Reactive.Uwp {
     using System;
     using System.Reflection;
     
@@ -40,7 +40,7 @@ namespace System.Reactive.Integration.Uwp {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Reactive.Integration.Uwp.Strings_PlatformServices", typeof(Strings_PlatformServices).GetTypeInfo().Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Reactive.For.Uwp.Strings_PlatformServices", typeof(Strings_PlatformServices).GetTypeInfo().Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

+ 0 - 0
Rx.NET/Source/src/System.Reactive.Integration.Uwp/Strings_PlatformServices.resx → Rx.NET/Source/src/System.Reactive.For.Uwp/Strings_PlatformServices.resx


+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.Uwp/Stubs.cs → Rx.NET/Source/src/System.Reactive.For.Uwp/Stubs.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT License.
 // See the LICENSE file in the project root for more information. 
 
-namespace System.Reactive.Integration.Uwp
+namespace System.Reactive.Uwp
 {
     internal static class Stubs<T>
     {

+ 2 - 2
Rx.NET/Source/src/System.Reactive.Integration.Uwp/System.Reactive.Integration.Uwp.csproj → Rx.NET/Source/src/System.Reactive.For.Uwp/System.Reactive.For.Uwp.csproj

@@ -19,14 +19,14 @@
 
   <ItemGroup>
     <Compile Include="..\AssemblyInfo.cs" Link="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\System.Reactive.Integration.WindowsRuntime\AsyncInfoExtensions.cs" Link="AsyncInfoExtensions.cs" />
+    <Compile Include="..\System.Reactive.For.WindowsRuntime\AsyncInfoExtensions.cs" Link="AsyncInfoExtensions.cs" />
     <Compile Include="..\System.Reactive\Concurrency\UserWorkItem.cs" Link="UserWorkItem.cs" />
     <Compile Include="..\System.Reactive\Diagnostics\CodeAnalysis\NullableAttributes.cs" Link="NullableAttributes.cs" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
-    <ProjectReference Include="..\System.Reactive.Integration.WindowsRuntime\System.Reactive.Integration.WindowsRuntime.csproj" />
+    <ProjectReference Include="..\System.Reactive.For.WindowsRuntime\System.Reactive.For.WindowsRuntime.csproj" />
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.Uwp/ThreadPoolTimerExtensions.cs → Rx.NET/Source/src/System.Reactive.For.Uwp/ThreadPoolTimerExtensions.cs

@@ -6,7 +6,7 @@ using System.Reactive.Disposables;
 
 using Windows.System.Threading;
 
-namespace System.Reactive.Integration.Uwp
+namespace System.Reactive.Uwp
 {
     internal static class ThreadPoolTimerExtensions
     {

+ 2 - 2
Rx.NET/Source/src/System.Reactive.Integration.Uwp/UwpThreadPoolScheduler.cs → Rx.NET/Source/src/System.Reactive.For.Uwp/UwpThreadPoolScheduler.cs

@@ -3,10 +3,10 @@
 // See the LICENSE file in the project root for more information. 
 
 using System.Reactive.Concurrency;
-using System.Reactive.Integration.WindowsRuntime;
+using System.Reactive.WindowsRuntime;
 using Windows.System.Threading;
 
-namespace System.Reactive.Integration.Uwp
+namespace System.Reactive.Uwp
 {
     /// <summary>
     /// Schedules units of work on the Windows Runtime thread pool.

+ 0 - 0
Rx.NET/Source/src/System.Reactive.Integration.Uwp/build/NuGet.Readme.md → Rx.NET/Source/src/System.Reactive.For.Uwp/build/NuGet.Readme.md


+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsForms/ControlScheduler.cs → Rx.NET/Source/src/System.Reactive.For.WindowsForms/ControlScheduler.cs

@@ -7,7 +7,7 @@ using System.Reactive.Disposables;
 using System.Threading;
 using System.Windows.Forms;
 
-namespace System.Reactive.Integration.WindowsForms
+namespace System.Reactive.WindowsForms
 {
     /// <summary>
     /// Represents an object that schedules units of work on the message loop associated with a Windows Forms control.

+ 0 - 0
Rx.NET/Source/src/System.Reactive.Integration.WindowsForms/System.Reactive.Integration.WindowsForms.csproj → Rx.NET/Source/src/System.Reactive.For.WindowsForms/System.Reactive.For.WindowsForms.csproj


+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsForms/System.Reactive.Linq/WindowsFormsControlObservable.cs → Rx.NET/Source/src/System.Reactive.For.WindowsForms/System.Reactive.Linq/WindowsFormsControlObservable.cs

@@ -4,7 +4,7 @@
 
 using System.Windows.Forms;
 
-using ControlScheduler = System.Reactive.Integration.WindowsForms.ControlScheduler;
+using ControlScheduler = System.Reactive.WindowsForms.ControlScheduler;
 using Synchronization = System.Reactive.Concurrency.Synchronization;
 
 namespace System.Reactive.Linq

+ 26 - 0
Rx.NET/Source/src/System.Reactive.For.WindowsForms/build/NuGet.Readme.md

@@ -0,0 +1,26 @@
+# Windows Forms Support for Rx.NET (Reactive Extensions for .NET)
+
+This library provides Windows Forms support for the Reactive Extensions for .NET (Rx.NET).
+
+See the main Rx.NET package at https://www.nuget.org/packages/System.Reactive for more information about Rx.NET.
+
+## Rx.NET and UI Frameworks
+
+Up as far as Rx.NET v6.0, UI framework support has been built directly into the main `System.Reactive` package.
+Unfortunately, this has caused problems since support for WPF and Windows Forms was added in .NET Core 3.1.
+Because .NET Core 3.1, and all subsequent versions of .NET have supported cross-platform use, WPF and Windows
+Forms are not universally available. Rx.NET used to make WPF and Windows Forms support if you targetted a
+sufficiently recent version of Windows in your application TFM. But this turns out to cause problems in
+some deployment models, adding as much as 90MB to the deployable size of an application.
+
+Consequently, starting in Rx.NET v7.0 we are moving all UI-framework-specific types, and also platform-specific
+types out into separate packages.
+
+## Features
+
+This package provides replacements for two deprecated types in `System.Reactive`:
+
+|Type in `System.Reactive` | Replacement | Purpose |
+|---|---|---|
+|`ControlScheduler` (in `System.Reactive.Concurrency`) | `ControlScheduler` (in `System.Reactive.Integration.WindowsForms`) | Provides a scheduler that schedules work on the UI thread of a Windows Forms application. |
+|`ControlObservable` (in `System.Reactive.Linq`) | `WindowsFormsControlObservable` (in `System.Reactive.Linq`) | Provides a set of extension methods for scheduling work on the UI thread of a Windows Forms application. |

+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/AsyncInfoExtensions.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/AsyncInfoExtensions.cs

@@ -5,7 +5,7 @@
 using System.Reactive.Disposables;
 using Windows.Foundation;
 
-namespace System.Reactive.Integration.WindowsRuntime
+namespace System.Reactive.WindowsRuntime
 {
     internal static class AsyncInfoExtensions
     {

+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/AsyncInfoObservableExtensions.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/AsyncInfoObservableExtensions.cs

@@ -5,7 +5,7 @@
 using System.Reactive.Linq;
 using Windows.Foundation;
 
-namespace System.Reactive.Integration.WindowsRuntime
+namespace System.Reactive.WindowsRuntime
 {
     /// <summary>
     /// Provides conversions from Windows Runtime asynchronous actions and operations to observable sequences.

+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/AsyncInfoToObservableBridge.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/AsyncInfoToObservableBridge.cs

@@ -5,7 +5,7 @@
 using System.Reactive.Subjects;
 using Windows.Foundation;
 
-namespace System.Reactive.Integration.WindowsRuntime
+namespace System.Reactive.WindowsRuntime
 {
     internal sealed class AsyncInfoToObservableBridge<TResult, TProgress> : ObservableBase<TResult>
     {

+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/CoreDispatcherScheduler.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/CoreDispatcherScheduler.cs

@@ -9,7 +9,7 @@ using System.Threading;
 using Windows.System;
 using Windows.UI.Core;
 
-namespace System.Reactive.Integration.WindowsRuntime
+namespace System.Reactive.WindowsRuntime
 {
     /// <summary>
     /// Schedules units of work on a <see cref="CoreDispatcher"/>.

+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/EventPatternSource.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/EventPatternSource.cs

@@ -4,7 +4,7 @@
 
 using Windows.Foundation;
 
-namespace System.Reactive.Integration.WindowsRuntime
+namespace System.Reactive.WindowsRuntime
 {
     internal sealed class EventPatternSource<TSender, TEventArgs> : EventPatternSourceBase<TSender, TEventArgs>, ITypedEventPatternSource<TSender, TEventArgs>
     {

+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/ITypedEventPatternSource.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/ITypedEventPatternSource.cs

@@ -4,7 +4,7 @@
 
 using Windows.Foundation;
 
-namespace System.Reactive.Integration.WindowsRuntime
+namespace System.Reactive.WindowsRuntime
 {
     /// <summary>
     /// Represents a data stream signaling its elements by means of a Windows Runtime

+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/StableCompositeDisposable.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/StableCompositeDisposable.cs

@@ -4,7 +4,7 @@
 
 using System.Threading;
 
-namespace System.Reactive.Integration.WindowsRuntime
+namespace System.Reactive.WindowsRuntime
 {
     /// <summary>
     /// Represents a group of disposable resources that are disposed together.

+ 2 - 2
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/Strings_WindowsThreading.Designer.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/Strings_WindowsThreading.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace System.Reactive.Integration.WindowsRuntime {
+namespace System.Reactive.WindowsRuntime {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace System.Reactive.Integration.WindowsRuntime {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Reactive.Integration.WindowsRuntime.Strings_WindowsThreading", typeof(Strings_WindowsThreading).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Reactive.For.WindowsRuntime.Strings_WindowsThreading", typeof(Strings_WindowsThreading).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

+ 0 - 0
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/Strings_WindowsThreading.resx → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/Strings_WindowsThreading.resx


+ 0 - 0
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/System.Reactive.Integration.WindowsRuntime.csproj → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/System.Reactive.For.WindowsRuntime.csproj


+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeAsyncInfoObservable.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeAsyncInfoObservable.cs

@@ -2,8 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT License.
 // See the LICENSE file in the project root for more information. 
 
-using System.Reactive.Integration.WindowsRuntime;
 using System.Reactive.Threading.Tasks;
+using System.Reactive.WindowsRuntime;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
 using Windows.Foundation;

+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeCoreDispatcherObservable.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeCoreDispatcherObservable.cs

@@ -8,7 +8,7 @@ using Windows.UI.Core;
 using Windows.UI.Xaml;
 #endif
 
-using CoreDispatcherScheduler = System.Reactive.Integration.WindowsRuntime.CoreDispatcherScheduler;
+using CoreDispatcherScheduler = System.Reactive.WindowsRuntime.CoreDispatcherScheduler;
 using Synchronization = System.Reactive.Concurrency.Synchronization;
 
 namespace System.Reactive.Linq

+ 2 - 2
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeObservable.Events.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeObservable.Events.cs

@@ -103,14 +103,14 @@ namespace System.Reactive.Linq
         /// <param name="source">Observable source sequence.</param>
         /// <returns>The event source object.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-        public static System.Reactive.Integration.WindowsRuntime.ITypedEventPatternSource<TSender, TEventArgs> ToWindowsFoundationEventPattern<TSender, TEventArgs>(this IObservable<EventPattern<TSender, TEventArgs>> source)
+        public static System.Reactive.WindowsRuntime.ITypedEventPatternSource<TSender, TEventArgs> ToWindowsFoundationEventPattern<TSender, TEventArgs>(this IObservable<EventPattern<TSender, TEventArgs>> source)
         {
             if (source == null)
             {
                 throw new ArgumentNullException(nameof(source));
             }
 
-            return new System.Reactive.Integration.WindowsRuntime.EventPatternSource<TSender, TEventArgs>(source, static (h, evt) => h(evt.Sender!, evt.EventArgs));
+            return new System.Reactive.WindowsRuntime.EventPatternSource<TSender, TEventArgs>(source, static (h, evt) => h(evt.Sender!, evt.EventArgs));
         }
     }
 }

+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeObservable.StandardSequenceOperators.cs → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/System.Reactive.Linq/WindowsRuntimeObservable.StandardSequenceOperators.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT License.
 // See the LICENSE file in the project root for more information. 
 
-using System.Reactive.Integration.WindowsRuntime;
+using System.Reactive.WindowsRuntime;
 using Windows.Foundation;
 
 namespace System.Reactive.Linq

+ 0 - 0
Rx.NET/Source/src/System.Reactive.Integration.WindowsRuntime/build/NuGet.Readme.md → Rx.NET/Source/src/System.Reactive.For.WindowsRuntime/build/NuGet.Readme.md


+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.Wpf/DispatcherScheduler.cs → Rx.NET/Source/src/System.Reactive.For.Wpf/DispatcherScheduler.cs

@@ -7,7 +7,7 @@ using System.Reactive.Concurrency;
 using System.Threading;
 using System.Windows.Threading;
 
-namespace System.Reactive.Integration.Wpf
+namespace System.Reactive.Wpf
 {
     /// <summary>
     /// Represents an object that schedules units of work on a <see cref="System.Windows.Threading.Dispatcher"/>.

+ 2 - 2
Rx.NET/Source/src/System.Reactive.Integration.Wpf/Strings_WindowsThreading.Designer.cs → Rx.NET/Source/src/System.Reactive.For.Wpf/Strings_WindowsThreading.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace System.Reactive.Integration.Wpf {
+namespace System.Reactive.Wpf {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace System.Reactive.Integration.Wpf {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Reactive.Integration.Wpf.Strings_WindowsThreading", typeof(Strings_WindowsThreading).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("System.Reactive.For.Wpf.Strings_WindowsThreading", typeof(Strings_WindowsThreading).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

+ 0 - 0
Rx.NET/Source/src/System.Reactive.Integration.Wpf/Strings_WindowsThreading.resx → Rx.NET/Source/src/System.Reactive.For.Wpf/Strings_WindowsThreading.resx


+ 0 - 0
Rx.NET/Source/src/System.Reactive.Integration.Wpf/System.Reactive.Integration.Wpf.csproj → Rx.NET/Source/src/System.Reactive.For.Wpf/System.Reactive.For.Wpf.csproj


+ 1 - 1
Rx.NET/Source/src/System.Reactive.Integration.Wpf/System.Reactive.Linq/WpfDispatcherObservable.cs → Rx.NET/Source/src/System.Reactive.For.Wpf/System.Reactive.Linq/WpfDispatcherObservable.cs

@@ -4,7 +4,7 @@
 
 using System.Windows.Threading;
 
-using DispatcherScheduler = System.Reactive.Integration.Wpf.DispatcherScheduler;
+using DispatcherScheduler = System.Reactive.Wpf.DispatcherScheduler;
 using Synchronization = System.Reactive.Concurrency.Synchronization;
 
 namespace System.Reactive.Linq

+ 0 - 0
Rx.NET/Source/src/System.Reactive.Integration.Wpf/build/NuGet.Readme.md → Rx.NET/Source/src/System.Reactive.For.Wpf/build/NuGet.Readme.md


+ 5 - 5
Rx.NET/Source/src/System.Reactive/Concurrency/ThreadPoolScheduler.Windows.cs

@@ -22,7 +22,7 @@ namespace System.Reactive.Concurrency
         /// <summary>
         /// Constructs a ThreadPoolScheduler that schedules units of work on the Windows ThreadPool.
         /// </summary>
-        [Obsolete("If you require the UWP-specific features of ThreadPoolScheduler use the UwpThreadPoolScheduler in the System.Reactive.Integration.Uwp package. Otherwise, use the Instance property, because this constructor will be removed in a future version (because UWP applications will end up with the same ThreadPoolScheduler as all other application types).")]
+        [Obsolete("If you require the UWP-specific features of ThreadPoolScheduler use the UwpThreadPoolScheduler in the System.Reactive.For.Uwp package. Otherwise, use the Instance property, because this constructor will be removed in a future version (because UWP applications will end up with the same ThreadPoolScheduler as all other application types).")]
         public ThreadPoolScheduler()
         {
         }
@@ -31,7 +31,7 @@ namespace System.Reactive.Concurrency
         /// Constructs a ThreadPoolScheduler that schedules units of work on the Windows ThreadPool with the given priority.
         /// </summary>
         /// <param name="priority">Priority for scheduled units of work.</param>
-        [Obsolete("If you require the UWP-specific features of ThreadPoolScheduler use the UwpThreadPoolScheduler in the System.Reactive.Integration.Uwp package. Otherwise, use the Instance property, because this constructor will be removed in a future version (because UWP applications will end up with the same ThreadPoolScheduler as all other application types).")]
+        [Obsolete("If you require the UWP-specific features of ThreadPoolScheduler use the UwpThreadPoolScheduler in the System.Reactive.For.Uwp package. Otherwise, use the Instance property, because this constructor will be removed in a future version (because UWP applications will end up with the same ThreadPoolScheduler as all other application types).")]
         public ThreadPoolScheduler(WorkItemPriority priority)
         {
             Priority = priority;
@@ -43,7 +43,7 @@ namespace System.Reactive.Concurrency
         /// </summary>
         /// <param name="priority">Priority for scheduled units of work.</param>
         /// <param name="options">Options that configure how work is scheduled.</param>
-        [Obsolete("If you require the UWP-specific features of ThreadPoolScheduler use the UwpThreadPoolScheduler in the System.Reactive.Integration.Uwp package. Otherwise, use the Instance property, because this constructor will be removed in a future version (because UWP applications will end up with the same ThreadPoolScheduler as all other application types).")]
+        [Obsolete("If you require the UWP-specific features of ThreadPoolScheduler use the UwpThreadPoolScheduler in the System.Reactive.For.Uwp package. Otherwise, use the Instance property, because this constructor will be removed in a future version (because UWP applications will end up with the same ThreadPoolScheduler as all other application types).")]
         public ThreadPoolScheduler(WorkItemPriority priority, WorkItemOptions options)
         {
             Priority = priority;
@@ -65,13 +65,13 @@ namespace System.Reactive.Concurrency
         /// <summary>
         /// Gets the priority at which work is scheduled.
         /// </summary>
-        [Obsolete("If you require the UWP-specific features of ThreadPoolScheduler use the UwpThreadPoolScheduler in the System.Reactive.Integration.Uwp package. This property will be removed in a future version (because UWP applications will end up with the same ThreadPoolScheduler as all other application types).")]
+        [Obsolete("If you require the UWP-specific features of ThreadPoolScheduler use the UwpThreadPoolScheduler in the System.Reactive.For.Uwp package. This property will be removed in a future version (because UWP applications will end up with the same ThreadPoolScheduler as all other application types).")]
         public WorkItemPriority Priority { get; }
 
         /// <summary>
         /// Gets the options that configure how work is scheduled.
         /// </summary>
-        [Obsolete("If you require the UWP-specific features of ThreadPoolScheduler use the UwpThreadPoolScheduler in the System.Reactive.Integration.Uwp package. This property will be removed in a future version (because UWP applications will end up with the same ThreadPoolScheduler as all other application types).")]
+        [Obsolete("If you require the UWP-specific features of ThreadPoolScheduler use the UwpThreadPoolScheduler in the System.Reactive.For.Uwp package. This property will be removed in a future version (because UWP applications will end up with the same ThreadPoolScheduler as all other application types).")]
         public WorkItemOptions Options { get; }
 
         /// <summary>

+ 3 - 3
Rx.NET/Source/src/System.Reactive/Platforms/Desktop/Concurrency/ControlScheduler.cs

@@ -9,8 +9,8 @@ using System.Windows.Forms;
 namespace System.Reactive.Concurrency
 {
     /// <summary>
-    /// Obsolete. The <c>System.Reactive.Integration.WindowsForms</c> NuGet package defines a
-    /// <c>ControlScheduler</c> class in the <c>System.Reactive.Integration.WindowsForms</c>
+    /// Obsolete. The <c>System.Reactive.For.WindowsForms</c> NuGet package defines a
+    /// <c>ControlScheduler</c> class in the <c>System.Reactive.WindowsForms</c>
     /// namespace that replaces this class.
     /// </summary>
     /// <remarks>
@@ -19,7 +19,7 @@ namespace System.Reactive.Concurrency
     /// <c>System.Reactive</c> causes applications to end up with dependencies on Windows Forms and
     /// WPF whether they want them or not.
     /// </remarks>
-    [Obsolete("Use System.Reactive.Integration.WindowsForms.ControlScheduler in the System.Reactive.Integration.WindowsForms package instead", error: false)]
+    [Obsolete("Use System.Reactive.WindowsForms.ControlScheduler in the System.Reactive.For.WindowsForms package instead", error: false)]
     public class ControlScheduler : LocalScheduler, ISchedulerPeriodic
     {
         private readonly Control _control;

+ 3 - 3
Rx.NET/Source/src/System.Reactive/Platforms/Desktop/Concurrency/DispatcherScheduler.cs

@@ -9,8 +9,8 @@ using System.Threading;
 namespace System.Reactive.Concurrency
 {
     /// <summary>
-    /// Obsolete. The <c>System.Reactive.Integration.Wpf</c> NuGet package defines a
-    /// <c>DispatcherScheduler</c> class in the <c>System.Reactive.Integration.Wpf</c>
+    /// Obsolete. The <c>System.Reactive.For.Wpf</c> NuGet package defines a
+    /// <c>DispatcherScheduler</c> class in the <c>System.Reactive.Wpf</c>
     /// namespace that replaces this class.
     /// </summary>
     /// <remarks>
@@ -19,7 +19,7 @@ namespace System.Reactive.Concurrency
     /// <c>System.Reactive</c> causes applications to end up with dependencies on Windows Forms and
     /// WPF whether they want them or not.
     /// </remarks>
-    [Obsolete("Use System.Reactive.Integration.Wpf.DispatcherScheduler in the System.Reactive.Integration.Wpf package instead", error: false)]
+    [Obsolete("Use System.Reactive.Wpf.DispatcherScheduler in the System.Reactive.For.Wpf package instead", error: false)]
     public class DispatcherScheduler : LocalScheduler, ISchedulerPeriodic
     {
         /// <summary>

+ 6 - 6
Rx.NET/Source/src/System.Reactive/Platforms/Desktop/Linq/ControlObservable.cs

@@ -8,7 +8,7 @@ using System.Windows.Forms;
 namespace System.Reactive.Linq
 {
     /// <summary>
-    /// Obsolete. The <c>System.Reactive.Integration.WindowsForms</c> NuGet package defines a
+    /// Obsolete. The <c>System.Reactive.For.WindowsForms</c> NuGet package defines a
     /// <c>WindowsFormsControlObservable</c> class that defines new extension methods to be used in
     /// place of these (also in the <c>System.Reactive.Linq</c> namespace).
     /// </summary>
@@ -45,14 +45,14 @@ namespace System.Reactive.Linq
     /// visibly different names (and not the same names on a new type).
     /// </para>
     /// </remarks>
-    [Obsolete("Use the extension methods defined by the System.Reactive.Linq.WindowsFormsControlObservable class in the System.Reactive.Integration.WindowsForms package instead", error: false)]
+    [Obsolete("Use the extension methods defined by the System.Reactive.Linq.WindowsFormsControlObservable class in the System.Reactive.For.WindowsForms package instead", error: false)]
 
     public static class ControlObservable
     {
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnWindowFormsControl</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsFormsControlObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsForms</c> package instead.
+        /// <c>System.Reactive.For.WindowsForms</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -63,7 +63,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the specified control.
         /// In order to invoke observer callbacks on the specified control, e.g. to render results in a control, use <see cref="ObserveOn"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnWindowFormsControl extension method defined by System.Reactive.Linq.WindowsFormsControlObservable in the System.Reactive.Integration.WindowsForms package instead", error: false)]
+        [Obsolete("Use the SubscribeOnWindowFormsControl extension method defined by System.Reactive.Linq.WindowsFormsControlObservable in the System.Reactive.For.WindowsForms package instead", error: false)]
         public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource> source, Control control)
         {
             if (source == null)
@@ -82,14 +82,14 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnWindowsFormsControl</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsFormsControlObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsForms</c> package instead.
+        /// <c>System.Reactive.For.WindowsForms</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
         /// <param name="control">Windows Forms control whose associated message loop is used to notify observers on.</param>
         /// <returns>The source sequence whose observations happen on the Windows Forms message loop associated with the specified control.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="control"/> is null.</exception>
-        [Obsolete("Use the ObserveOnWindowsFormsControl extension method defined by System.Reactive.Linq.WindowsFormsControlObservable in the System.Reactive.Integration.WindowsForms package instead", error: false)]
+        [Obsolete("Use the ObserveOnWindowsFormsControl extension method defined by System.Reactive.Linq.WindowsFormsControlObservable in the System.Reactive.For.WindowsForms package instead", error: false)]
         public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource> source, Control control)
         {
             if (source == null)

+ 30 - 30
Rx.NET/Source/src/System.Reactive/Platforms/Desktop/Linq/DispatcherObservable.cs

@@ -9,7 +9,7 @@ using System.Windows.Threading;
 namespace System.Reactive.Linq
 {
     /// <summary>
-    /// Obsolete. The <c>System.Reactive.Integration.Wpf</c> NuGet package defines a
+    /// Obsolete. The <c>System.Reactive.For.Wpf</c> NuGet package defines a
     /// <c>WpfDispatcherObservable</c> class that defines new extension methods to be used in
     /// place of these (also in the <c>System.Reactive.Linq</c> namespace).
     /// </summary>
@@ -60,7 +60,7 @@ namespace System.Reactive.Linq
     /// visibly different names (and not the same names on a new type).
     /// </para>
     /// </remarks>
-    [Obsolete("Use the extension methods defined by the System.Reactive.Linq.WpfDispatcherObservable class in the System.Reactive.Integration.Wpf package instead", error: false)]
+    [Obsolete("Use the extension methods defined by the System.Reactive.Linq.WpfDispatcherObservable class in the System.Reactive.For.Wpf package instead", error: false)]
     public static class DispatcherObservable
     {
         #region ObserveOn[Dispatcher]
@@ -68,14 +68,14 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
         /// <param name="dispatcher">Dispatcher whose associated message loop is used to notify observers on.</param>
         /// <returns>The source sequence whose observations happen on the specified dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="dispatcher"/> is null.</exception>
-        [Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource> source, Dispatcher dispatcher)
         {
             if (source == null)
@@ -94,7 +94,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -102,7 +102,7 @@ namespace System.Reactive.Linq
         /// <param name="priority">Priority to schedule work items at.</param>
         /// <returns>The source sequence whose observations happen on the specified dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="dispatcher"/> is null.</exception>
-        [Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource> source, Dispatcher dispatcher, DispatcherPriority priority)
         {
             if (source == null)
@@ -121,14 +121,14 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
         /// <param name="scheduler">Dispatcher scheduler to notify observers on.</param>
         /// <returns>The source sequence whose observations happen on the specified dispatcher scheduler.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="scheduler"/> is null.</exception>
-        [Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource> source, DispatcherScheduler scheduler)
         {
             if (source == null)
@@ -147,14 +147,14 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
         /// <param name="dispatcherObject">Object to get the dispatcher from.</param>
         /// <returns>The source sequence whose observations happen on the specified object's dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="dispatcherObject"/> is null.</exception>
-        [Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource> source, DispatcherObject dispatcherObject)
         {
             if (source == null)
@@ -173,7 +173,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -181,7 +181,7 @@ namespace System.Reactive.Linq
         /// <param name="priority">Priority to schedule work items at.</param>
         /// <returns>The source sequence whose observations happen on the specified object's dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="dispatcherObject"/> is null.</exception>
-        [Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource> source, DispatcherObject dispatcherObject, DispatcherPriority priority)
         {
             if (source == null)
@@ -200,13 +200,13 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnCurrentWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
         /// <returns>The source sequence whose observations happen on the current thread's dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-        [Obsolete("Use the ObserveOnCurrentWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the ObserveOnCurrentWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> ObserveOnDispatcher<TSource>(this IObservable<TSource> source)
         {
             if (source == null)
@@ -220,14 +220,14 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnCurrentWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
         /// <param name="priority">Priority to schedule work items at.</param>
         /// <returns>The source sequence whose observations happen on the current thread's dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-        [Obsolete("Use the ObserveOnCurrentWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the ObserveOnCurrentWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> ObserveOnDispatcher<TSource>(this IObservable<TSource> source, DispatcherPriority priority)
         {
             if (source == null)
@@ -256,7 +256,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -267,7 +267,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the specified dispatcher.
         /// In order to invoke observer callbacks on the specified dispatcher, e.g. to render results in a control, use <see cref="DispatcherObservable.ObserveOn{TSource}(IObservable{TSource}, Dispatcher)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource> source, Dispatcher dispatcher)
         {
             if (source == null)
@@ -286,7 +286,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -298,7 +298,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the specified dispatcher.
         /// In order to invoke observer callbacks on the specified dispatcher, e.g. to render results in a control, use <see cref="DispatcherObservable.ObserveOn{TSource}(IObservable{TSource}, Dispatcher, DispatcherPriority)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource> source, Dispatcher dispatcher, DispatcherPriority priority)
         {
             if (source == null)
@@ -317,7 +317,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -328,7 +328,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the specified scheduler.
         /// In order to invoke observer callbacks on the specified scheduler, e.g. to render results in a control, use <see cref="DispatcherObservable.ObserveOn{TSource}(IObservable{TSource}, DispatcherScheduler)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource> source, DispatcherScheduler scheduler)
         {
             if (source == null)
@@ -347,7 +347,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -358,7 +358,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the dispatcher associated with the specified object.
         /// In order to invoke observer callbacks on the dispatcher associated with the specified object, e.g. to render results in a control, use <see cref="DispatcherObservable.ObserveOn{TSource}(IObservable{TSource}, DispatcherObject)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource> source, DispatcherObject dispatcherObject)
         {
             if (source == null)
@@ -377,7 +377,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -389,7 +389,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the dispatcher associated with the specified object.
         /// In order to invoke observer callbacks on the dispatcher associated with the specified object, e.g. to render results in a control, use <see cref="DispatcherObservable.ObserveOn{TSource}(IObservable{TSource}, DispatcherObject, DispatcherPriority)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource> source, DispatcherObject dispatcherObject, DispatcherPriority priority)
         {
             if (source == null)
@@ -408,7 +408,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnCurrentWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -418,7 +418,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the dispatcher associated with the current thread.
         /// In order to invoke observer callbacks on the dispatcher associated with the current thread, e.g. to render results in a control, use <see cref="DispatcherObservable.ObserveOnDispatcher{TSource}(IObservable{TSource})"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnCurrentWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the SubscribeOnCurrentWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> SubscribeOnDispatcher<TSource>(this IObservable<TSource> source)
         {
             if (source == null)
@@ -432,7 +432,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnCurrentWpfDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WpfDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.Wpf</c> package instead.
+        /// <c>System.Reactive.For.Wpf</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -443,7 +443,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the dispatcher associated with the current thread.
         /// In order to invoke observer callbacks on the dispatcher associated with the current thread, e.g. to render results in a control, use <see cref="DispatcherObservable.ObserveOnDispatcher{TSource}(IObservable{TSource}, DispatcherPriority)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnCurrentWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", error: false)]
+        [Obsolete("Use the SubscribeOnCurrentWpfDispatcher extension method defined by System.Reactive.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", error: false)]
         public static IObservable<TSource> SubscribeOnDispatcher<TSource>(this IObservable<TSource> source, DispatcherPriority priority)
         {
             if (source == null)

+ 3 - 3
Rx.NET/Source/src/System.Reactive/Platforms/UWP/Concurrency/CoreDispatcherScheduler.cs

@@ -12,8 +12,8 @@ using Windows.UI.Core;
 namespace System.Reactive.Concurrency
 {
     /// <summary>
-    /// Obsolete. The <c>System.Reactive.Integration.WindowsForms</c> NuGet package defines a
-    /// <c>ControlScheduler</c> class in the <c>System.Reactive.Integration.WindowsForms</c>
+    /// Obsolete. The <c>System.Reactive.For.WindowsRuntime</c> NuGet package defines a
+    /// <c>CoreDispatcherScheduler</c> class in the <c>System.Reactive.WindowsForms</c>
     /// namespace that replaces this class.
     /// </summary>
     /// <remarks>
@@ -22,7 +22,7 @@ namespace System.Reactive.Concurrency
     /// <c>System.Reactive</c> causes applications to end up with dependencies on Windows Forms and
     /// WPF whether they want them or not.
     /// </remarks>
-    [Obsolete("Use System.Reactive.Integration.WindowsRuntime.CoreDispatcherScheduler in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+    [Obsolete("Use System.Reactive.WindowsRuntime.CoreDispatcherScheduler in the System.Reactive.For.WindowsRuntime package instead", error: false)]
     [CLSCompliant(false)]
     public sealed class CoreDispatcherScheduler : LocalScheduler, ISchedulerPeriodic
     {

+ 4 - 4
Rx.NET/Source/src/System.Reactive/Platforms/UWP/Foundation/AsyncInfoExtensions.cs

@@ -10,19 +10,19 @@ namespace System.Reactive.Windows.Foundation
 {
     /// <summary>
     /// Obsolete. Use the <c>AsyncInfoObservableExtensions</c> class in the
-    /// <c>System.Reactive.Integration.WindowsRuntime</c> namespace in the
-    /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+    /// <c>System.Reactive.WindowsRuntime</c> namespace in the
+    /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
     /// </summary>
     /// <remarks>
     /// <para>
     /// Since this obsolete class is the only public type in the <c>System.Reactive.Windows.Foundation</c>
     /// namespace, existing code will normally need only to replace a using directive of
     /// <c>using System.Reactive.Windows.Foundation;</c> with
-    /// <c>using System.Reactive.Integration.WindowsRuntime;</c>.
+    /// <c>using System.Reactive.WindowsRuntime;</c>.
     /// </para>
     /// </remarks>
     [CLSCompliant(false)]
-    [Obsolete("Use the System.Reactive.Integration.WindowsRuntime.AsyncInfoObservableExtensions class in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+    [Obsolete("Use the System.Reactive.WindowsRuntime.AsyncInfoObservableExtensions class in the System.Reactive.For.WindowsRuntime package instead", error: false)]
     public static class AsyncInfoObservableExtensions
     {
         #region IAsyncAction and IAsyncActionWithProgress

+ 5 - 5
Rx.NET/Source/src/System.Reactive/Platforms/UWP/IEventPatternSource.cs

@@ -8,8 +8,8 @@ using Windows.Foundation;
 namespace System.Reactive
 {
     /// <summary>
-    /// Obsolete. The <c>System.Reactive.Integration.WindowsRuntime</c> NuGet package defines an
-    /// <c>ITypedEventPatternSource</c> class that should be used instead.
+    /// Obsolete. The <c>System.Reactive.For.WindowsRuntime</c> NuGet package defines an
+    /// <c>ITypedEventPatternSource</c> interface that should be used instead.
     /// </summary>
     /// <typeparam name="TSender">Sender type.</typeparam>
     /// <typeparam name="TEventArgs">Event arguments type.</typeparam>
@@ -22,7 +22,7 @@ namespace System.Reactive
     /// </para>
     /// <para>
     /// The replacement type is not just in a different package and namespace. Its name has been
-    /// changed. There are two reasons.
+    /// changed to <c>ITypedEventPatternSource</c>. There are two reasons.
     /// </para>
     /// <para>
     /// First, the choice of name and namespace implied, wrongly, that this was a general purpose
@@ -42,7 +42,7 @@ namespace System.Reactive
     /// other reasons. This could make it difficult for code to move cleanly onto the new
     /// definition for as long as the old one remains present in <c>Obsolete</c> form, because it
     /// might not always be possible to replace <c>using System.Reactive;</c> with, say,
-    /// <c>using System.Reactive.Integration.WindowsRuntime;</c>
+    /// <c>using System.Reactive.WindowsRuntime;</c>
     /// </para>
     /// <para>
     /// The main reason for pushing such code out into separate packages is to avoid a problem in
@@ -66,7 +66,7 @@ namespace System.Reactive
     /// </para>
     /// </remarks>
     [CLSCompliant(false)]
-    [Obsolete("Use the System.Reactive.Integration.WindowsRuntime.IEventPatternSource interface in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+    [Obsolete("Use the System.Reactive.WindowsRuntime.ITypedEventPatternSource interface in the System.Reactive.For.WindowsRuntime package instead", error: false)]
     public interface IEventPatternSource<TSender, TEventArgs>
     {
         /// <summary>

+ 16 - 16
Rx.NET/Source/src/System.Reactive/Platforms/UWP/Linq/AsyncInfoObservable.cs

@@ -12,7 +12,7 @@ using Windows.Foundation;
 namespace System.Reactive.Linq
 {
     /// <summary>
-    /// Obsolete. The <c>System.Reactive.Integration.WindowsRuntime</c> NuGet package defines a
+    /// Obsolete. The <c>System.Reactive.For.WindowsRuntime</c> NuGet package defines a
     /// <c>WindowsRuntimeAsyncInfoObservable</c> class that defines new extension methods to be used in
     /// place of these (also in the <c>System.Reactive.Linq</c> namespace).
     /// </summary>
@@ -79,7 +79,7 @@ namespace System.Reactive.Linq
     /// former even when running on Windows.
     /// </para>
     /// </remarks>
-    [Obsolete("Use the extension methods defined by the System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable class in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+    [Obsolete("Use the extension methods defined by the System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable class in the System.Reactive.For.WindowsRuntime package instead", error: false)]
     [CLSCompliant(false)]
     public static class AsyncInfoObservable
     {
@@ -87,13 +87,13 @@ namespace System.Reactive.Linq
 
         /// <summary>
         /// Obsolete. Use the <c>WindowsRuntimeAsyncInfoObservable.ToIAsyncAction</c> method in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence to expose as an asynchronous action.</param>
         /// <returns>Windows Runtime asynchronous action object representing the completion of the observable sequence.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-        [Obsolete("Use the ToIAsyncAction extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ToIAsyncAction extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IAsyncAction ToAsyncAction<TSource>(this IObservable<TSource> source)
         {
             if (source == null)
@@ -108,13 +108,13 @@ namespace System.Reactive.Linq
 
         /// <summary>
         /// Obsolete. Use the <c>WindowsRuntimeAsyncInfoObservable.ToIAsyncActionWithProgress</c>
-        /// method in the <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// method in the <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence to expose as an asynchronous action.</param>
         /// <returns>Windows Runtime asynchronous action object representing the completion of the observable sequence, reporting incremental progress for each source sequence element.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-        [Obsolete("Use the ToIAsyncActionWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ToIAsyncActionWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IAsyncActionWithProgress<int> ToAsyncActionWithProgress<TSource>(this IObservable<TSource> source)
         {
             if (source == null)
@@ -131,7 +131,7 @@ namespace System.Reactive.Linq
 
         /// <summary>
         /// Obsolete. Use the <c>WindowsRuntimeAsyncInfoObservable.ToIAsyncActionWithProgress</c>
-        /// method in the <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// method in the <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <typeparam name="TProgress">The type of the elements in the progress sequence.</typeparam>
@@ -139,7 +139,7 @@ namespace System.Reactive.Linq
         /// <param name="progressSelector">Selector function to map the source sequence on a progress reporting sequence.</param>
         /// <returns>Windows Runtime asynchronous action object representing the completion of the result sequence, reporting progress computed through the progress sequence.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="progressSelector"/> is null.</exception>
-        [Obsolete("Use the ToIAsyncActionWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ToIAsyncActionWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IAsyncActionWithProgress<TProgress> ToAsyncActionWithProgress<TSource, TProgress>(this IObservable<TSource> source, Func<IObservable<TSource>, IObservable<TProgress>> progressSelector)
         {
             if (source == null)
@@ -177,13 +177,13 @@ namespace System.Reactive.Linq
 
         /// <summary>
         /// Obsolete. Use the <c>WindowsRuntimeAsyncInfoObservable.ToAsyncOperation</c> method in
-        /// the <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// the <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence to expose as an asynchronous operation.</param>
         /// <returns>Windows Runtime asynchronous operation object that returns the last element of the observable sequence.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-        [Obsolete("Use the ToIAsyncOperation extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ToIAsyncOperation extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IAsyncOperation<TSource> ToAsyncOperation<TSource>(this IObservable<TSource> source)
         {
             if (source == null)
@@ -196,13 +196,13 @@ namespace System.Reactive.Linq
 
         /// <summary>
         /// Obsolete. Use the <c>WindowsRuntimeAsyncInfoObservable.ToIAsyncOperationWithProgress</c>
-        /// method in the <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// method in the <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence to expose as an asynchronous operation.</param>
         /// <returns>Windows Runtime asynchronous operation object that returns the last element of the observable sequence, reporting incremental progress for each source sequence element.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-        [Obsolete("Use the ToIAsyncOperationWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ToIAsyncOperationWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IAsyncOperationWithProgress<TSource, int> ToAsyncOperationWithProgress<TSource>(this IObservable<TSource> source)
         {
             if (source == null)
@@ -221,7 +221,7 @@ namespace System.Reactive.Linq
 
         /// <summary>
         /// Obsolete. Use the <c>WindowsRuntimeAsyncInfoObservable.ToIAsyncOperationWithProgress</c>
-        /// method in the <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// method in the <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <typeparam name="TResult">The type of the elements in the result sequence.</typeparam>
@@ -229,7 +229,7 @@ namespace System.Reactive.Linq
         /// <param name="resultSelector">Selector function to map the source sequence on a result sequence.</param>
         /// <returns>Windows Runtime asynchronous operation object that returns the last element of the result sequence, reporting incremental progress for each source sequence element.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="resultSelector"/> is null.</exception>
-        [Obsolete("Use the ToIAsyncOperationWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ToIAsyncOperationWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IAsyncOperationWithProgress<TResult, int> ToAsyncOperationWithProgress<TSource, TResult>(this IObservable<TSource> source, Func<IObservable<TSource>, IObservable<TResult>> resultSelector)
         {
             if (source == null)
@@ -251,7 +251,7 @@ namespace System.Reactive.Linq
 
         /// <summary>
         /// Obsolete. Use the <c>WindowsRuntimeAsyncInfoObservable.ToIAsyncOperationWithProgress</c>
-        /// method in the <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// method in the <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <typeparam name="TResult">The type of the elements in the result sequence.</typeparam>
@@ -261,7 +261,7 @@ namespace System.Reactive.Linq
         /// <param name="progressSelector">Selector function to map the source sequence on a progress reporting sequence.</param>
         /// <returns>Windows Runtime asynchronous operation object that returns the last element of the result sequence, reporting progress computed through the progress sequence.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="resultSelector"/> or <paramref name="progressSelector"/> is null.</exception>
-        [Obsolete("Use the ToIAsyncOperationWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ToIAsyncOperationWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeAsyncInfoObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IAsyncOperationWithProgress<TResult, TProgress> ToAsyncOperationWithProgress<TSource, TResult, TProgress>(this IObservable<TSource> source, Func<IObservable<TSource>, IObservable<TResult>> resultSelector, Func<IObservable<TSource>, IObservable<TProgress>> progressSelector)
         {
             if (source == null)

+ 26 - 26
Rx.NET/Source/src/System.Reactive/Platforms/UWP/Linq/CoreDispatcherObservable.cs

@@ -13,7 +13,7 @@ using Windows.UI.Xaml;
 namespace System.Reactive.Linq
 {
     /// <summary>
-    /// Obsolete. The <c>System.Reactive.Integration.WindowsRuntime</c> NuGet package defines a
+    /// Obsolete. The <c>System.Reactive.For.WindowsRuntime</c> NuGet package defines a
     /// <c>WindowsRuntimeCoreDispatcherObservable</c> class that defines new extension methods to
     /// be used in place of these (also in the <c>System.Reactive.Linq</c> namespace).
     /// </summary>
@@ -70,7 +70,7 @@ namespace System.Reactive.Linq
     /// </para>
     /// </remarks>
     [CLSCompliant(false)]
-    [Obsolete("Use the extension methods defined by the System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable class in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+    [Obsolete("Use the extension methods defined by the System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable class in the System.Reactive.For.WindowsRuntime package instead", error: false)]
     public static class CoreDispatcherObservable
     {
         #region ObserveOn[CoreDispatcher]
@@ -78,14 +78,14 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
         /// <param name="dispatcher">Dispatcher whose associated message loop is used to notify observers on.</param>
         /// <returns>The source sequence whose observations happen on the specified dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="dispatcher"/> is null.</exception>
-        [Obsolete("Use the ObserveOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ObserveOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource> source, CoreDispatcher dispatcher)
         {
             if (source == null)
@@ -104,7 +104,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -112,7 +112,7 @@ namespace System.Reactive.Linq
         /// <param name="priority">Priority to schedule work items at.</param>
         /// <returns>The source sequence whose observations happen on the specified dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="dispatcher"/> is null.</exception>
-        [Obsolete("Use the ObserveOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ObserveOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource> source, CoreDispatcher dispatcher, CoreDispatcherPriority priority)
         {
             if (source == null)
@@ -132,14 +132,14 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
         /// <param name="dependencyObject">Object to get the dispatcher from.</param>
         /// <returns>The source sequence whose observations happen on the specified object's dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="dependencyObject"/> is null.</exception>
-        [Obsolete("Use the ObserveOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ObserveOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource> source, DependencyObject dependencyObject)
         {
             if (source == null)
@@ -158,7 +158,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -166,7 +166,7 @@ namespace System.Reactive.Linq
         /// <param name="priority">Priority to schedule work items at.</param>
         /// <returns>The source sequence whose observations happen on the specified object's dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="dependencyObject"/> is null.</exception>
-        [Obsolete("Use the ObserveOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ObserveOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> ObserveOn<TSource>(this IObservable<TSource> source, DependencyObject dependencyObject, CoreDispatcherPriority priority)
         {
             if (source == null)
@@ -185,13 +185,13 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnCurrentWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
         /// <returns>The source sequence whose observations happen on the current window's dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-        [Obsolete("Use the ObserveOnCurrentWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ObserveOnCurrentWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> ObserveOnCoreDispatcher<TSource>(this IObservable<TSource> source)
         {
             if (source == null)
@@ -205,14 +205,14 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>ObserveOnCurrentWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
         /// <param name="priority">Priority to schedule work items at.</param>
         /// <returns>The source sequence whose observations happen on the current window's dispatcher.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-        [Obsolete("Use the ObserveOnCurrentWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ObserveOnCurrentWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> ObserveOnDispatcher<TSource>(this IObservable<TSource> source, CoreDispatcherPriority priority)
         {
             if (source == null)
@@ -230,7 +230,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -241,7 +241,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the specified dispatcher.
         /// In order to invoke observer callbacks on the specified dispatcher, e.g. to render results in a control, use <see cref="CoreDispatcherObservable.ObserveOn{TSource}(IObservable{TSource}, CoreDispatcher)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the SubscribeOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource> source, CoreDispatcher dispatcher)
         {
             if (source == null)
@@ -260,7 +260,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -272,7 +272,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the specified dispatcher.
         /// In order to invoke observer callbacks on the specified dispatcher, e.g. to render results in a control, use <see cref="CoreDispatcherObservable.ObserveOn{TSource}(IObservable{TSource}, CoreDispatcher, CoreDispatcherPriority)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the SubscribeOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource> source, CoreDispatcher dispatcher, CoreDispatcherPriority priority)
         {
             if (source == null)
@@ -292,7 +292,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -303,7 +303,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the dispatcher associated with the specified object.
         /// In order to invoke observer callbacks on the dispatcher associated with the specified object, e.g. to render results in a control, use <see cref="CoreDispatcherObservable.ObserveOn{TSource}(IObservable{TSource}, DependencyObject)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the SubscribeOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource> source, DependencyObject dependencyObject)
         {
             if (source == null)
@@ -322,7 +322,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -334,7 +334,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the dispatcher associated with the specified object.
         /// In order to invoke observer callbacks on the dispatcher associated with the specified object, e.g. to render results in a control, use <see cref="CoreDispatcherObservable.ObserveOn{TSource}(IObservable{TSource}, DependencyObject, CoreDispatcherPriority)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the SubscribeOnWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> SubscribeOn<TSource>(this IObservable<TSource> source, DependencyObject dependencyObject, CoreDispatcherPriority priority)
         {
             if (source == null)
@@ -354,7 +354,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnCurrentWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -364,7 +364,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the dispatcher associated with the current window.
         /// In order to invoke observer callbacks on the dispatcher associated with the current window, e.g. to render results in a control, use <see cref="CoreDispatcherObservable.ObserveOnCoreDispatcher{TSource}(IObservable{TSource})"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnCurrentWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the SubscribeOnCurrentWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> SubscribeOnCoreDispatcher<TSource>(this IObservable<TSource> source)
         {
             if (source == null)
@@ -378,7 +378,7 @@ namespace System.Reactive.Linq
         /// <summary>
         /// Obsolete. Use the <c>SubscribeOnCurrentWindowsRuntimeCoreDispatcher</c> extension method defined by
         /// <c>System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable</c> in the
-        /// <c>System.Reactive.Integration.WindowsRuntime</c> package instead.
+        /// <c>System.Reactive.For.WindowsRuntime</c> package instead.
         /// </summary>
         /// <typeparam name="TSource">The type of the elements in the source sequence.</typeparam>
         /// <param name="source">Source sequence.</param>
@@ -389,7 +389,7 @@ namespace System.Reactive.Linq
         /// Only the side-effects of subscribing to the source sequence and disposing subscriptions to the source sequence are run on the dispatcher associated with the current window.
         /// In order to invoke observer callbacks on the dispatcher associated with the current window, e.g. to render results in a control, use <see cref="CoreDispatcherObservable.ObserveOnDispatcher{TSource}(IObservable{TSource}, CoreDispatcherPriority)"/>.
         /// </remarks>
-        [Obsolete("Use the SubscribeOnCurrentWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the SubscribeOnCurrentWindowsRuntimeCoreDispatcher extension method defined by System.Reactive.Linq.WindowsRuntimeCoreDispatcherObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TSource> SubscribeOnDispatcher<TSource>(this IObservable<TSource> source, CoreDispatcherPriority priority)
         {
             if (source == null)

+ 5 - 5
Rx.NET/Source/src/System.Reactive/Platforms/UWP/Linq/WindowsObservable.Events.cs

@@ -8,7 +8,7 @@ using Windows.Foundation;
 namespace System.Reactive.Linq
 {
     /// <summary>
-    /// Obsolete. The <c>System.Reactive.Integration.WindowsRuntime</c> NuGet package defines a
+    /// Obsolete. The <c>System.Reactive.For.WindowsRuntime</c> NuGet package defines a
     /// <c>WindowsRuntimeObservable</c> class (also in the <c>System.Reactive.Linq</c> namespace)
     /// to use instead.
     /// </summary>
@@ -75,7 +75,7 @@ namespace System.Reactive.Linq
     /// former even when running on Windows.
     /// </para>
        /// </remarks>
-    [Obsolete("Use the System.Reactive.Linq.WindowsRuntimeObservable class in the System.Reactive.Integration.WindowsRuntime instead", error: false)]
+    [Obsolete("Use the System.Reactive.Linq.WindowsRuntimeObservable class in the System.Reactive.For.WindowsRuntime instead", error: false)]
     [CLSCompliant(false)]
     public static partial class WindowsObservable
     {
@@ -89,7 +89,7 @@ namespace System.Reactive.Linq
         /// <returns>The observable sequence that contains data representations of invocations of the underlying typed event.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="addHandler"/> or <paramref name="removeHandler"/> is null.</exception>
         /// <seealso cref="ToEventPattern"/>
-        [Obsolete("Use the FromEventPattern method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the FromEventPattern method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<EventPattern<TSender, TResult>> FromEventPattern<TSender, TResult>(Action<TypedEventHandler<TSender, TResult>> addHandler, Action<TypedEventHandler<TSender, TResult>> removeHandler)
         {
             if (addHandler == null)
@@ -130,7 +130,7 @@ namespace System.Reactive.Linq
         /// <returns>The observable sequence that contains data representations of invocations of the underlying typed event.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="conversion"/> or <paramref name="addHandler"/> or <paramref name="removeHandler"/> is null.</exception>
         /// <seealso cref="ToEventPattern"/>
-        [Obsolete("Use the FromEventPattern method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the FromEventPattern method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<EventPattern<TSender, TResult>> FromEventPattern<TDelegate, TSender, TResult>(Func<TypedEventHandler<TSender, TResult>, TDelegate> conversion, Action<TDelegate> addHandler, Action<TDelegate> removeHandler)
         {
             if (conversion == null)
@@ -172,7 +172,7 @@ namespace System.Reactive.Linq
         /// <param name="source">Observable source sequence.</param>
         /// <returns>The event source object.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> is null.</exception>
-        [Obsolete("Use the ToWindowsFoundationEventPattern extension method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the ToWindowsFoundationEventPattern extension method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IEventPatternSource<TSender, TEventArgs> ToEventPattern<TSender, TEventArgs>(this IObservable<EventPattern<TSender, TEventArgs>> source)
         {
             if (source == null)

+ 4 - 4
Rx.NET/Source/src/System.Reactive/Platforms/UWP/Linq/WindowsObservable.StandardSequenceOperators.cs

@@ -20,7 +20,7 @@ namespace System.Reactive.Linq
         /// <returns>An observable sequence whose elements are the result of the asynchronous operations executed for each element of the input sequence.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="selector"/> is null.</exception>
         /// <remarks>This overload supports composition of observable sequences and Windows Runtime asynchronous operations, without requiring manual conversion of the asynchronous operations to observable sequences using <see cref="AsyncInfoObservableExtensions.ToObservable{TResult}(IAsyncOperation{TResult})"/>.</remarks>
-        [Obsolete("Use the SelectManyIAsyncOperation extension method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the SelectManyIAsyncOperation extension method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TResult> SelectMany<TSource, TResult>(this IObservable<TSource> source, Func<TSource, IAsyncOperation<TResult>> selector)
         {
             if (source == null)
@@ -47,7 +47,7 @@ namespace System.Reactive.Linq
         /// <returns>An observable sequence whose elements are the result of the asynchronous operations executed for each element of the input sequence.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="selector"/> is null.</exception>
         /// <remarks>This overload supports composition of observable sequences and Windows Runtime asynchronous operations, without requiring manual conversion of the asynchronous operations to observable sequences using <see cref="AsyncInfoObservableExtensions.ToObservable{TResult}(IAsyncOperation{TResult})"/>.</remarks>
-        [Obsolete("Use the SelectManyIAsyncOperationWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the SelectManyIAsyncOperationWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TResult> SelectMany<TSource, TResult, TProgress>(this IObservable<TSource> source, Func<TSource, IAsyncOperationWithProgress<TResult, TProgress>> selector)
         {
             if (source == null)
@@ -75,7 +75,7 @@ namespace System.Reactive.Linq
         /// <returns>An observable sequence whose elements are the result of obtaining an asynchronous operation for each element of the input sequence and then mapping the asynchronous operation's result and its corresponding source element to a result element.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="asyncOperationSelector"/> or <paramref name="resultSelector"/> is null.</exception>
         /// <remarks>This overload supports using LINQ query comprehension syntax in C# and Visual Basic to compose observable sequences and Windows Runtime asynchronous operations, without requiring manual conversion of the asynchronous operations to observable sequences using <see cref="AsyncInfoObservableExtensions.ToObservable{TResult}(IAsyncOperation{TResult})"/>.</remarks>
-        [Obsolete("Use the SelectManyIAsyncOperation extension method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the SelectManyIAsyncOperation extension method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TResult> SelectMany<TSource, TAsyncOperationResult, TResult>(this IObservable<TSource> source, Func<TSource, IAsyncOperation<TAsyncOperationResult>> asyncOperationSelector, Func<TSource, TAsyncOperationResult, TResult> resultSelector)
         {
             if (source == null)
@@ -109,7 +109,7 @@ namespace System.Reactive.Linq
         /// <returns>An observable sequence whose elements are the result of obtaining an asynchronous operation for each element of the input sequence and then mapping the asynchronous operation's result and its corresponding source element to a result element.</returns>
         /// <exception cref="ArgumentNullException"><paramref name="source"/> or <paramref name="asyncOperationSelector"/> or <paramref name="resultSelector"/> is null.</exception>
         /// <remarks>This overload supports using LINQ query comprehension syntax in C# and Visual Basic to compose observable sequences and Windows Runtime asynchronous operations, without requiring manual conversion of the asynchronous operations to observable sequences using <see cref="AsyncInfoObservableExtensions.ToObservable{TResult}(IAsyncOperation{TResult})"/>.</remarks>
-        [Obsolete("Use the SelectManyIAsyncOperationWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.Integration.WindowsRuntime package instead", error: false)]
+        [Obsolete("Use the SelectManyIAsyncOperationWithProgress extension method defined by System.Reactive.Linq.WindowsRuntimeObservable in the System.Reactive.For.WindowsRuntime package instead", error: false)]
         public static IObservable<TResult> SelectMany<TSource, TAsyncOperationResult, TAsyncOperationProgress, TResult>(this IObservable<TSource> source, Func<TSource, IAsyncOperationWithProgress<TAsyncOperationResult, TAsyncOperationProgress>> asyncOperationSelector, Func<TSource, TAsyncOperationResult, TResult> resultSelector)
         {
             if (source == null)

+ 24 - 29
Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Core.verified.cs

@@ -237,8 +237,8 @@ namespace System.Reactive.Concurrency
         public void Wait(System.Action action) { }
         public void Wait<TState>(TState state, System.Action<TState> action) { }
     }
-    [System.Obsolete("Use System.Reactive.Integration.WindowsForms.ControlScheduler in the System.React" +
-        "ive.Integration.WindowsForms package instead", false)]
+    [System.Obsolete("Use System.Reactive.WindowsForms.ControlScheduler in the System.Reactive.For.Wind" +
+        "owsForms package instead", false)]
     public class ControlScheduler : System.Reactive.Concurrency.LocalScheduler, System.Reactive.Concurrency.ISchedulerPeriodic
     {
         public ControlScheduler(System.Windows.Forms.Control control) { }
@@ -264,8 +264,8 @@ namespace System.Reactive.Concurrency
         public override System.IDisposable Schedule<TState>(TState state, System.TimeSpan dueTime, System.Func<System.Reactive.Concurrency.IScheduler, TState, System.IDisposable> action) { }
         public System.IDisposable SchedulePeriodic<TState>(TState state, System.TimeSpan period, System.Func<TState, TState> action) { }
     }
-    [System.Obsolete("Use System.Reactive.Integration.Wpf.DispatcherScheduler in the System.Reactive.In" +
-        "tegration.Wpf package instead", false)]
+    [System.Obsolete("Use System.Reactive.Wpf.DispatcherScheduler in the System.Reactive.For.Wpf packag" +
+        "e instead", false)]
     public class DispatcherScheduler : System.Reactive.Concurrency.LocalScheduler, System.Reactive.Concurrency.ISchedulerPeriodic
     {
         public DispatcherScheduler(System.Windows.Threading.Dispatcher dispatcher) { }
@@ -835,68 +835,63 @@ namespace System.Reactive.Joins
 namespace System.Reactive.Linq
 {
     [System.Obsolete("Use the extension methods defined by the System.Reactive.Linq.WindowsFormsControl" +
-        "Observable class in the System.Reactive.Integration.WindowsForms package instead" +
-        "", false)]
+        "Observable class in the System.Reactive.For.WindowsForms package instead", false)]
     public static class ControlObservable
     {
         [System.Obsolete("Use the ObserveOnWindowsFormsControl extension method defined by System.Reactive." +
-            "Linq.WindowsFormsControlObservable in the System.Reactive.Integration.WindowsFor" +
-            "ms package instead", false)]
+            "Linq.WindowsFormsControlObservable in the System.Reactive.For.WindowsForms packa" +
+            "ge instead", false)]
         public static System.IObservable<TSource> ObserveOn<TSource>(this System.IObservable<TSource> source, System.Windows.Forms.Control control) { }
         [System.Obsolete("Use the SubscribeOnWindowFormsControl extension method defined by System.Reactive" +
-            ".Linq.WindowsFormsControlObservable in the System.Reactive.Integration.WindowsFo" +
-            "rms package instead", false)]
+            ".Linq.WindowsFormsControlObservable in the System.Reactive.For.WindowsForms pack" +
+            "age instead", false)]
         public static System.IObservable<TSource> SubscribeOn<TSource>(this System.IObservable<TSource> source, System.Windows.Forms.Control control) { }
     }
     [System.Obsolete("Use the extension methods defined by the System.Reactive.Linq.WpfDispatcherObserv" +
-        "able class in the System.Reactive.Integration.Wpf package instead", false)]
+        "able class in the System.Reactive.For.Wpf package instead", false)]
     public static class DispatcherObservable
     {
         [System.Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.W" +
-            "pfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", false)]
+            "pfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> ObserveOn<TSource>(this System.IObservable<TSource> source, System.Reactive.Concurrency.DispatcherScheduler scheduler) { }
         [System.Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.W" +
-            "pfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", false)]
+            "pfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> ObserveOn<TSource>(this System.IObservable<TSource> source, System.Windows.Threading.Dispatcher dispatcher) { }
         [System.Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.W" +
-            "pfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", false)]
+            "pfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> ObserveOn<TSource>(this System.IObservable<TSource> source, System.Windows.Threading.DispatcherObject dispatcherObject) { }
         [System.Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.W" +
-            "pfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", false)]
+            "pfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> ObserveOn<TSource>(this System.IObservable<TSource> source, System.Windows.Threading.Dispatcher dispatcher, System.Windows.Threading.DispatcherPriority priority) { }
         [System.Obsolete("Use the ObserveOnWpfDispatcher extension method defined by System.Reactive.Linq.W" +
-            "pfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", false)]
+            "pfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> ObserveOn<TSource>(this System.IObservable<TSource> source, System.Windows.Threading.DispatcherObject dispatcherObject, System.Windows.Threading.DispatcherPriority priority) { }
         [System.Obsolete("Use the ObserveOnCurrentWpfDispatcher extension method defined by System.Reactive" +
-            ".Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package ins" +
-            "tead", false)]
+            ".Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> ObserveOnDispatcher<TSource>(this System.IObservable<TSource> source) { }
         [System.Obsolete("Use the ObserveOnCurrentWpfDispatcher extension method defined by System.Reactive" +
-            ".Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package ins" +
-            "tead", false)]
+            ".Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> ObserveOnDispatcher<TSource>(this System.IObservable<TSource> source, System.Windows.Threading.DispatcherPriority priority) { }
         [System.Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq" +
-            ".WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", false)]
+            ".WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> SubscribeOn<TSource>(this System.IObservable<TSource> source, System.Reactive.Concurrency.DispatcherScheduler scheduler) { }
         [System.Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq" +
-            ".WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", false)]
+            ".WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> SubscribeOn<TSource>(this System.IObservable<TSource> source, System.Windows.Threading.Dispatcher dispatcher) { }
         [System.Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq" +
-            ".WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", false)]
+            ".WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> SubscribeOn<TSource>(this System.IObservable<TSource> source, System.Windows.Threading.DispatcherObject dispatcherObject) { }
         [System.Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq" +
-            ".WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", false)]
+            ".WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> SubscribeOn<TSource>(this System.IObservable<TSource> source, System.Windows.Threading.Dispatcher dispatcher, System.Windows.Threading.DispatcherPriority priority) { }
         [System.Obsolete("Use the SubscribeOnWpfDispatcher extension method defined by System.Reactive.Linq" +
-            ".WpfDispatcherObservable in the System.Reactive.Integration.Wpf package instead", false)]
+            ".WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> SubscribeOn<TSource>(this System.IObservable<TSource> source, System.Windows.Threading.DispatcherObject dispatcherObject, System.Windows.Threading.DispatcherPriority priority) { }
         [System.Obsolete("Use the SubscribeOnCurrentWpfDispatcher extension method defined by System.Reacti" +
-            "ve.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package i" +
-            "nstead", false)]
+            "ve.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> SubscribeOnDispatcher<TSource>(this System.IObservable<TSource> source) { }
         [System.Obsolete("Use the SubscribeOnCurrentWpfDispatcher extension method defined by System.Reacti" +
-            "ve.Linq.WpfDispatcherObservable in the System.Reactive.Integration.Wpf package i" +
-            "nstead", false)]
+            "ve.Linq.WpfDispatcherObservable in the System.Reactive.For.Wpf package instead", false)]
         public static System.IObservable<TSource> SubscribeOnDispatcher<TSource>(this System.IObservable<TSource> source, System.Windows.Threading.DispatcherPriority priority) { }
     }
     public interface IGroupedObservable<out TKey, out TElement> : System.IObservable<TElement>

+ 2 - 2
Rx.NET/Source/tests/Tests.System.Reactive/Tests.System.Reactive.csproj

@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472' or $(TargetFramework.StartsWith('net6.0-windows')) or $(TargetFramework.StartsWith('net8.0-windows'))">
-    <ProjectReference Include="..\..\src\System.Reactive.Integration.WindowsForms\System.Reactive.Integration.WindowsForms.csproj" />
-    <ProjectReference Include="..\..\src\System.Reactive.Integration.Wpf\System.Reactive.Integration.Wpf.csproj" />
+    <ProjectReference Include="..\..\src\System.Reactive.For.WindowsForms\System.Reactive.For.WindowsForms.csproj" />
+    <ProjectReference Include="..\..\src\System.Reactive.For.Wpf\System.Reactive.For.Wpf.csproj" />
   </ItemGroup>
 </Project>

+ 1 - 1
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/ControlSchedulerTest.cs

@@ -15,7 +15,7 @@ using Microsoft.Reactive.Testing;
 
 using Assert = Xunit.Assert;
 using LegacyControlScheduler = System.Reactive.Concurrency.ControlScheduler;
-using ControlScheduler = System.Reactive.Integration.WindowsForms.ControlScheduler;
+using ControlScheduler = System.Reactive.WindowsForms.ControlScheduler;
 
 namespace ReactiveTests.Tests
 {

+ 1 - 1
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/DispatcherSchedulerTest.cs

@@ -14,7 +14,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using Assert = Xunit.Assert;
 using LegacyDispatcherScheduler = System.Reactive.Concurrency.DispatcherScheduler;
-using DispatcherScheduler = System.Reactive.Integration.Wpf.DispatcherScheduler;
+using DispatcherScheduler = System.Reactive.Wpf.DispatcherScheduler;
 
 namespace ReactiveTests.Tests
 {

+ 2 - 2
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs

@@ -17,12 +17,12 @@ using Microsoft.Reactive.Testing;
 #if HAS_WINFORMS
 using System.Windows.Forms;
 using LegacyControlScheduler = System.Reactive.Concurrency.ControlScheduler;
-using ControlScheduler = System.Reactive.Integration.WindowsForms.ControlScheduler;
+using ControlScheduler = System.Reactive.WindowsForms.ControlScheduler;
 #endif
 
 #if HAS_WPF
 using LegacyDispatcherScheduler = System.Reactive.Concurrency.DispatcherScheduler;
-using DispatcherScheduler = System.Reactive.Integration.Wpf.DispatcherScheduler;
+using DispatcherScheduler = System.Reactive.Wpf.DispatcherScheduler;
 #endif
 
 using System.Threading.Tasks;

+ 2 - 2
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/ObserveOnTest.cs

@@ -18,13 +18,13 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Windows.Threading;
 
 using LegacyDispatcherScheduler = System.Reactive.Concurrency.DispatcherScheduler;
-using DispatcherScheduler = System.Reactive.Integration.Wpf.DispatcherScheduler;
+using DispatcherScheduler = System.Reactive.Wpf.DispatcherScheduler;
 #endif
 
 #if HAS_WINFORMS
 using System.Windows.Forms;
 using LegacyControlScheduler = System.Reactive.Concurrency.ControlScheduler;
-using ControlScheduler = System.Reactive.Integration.WindowsForms.ControlScheduler;
+using ControlScheduler = System.Reactive.WindowsForms.ControlScheduler;
 #endif
 
 using Assert = Xunit.Assert;

+ 3 - 3
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/Observable/SubscribeOnTest.cs

@@ -16,13 +16,13 @@ using System.Reactive;
 using System.Reactive.Subjects;
 
 using LegacyDispatcherScheduler = System.Reactive.Concurrency.DispatcherScheduler;
-using DispatcherScheduler = System.Reactive.Integration.Wpf.DispatcherScheduler;
+using DispatcherScheduler = System.Reactive.Wpf.DispatcherScheduler;
 #endif
 
 #if HAS_WINFORMS
 using System.Windows.Forms;
 using LegacyControlScheduler = System.Reactive.Concurrency.ControlScheduler;
-using ControlScheduler = System.Reactive.Integration.WindowsForms.ControlScheduler;
+using ControlScheduler = System.Reactive.WindowsForms.ControlScheduler;
 #endif
 
 using Assert = Xunit.Assert;
@@ -199,7 +199,7 @@ namespace ReactiveTests.Tests
                         evt.Set();
                     };
                 })
-                .SubscribeOn(new System.Reactive.Integration.WindowsForms.ControlScheduler(lbl))
+                .SubscribeOn(new System.Reactive.WindowsForms.ControlScheduler(lbl))
                 .Subscribe(_ => { });
 
                 evt2.WaitOne();

+ 2 - 2
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Linq/QbservableTest.cs

@@ -22,12 +22,12 @@ using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Assert = Xunit.Assert;
 #if HAS_WINFORMS
 using LegacyControlScheduler = System.Reactive.Concurrency.ControlScheduler;
-using ControlScheduler = System.Reactive.Integration.WindowsForms.ControlScheduler;
+using ControlScheduler = System.Reactive.WindowsForms.ControlScheduler;
 #endif
 
 #if HAS_WPF
 using LegacyDispatcherScheduler = System.Reactive.Concurrency.DispatcherScheduler;
-using DispatcherScheduler = System.Reactive.Integration.Wpf.DispatcherScheduler;
+using DispatcherScheduler = System.Reactive.Wpf.DispatcherScheduler;
 #endif
 
 namespace ReactiveTests.Tests