re-applied replacer.sh so that new tests get NUnit patches. Regenerated mobile projects from mono/mcs/class/build-rx-dll-sources.sh.

59 files changed, 379 insertions, 165 deletions

diff --git a/Ix/NET/Enumerable.cs b/Ix/NET/Enumerable.cs
index dcb000c..1888acd 100644
--- a/Ix/NET/Enumerable.cs
+++ b/Ix/NET/Enumerable.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Async/android_System.Interactive.Async.csproj b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Async/android_System.Interactive.Async.csproj
index 70bcda0..e3f83a3 100644
--- a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Async/android_System.Interactive.Async.csproj
+++ b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Async/android_System.Interactive.Async.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -38,6 +39,8 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+
+
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -94,11 +97,13 @@
     <Compile Include="..\..\..\..\System.Interactive.Async\TaskExt.cs">
       <Link>TaskExt.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Providers/android_System.Interactive.Providers.csproj b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Providers/android_System.Interactive.Providers.csproj
index d9c97a0..13a06d9 100644
--- a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Providers/android_System.Interactive.Providers.csproj
+++ b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive.Providers/android_System.Interactive.Providers.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -38,18 +39,32 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+
+<ProjectReference Include="..\System.Interactive\android_System.Interactive.csproj">

+  <Project>{8E4B04F0-915E-48F9-9796-76278C6094BD}</Project>

+  <Name>android_System.Interactive</Name>

+</ProjectReference>
+    <!--
+    <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
+      <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
+      <Name>Android.NUnitLite</Name>
+    </ProjectReference>
+    -->
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="..\..\..\..\System.Interactive.Providers\Properties\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
     <Compile Include="..\..\..\..\System.Interactive.Providers\QueryableEx.cs">
       <Link>QueryableEx.cs</Link>
     </Compile>
+
+    <!--
+    <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
+      <Link>ColdObservable.cs</Link>
+    </Compile>
+    -->
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\System.Interactive\android_System.Interactive.csproj">
-      <Project>{5F7F40B6-19D3-48C7-8E15-AE1F976F60E1}</Project>
-      <Name>android_System.Interactive</Name>
-    </ProjectReference>
-  </ItemGroup>
 </Project>
diff --git a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive/android_System.Interactive.csproj b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive/android_System.Interactive.csproj
index 5248f4e..c1fa23e 100644
--- a/Ix/NET/Ix_Xamarin/android/ix/System.Interactive/android_System.Interactive.csproj
+++ b/Ix/NET/Ix_Xamarin/android/ix/System.Interactive/android_System.Interactive.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -38,6 +39,8 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+
+
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -46,6 +49,9 @@
     -->
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\..\..\..\System.Interactive\IAwaitable.cs">
+      <Link>IAwaitable.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\..\System.Interactive\EnumerableEx.Imperative.cs">
       <Link>EnumerableEx.Imperative.cs</Link>
     </Compile>
@@ -67,14 +73,19 @@
     <Compile Include="..\..\..\..\System.Interactive\EnumerableEx.Aggregates.cs">
       <Link>EnumerableEx.Aggregates.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\..\System.Interactive\IYielder.cs">
+      <Link>IYielder.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\..\System.Interactive\Properties\AssemblyInfo.cs">
       <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Ix/NET/Ix_Xamarin/iOS/ix/System.Interactive.Providers/ios_System.Interactive.Providers.csproj b/Ix/NET/Ix_Xamarin/iOS/ix/System.Interactive.Providers/ios_System.Interactive.Providers.csproj
index a0db6dd..1798458 100644
--- a/Ix/NET/Ix_Xamarin/iOS/ix/System.Interactive.Providers/ios_System.Interactive.Providers.csproj
+++ b/Ix/NET/Ix_Xamarin/iOS/ix/System.Interactive.Providers/ios_System.Interactive.Providers.csproj
@@ -52,9 +52,9 @@
     
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Interactive\ios_System.Interactive.csproj">
-  <Project>{8E4B04F0-915E-48F9-9796-76278C6094BD}</Project>
-  <Name>ios_System.Interactive</Name>
+    <ProjectReference Include="..\System.Interactive\ios_System.Interactive.csproj">

+  <Project>{8E4B04F0-915E-48F9-9796-76278C6094BD}</Project>

+  <Name>ios_System.Interactive</Name>

 </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
diff --git a/Ix/NET/Ix_Xamarin/iOS/ix/System.Interactive/ios_System.Interactive.csproj b/Ix/NET/Ix_Xamarin/iOS/ix/System.Interactive/ios_System.Interactive.csproj
index 517f9c9..0708b51 100644
--- a/Ix/NET/Ix_Xamarin/iOS/ix/System.Interactive/ios_System.Interactive.csproj
+++ b/Ix/NET/Ix_Xamarin/iOS/ix/System.Interactive/ios_System.Interactive.csproj
@@ -61,7 +61,10 @@
     -->
   </ItemGroup>
   <ItemGroup>
-        <Compile Include="../../../../System.Interactive/EnumerableEx.Imperative.cs">
+        <Compile Include="../../../../System.Interactive/IAwaitable.cs">
+      <Link>IAwaitable.cs</Link>
+    </Compile>
+    <Compile Include="../../../../System.Interactive/EnumerableEx.Imperative.cs">
       <Link>EnumerableEx.Imperative.cs</Link>
     </Compile>
     <Compile Include="../../../../System.Interactive/EnumerableEx.Multiple.cs">
@@ -82,6 +85,9 @@
     <Compile Include="../../../../System.Interactive/EnumerableEx.Aggregates.cs">
       <Link>EnumerableEx.Aggregates.cs</Link>
     </Compile>
+    <Compile Include="../../../../System.Interactive/IYielder.cs">
+      <Link>IYielder.cs</Link>
+    </Compile>
     <Compile Include="../../../../System.Interactive/Properties/AssemblyInfo.cs">
       <Link>Properties/AssemblyInfo.cs</Link>
     </Compile>
diff --git a/Ix/NET/Tests/App.cs b/Ix/NET/Tests/App.cs
index 3f27e96..7efcf1a 100644
--- a/Ix/NET/Tests/App.cs
+++ b/Ix/NET/Tests/App.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 #if SILVERLIGHT && !SILVERLIGHTM7
 using System;
 using System.Diagnostics;
diff --git a/Ix/NET/Tests/AsyncTests.Aggregates.cs b/Ix/NET/Tests/AsyncTests.Aggregates.cs
index 82de063..be068fd 100644
--- a/Ix/NET/Tests/AsyncTests.Aggregates.cs
+++ b/Ix/NET/Tests/AsyncTests.Aggregates.cs
@@ -5,7 +5,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 using System.Collections;
 using System.Threading;
 
diff --git a/Ix/NET/Tests/AsyncTests.Bugs.cs b/Ix/NET/Tests/AsyncTests.Bugs.cs
index 7fc8530..3d0a5d9 100644
--- a/Ix/NET/Tests/AsyncTests.Bugs.cs
+++ b/Ix/NET/Tests/AsyncTests.Bugs.cs
@@ -4,7 +4,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 using System.Collections;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/Ix/NET/Tests/AsyncTests.Conversions.cs b/Ix/NET/Tests/AsyncTests.Conversions.cs
index 235ff7c..6e6c258 100644
--- a/Ix/NET/Tests/AsyncTests.Conversions.cs
+++ b/Ix/NET/Tests/AsyncTests.Conversions.cs
@@ -4,7 +4,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 using System.Threading;
 
 namespace Tests
diff --git a/Ix/NET/Tests/AsyncTests.Creation.cs b/Ix/NET/Tests/AsyncTests.Creation.cs
index b090e4c..fd573bd 100644
--- a/Ix/NET/Tests/AsyncTests.Creation.cs
+++ b/Ix/NET/Tests/AsyncTests.Creation.cs
@@ -5,7 +5,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 using System.Threading.Tasks;
 using System.Threading;
 
diff --git a/Ix/NET/Tests/AsyncTests.Exceptions.cs b/Ix/NET/Tests/AsyncTests.Exceptions.cs
index 7b9db22..74bea9c 100644
--- a/Ix/NET/Tests/AsyncTests.Exceptions.cs
+++ b/Ix/NET/Tests/AsyncTests.Exceptions.cs
@@ -5,7 +5,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 using System.Threading;
 
 namespace Tests
diff --git a/Ix/NET/Tests/AsyncTests.Multiple.cs b/Ix/NET/Tests/AsyncTests.Multiple.cs
index 2b315b4..464e83d 100644
--- a/Ix/NET/Tests/AsyncTests.Multiple.cs
+++ b/Ix/NET/Tests/AsyncTests.Multiple.cs
@@ -5,7 +5,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 using System.Threading;
 
 namespace Tests
diff --git a/Ix/NET/Tests/AsyncTests.Single.cs b/Ix/NET/Tests/AsyncTests.Single.cs
index 90c0cd7..ae837c3 100644
--- a/Ix/NET/Tests/AsyncTests.Single.cs
+++ b/Ix/NET/Tests/AsyncTests.Single.cs
@@ -5,7 +5,14 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 using System.Threading;
 
 namespace Tests
diff --git a/Ix/NET/Tests/AsyncTests.cs b/Ix/NET/Tests/AsyncTests.cs
index 6691f3d..5186e16 100644
--- a/Ix/NET/Tests/AsyncTests.cs
+++ b/Ix/NET/Tests/AsyncTests.cs
@@ -4,7 +4,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 
 namespace Tests
 {
diff --git a/Ix/NET/Tests/Tests.Aggregates.cs b/Ix/NET/Tests/Tests.Aggregates.cs
index 8fd8cee..2a788e0 100644
--- a/Ix/NET/Tests/Tests.Aggregates.cs
+++ b/Ix/NET/Tests/Tests.Aggregates.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 
 namespace Tests
 {
diff --git a/Ix/NET/Tests/Tests.Buffering.cs b/Ix/NET/Tests/Tests.Buffering.cs
index 4fdb268..60bd7c8 100644
--- a/Ix/NET/Tests/Tests.Buffering.cs
+++ b/Ix/NET/Tests/Tests.Buffering.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 using System.Collections;
 
 namespace Tests
diff --git a/Ix/NET/Tests/Tests.Creation.cs b/Ix/NET/Tests/Tests.Creation.cs
index c71be5a..caabab1 100644
--- a/Ix/NET/Tests/Tests.Creation.cs
+++ b/Ix/NET/Tests/Tests.Creation.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 using System.Collections;
 
 namespace Tests
diff --git a/Ix/NET/Tests/Tests.Exceptions.cs b/Ix/NET/Tests/Tests.Exceptions.cs
index 38cabe4..a4e0a23 100644
--- a/Ix/NET/Tests/Tests.Exceptions.cs
+++ b/Ix/NET/Tests/Tests.Exceptions.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 
 namespace Tests
 {
diff --git a/Ix/NET/Tests/Tests.Imperative.cs b/Ix/NET/Tests/Tests.Imperative.cs
index 3b038c6..50e578b 100644
--- a/Ix/NET/Tests/Tests.Imperative.cs
+++ b/Ix/NET/Tests/Tests.Imperative.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 
 namespace Tests
 {
diff --git a/Ix/NET/Tests/Tests.Multiple.cs b/Ix/NET/Tests/Tests.Multiple.cs
index 3df8927..0c1c1ca 100644
--- a/Ix/NET/Tests/Tests.Multiple.cs
+++ b/Ix/NET/Tests/Tests.Multiple.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 
 namespace Tests
 {
diff --git a/Ix/NET/Tests/Tests.Qbservable.cs b/Ix/NET/Tests/Tests.Qbservable.cs
index 9cd53b2..a5ead76 100644
--- a/Ix/NET/Tests/Tests.Qbservable.cs
+++ b/Ix/NET/Tests/Tests.Qbservable.cs
@@ -6,7 +6,14 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Reflection;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 using System.Runtime.CompilerServices;
 using System.Linq.Expressions;
 using System.ComponentModel;
diff --git a/Ix/NET/Tests/Tests.Single.cs b/Ix/NET/Tests/Tests.Single.cs
index 6054f54..8657224 100644
--- a/Ix/NET/Tests/Tests.Single.cs
+++ b/Ix/NET/Tests/Tests.Single.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 
 namespace Tests
 {
diff --git a/Ix/NET/Tests/Tests.cs b/Ix/NET/Tests/Tests.cs
index 27dca14..c313f4b 100644
--- a/Ix/NET/Tests/Tests.cs
+++ b/Ix/NET/Tests/Tests.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT

+using NUnit.Framework;

+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;

+using TestMethodAttribute = NUnit.Framework.TestAttribute;

+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;

+#else

+using Microsoft.VisualStudio.TestTools.UnitTesting;

+#endif
 
 namespace Tests
 {
diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/MainActivity.cs b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/MainActivity.cs
index 328b5af..c350b33 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/MainActivity.cs
+++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/MainActivity.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using Android.App;
 using Android.OS;
 using Xamarin.Android.NUnitLite;
diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AssemblyInfo.cs b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AssemblyInfo.cs
index 43f0048..2ae849f 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AssemblyInfo.cs
+++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using Android.App;
 
diff --git a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/Resource.designer.cs b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/Resource.designer.cs
index 881ae80..1e5e640 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/Resource.designer.cs
+++ b/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/Resource.designer.cs
@@ -1,4 +1,4 @@
-#pragma warning disable 1591
+#pragma warning disable 1591
 // ------------------------------------------------------------------------------
 //  <autogenerated>
 //      This code was generated by a tool.
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/Mono.Reactive.Testing/android_Mono.Reactive.Testing.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/Mono.Reactive.Testing/android_Mono.Reactive.Testing.csproj
index 9840754..800e248 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/Mono.Reactive.Testing/android_Mono.Reactive.Testing.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/Mono.Reactive.Testing/android_Mono.Reactive.Testing.csproj
@@ -30,27 +30,26 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
-    <Reference Include="Xamarin.Android.NUnitLite" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
-      <Name>android_System.Reactive.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
-      <Name>android_System.Reactive.Interfaces</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
-      <Name>android_System.Reactive.Linq</Name>
-    </ProjectReference>
+<ProjectReference Include="..\..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"><Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project><Name>Android.NUnitLite</Name></ProjectReference>
+<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
+  <Name>android_System.Reactive.Core</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
+  <Name>android_System.Reactive.Interfaces</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
+  <Name>android_System.Reactive.Linq</Name>
+</ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -98,11 +97,13 @@
     <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\TestScheduler.cs">
       <Link>TestScheduler.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj
index 9490291..2a5c851 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -38,10 +39,11 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
-      <Name>android_System.Reactive.Interfaces</Name>
-    </ProjectReference>
+
+<ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
+  <Name>android_System.Reactive.Interfaces</Name>
+</ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -284,14 +286,16 @@
     <Compile Include="..\..\..\..\System.Reactive.Core\Strings_Core.Generated.cs">
       <Link>Strings_Core.Generated.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <EmbeddedResource Include="..\..\..\..\System.Reactive.Core\Strings_Core.resx">
+    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Core/Strings_Core.resx'>
       <Link>Strings_Core.resx</Link>
     </EmbeddedResource>
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj
index 7b35028..d336157 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -38,26 +39,23 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
-      <Name>android_System.Reactive.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj">
-      <Project>{00DC3654-E373-4E3F-80FE-109F795ADF1F}</Project>
-      <Name>android_System.Reactive.Experimental</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
-      <Name>android_System.Reactive.Interfaces</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
-      <Name>android_System.Reactive.Linq</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj">
-      <Project>{D263C126-9D3C-4299-A0C1-F25C703D07C9}</Project>
-      <Name>android_System.Reactive.PlatformServices</Name>
-    </ProjectReference>
+
+<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
+  <Name>android_System.Reactive.Core</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj">
+  <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project>
+  <Name>android_System.Reactive.Experimental</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
+  <Name>android_System.Reactive.Interfaces</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
+  <Name>android_System.Reactive.Linq</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj">
+  <Project>{0CCCF009-763F-40D2-8655-7A94828023BF}</Project>
+  <Name>android_System.Reactive.PlatformServices</Name>
+</ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -72,11 +70,13 @@
     <Compile Include="..\..\..\..\System.Reactive.Debugger\Reactive\Linq\QueryDebugger.cs">
       <Link>Reactive\Linq\QueryDebugger.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj
index 91ec222..6c3099c 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -38,18 +39,17 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
-      <Name>android_System.Reactive.Linq</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
-      <Name>android_System.Reactive.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
-      <Name>android_System.Reactive.Interfaces</Name>
-    </ProjectReference>
+
+<ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
+  <Name>android_System.Reactive.Linq</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
+  <Name>android_System.Reactive.Core</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
+  <Name>android_System.Reactive.Interfaces</Name>
+</ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -88,11 +88,13 @@
     <Compile Include="..\..\..\..\System.Reactive.Experimental\Reactive\ListObservable.cs">
       <Link>Reactive\ListObservable.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj
index 02609bd..88dce4c 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -38,6 +39,8 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+
+
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -118,11 +121,13 @@
     <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Subjects\ISubject.Multi.cs">
       <Link>Reactive\Subjects\ISubject.Multi.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj
index e84e793..afd5491 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -38,14 +39,14 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
-      <Name>android_System.Reactive.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
-      <Name>android_System.Reactive.Interfaces</Name>
-    </ProjectReference>
+
+<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
+  <Name>android_System.Reactive.Core</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
+  <Name>android_System.Reactive.Interfaces</Name>
+</ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -567,14 +568,16 @@
     <Compile Include="..\..\..\..\System.Reactive.Linq\Strings_Linq.Generated.cs">
       <Link>Strings_Linq.Generated.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <EmbeddedResource Include="..\..\..\..\System.Reactive.Linq\Strings_Linq.resx">
+    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Strings_Linq.resx'>
       <Link>Strings_Linq.resx</Link>
     </EmbeddedResource>
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj
index f7d7cf5..d5968cb 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -38,18 +39,17 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
-      <Name>android_System.Reactive.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
-      <Name>android_System.Reactive.Interfaces</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
-      <Name>android_System.Reactive.Linq</Name>
-    </ProjectReference>
+
+<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
+  <Name>android_System.Reactive.Core</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
+  <Name>android_System.Reactive.Interfaces</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
+  <Name>android_System.Reactive.Linq</Name>
+</ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -115,14 +115,16 @@
     <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Strings_PlatformServices.Generated.cs">
       <Link>Strings_PlatformServices.Generated.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <EmbeddedResource Include="..\..\..\..\System.Reactive.PlatformServices\Strings_PlatformServices.resx">
+    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Strings_PlatformServices.resx'>
       <Link>Strings_PlatformServices.resx</Link>
     </EmbeddedResource>
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj
index ea3eccc..1b04227 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
@@ -38,18 +39,17 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
-      <Name>android_System.Reactive.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
-      <Name>android_System.Reactive.Interfaces</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
-      <Name>android_System.Reactive.Linq</Name>
-    </ProjectReference>
+
+<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
+  <Name>android_System.Reactive.Core</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
+  <Name>android_System.Reactive.Interfaces</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
+  <Name>android_System.Reactive.Linq</Name>
+</ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -94,14 +94,16 @@
     <Compile Include="..\..\..\..\System.Reactive.Providers\Strings_Providers.Generated.cs">
       <Link>Strings_Providers.Generated.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <EmbeddedResource Include="..\..\..\..\System.Reactive.Providers\Strings_Providers.resx">
+    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Strings_Providers.resx'>
       <Link>Strings_Providers.resx</Link>
     </EmbeddedResource>
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Runtime.Remoting/android_System.Reactive.Runtime.Remoting.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Runtime.Remoting/android_System.Reactive.Runtime.Remoting.csproj
index 49b3318..c908963 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Runtime.Remoting/android_System.Reactive.Runtime.Remoting.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Runtime.Remoting/android_System.Reactive.Runtime.Remoting.csproj
@@ -30,6 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj
index b1f3ffb..abdcfdc 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj
@@ -30,43 +30,50 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
+    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
-    <Reference Include="Xamarin.Android.NUnitLite" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Mono.Reactive.Testing\android_Mono.Reactive.Testing.csproj">
-      <Project>{CB2AB716-BFCB-43BC-A03B-A3BDA427746C}</Project>
-      <Name>android_Mono.Reactive.Testing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
-      <Name>android_System.Reactive.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj">
-      <Project>{00DC3654-E373-4E3F-80FE-109F795ADF1F}</Project>
-      <Name>android_System.Reactive.Experimental</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
-      <Name>android_System.Reactive.Interfaces</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj">
-      <Project>{D263C126-9D3C-4299-A0C1-F25C703D07C9}</Project>
-      <Name>android_System.Reactive.PlatformServices</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Providers\android_System.Reactive.Providers.csproj" Condition=" '$(BuildFlavor)' != 'SILVERLIGHTM7' And '$(BuildPlatform)' != 'XNA' ">
-      <Project>{E662282B-4341-4F86-AAAA-A942335B47FB}</Project>
-      <Name>android_System.Reactive.Providers</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
-      <Name>android_System.Reactive.Linq</Name>
-    </ProjectReference>
+<ProjectReference Include="..\..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"><Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project><Name>Android.NUnitLite</Name></ProjectReference>
+<ProjectReference Include="..\Mono.Reactive.Testing\android_Mono.Reactive.Testing.csproj">
+  <Project>{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}</Project>
+  <Name>android_Mono.Reactive.Testing</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
+  <Name>android_System.Reactive.Core</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj">
+  <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project>
+  <Name>android_System.Reactive.Experimental</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
+  <Name>android_System.Reactive.Interfaces</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Observable.Aliases\android_System.Reactive.Observable.Aliases.csproj">
+  <Project>{9ffac385-10a4-4ddd-b800-de67e8469cc0}</Project>
+  <Name>android_System.Reactive.Observable.Aliases</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj">
+  <Project>{0CCCF009-763F-40D2-8655-7A94828023BF}</Project>
+  <Name>android_System.Reactive.PlatformServices</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Providers\android_System.Reactive.Providers.csproj" Condition=" '$(BuildFlavor)' != 'SILVERLIGHTM7' And '$(BuildPlatform)' != 'XNA' ">
+  <Project>{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}</Project>
+  <Name>android_System.Reactive.Providers</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
+  <Name>android_System.Reactive.Linq</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Runtime.Remoting\android_System.Reactive.Runtime.Remoting.csproj" Condition=" '$(BuildPlatform)' != 'WINDOWS_PHONE' And '$(BuildTarget)' != 'WP7' ">
+  <Project>{7A6EF49E-7946-4101-9C89-407B9C53A173}</Project>
+  <Name>android_System.Reactive.Runtime.Remoting</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Windows.Forms\android_System.Reactive.Windows.Forms.csproj" Condition=" '$(BuildPlatform)' == 'DESKTOPCLR' ">
+  <Project>{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}</Project>
+  <Name>android_System.Reactive.Windows.Forms</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Windows.Threading\android_System.Reactive.Windows.Threading.csproj">
+  <Project>{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}</Project>
+  <Name>android_System.Reactive.Windows.Threading</Name>
+</ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -90,6 +97,9 @@
     <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Core\Disposables\Serial.cs">
       <Link>Stress\Core\Disposables\Serial.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Core\Schedulers\EventLoop.cs">
+      <Link>Stress\Core\Schedulers\EventLoop.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Core\Disposables\SingleAssignment.cs">
       <Link>Stress\Core\Disposables\SingleAssignment.cs</Link>
     </Compile>
@@ -114,6 +124,9 @@
     <Compile Include="..\..\..\..\Tests.System.Reactive\TestLongRunningScheduler.cs">
       <Link>TestLongRunningScheduler.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Aliases.cs">
+      <Link>Tests\Aliases.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\AnonymousTest.cs">
       <Link>Tests\AnonymousTest.cs</Link>
     </Compile>
@@ -327,11 +340,13 @@
     <Compile Include="..\..\..\..\Tests.System.Reactive\Utils.cs">
       <Link>Utils.cs</Link>
     </Compile>
+
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
+
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/MainActivity.cs b/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/MainActivity.cs
index 224315d..33485df 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/MainActivity.cs
+++ b/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/MainActivity.cs
@@ -1,4 +1,4 @@
-#define REACTIVE
+#define REACTIVE
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Properties/AssemblyInfo.cs b/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Properties/AssemblyInfo.cs
index 757ab88..064daa1 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Properties/AssemblyInfo.cs
+++ b/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using Android.App;
 
diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Resources/Resource.designer.cs b/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Resources/Resource.designer.cs
index 5eed766..8466952 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Resources/Resource.designer.cs
+++ b/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Resources/Resource.designer.cs
@@ -1,4 +1,4 @@
-#pragma warning disable 1591
+#pragma warning disable 1591
 // ------------------------------------------------------------------------------
 //  <autogenerated>
 //      This code was generated by a tool.
diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/MainActivity.cs b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/MainActivity.cs
index 98805d4..2683726 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/MainActivity.cs
+++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/MainActivity.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reactive;
 using System.Reactive.Linq;
 using Android.App;
diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Properties/AssemblyInfo.cs b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Properties/AssemblyInfo.cs
index 167d121..57340a1 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Properties/AssemblyInfo.cs
+++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using Android.App;
 
diff --git a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/Resource.designer.cs b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/Resource.designer.cs
index 49d2d5d..1f47528 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/Resource.designer.cs
+++ b/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/Resource.designer.cs
@@ -1,4 +1,4 @@
-#pragma warning disable 1591
+#pragma warning disable 1591
 // ------------------------------------------------------------------------------
 //  <autogenerated>
 //      This code was generated by a tool.
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/AppDelegate.cs b/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/AppDelegate.cs
index 64d549f..f262349 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/AppDelegate.cs
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/AppDelegate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/Main.cs b/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/Main.cs
index 01eff67..0401ce5 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/Main.cs
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/Main.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/Main.cs b/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/Main.cs
index 6779727..0e2e29c 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/Main.cs
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/Main.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/UnitTestAppDelegate.cs b/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/UnitTestAppDelegate.cs
index 7ba7e00..0fa2496 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/UnitTestAppDelegate.cs
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/UnitTestAppDelegate.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/rx/Tests.System.Reactive/ios_Tests.System.Reactive.csproj b/Rx/NET/Source/Rx_Xamarin/iOS/rx/Tests.System.Reactive/ios_Tests.System.Reactive.csproj
index a96ec52..8af048e 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/rx/Tests.System.Reactive/ios_Tests.System.Reactive.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/rx/Tests.System.Reactive/ios_Tests.System.Reactive.csproj
@@ -64,6 +64,9 @@
 </ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj">
   <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
   <Name>ios_System.Reactive.Interfaces</Name>
+</ProjectReference><ProjectReference Include="..\System.Reactive.Observable.Aliases\ios_System.Reactive.Observable.Aliases.csproj">
+  <Project>{9ffac385-10a4-4ddd-b800-de67e8469cc0}</Project>
+  <Name>ios_System.Reactive.Observable.Aliases</Name>
 </ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\ios_System.Reactive.PlatformServices.csproj">
   <Project>{0CCCF009-763F-40D2-8655-7A94828023BF}</Project>
   <Name>ios_System.Reactive.PlatformServices</Name>
@@ -106,6 +109,9 @@
     <Compile Include="../../../../Tests.System.Reactive/Stress/Core/Disposables/Serial.cs">
       <Link>Stress/Core/Disposables/Serial.cs</Link>
     </Compile>
+    <Compile Include="../../../../Tests.System.Reactive/Stress/Core/Schedulers/EventLoop.cs">
+      <Link>Stress/Core/Schedulers/EventLoop.cs</Link>
+    </Compile>
     <Compile Include="../../../../Tests.System.Reactive/Stress/Core/Disposables/SingleAssignment.cs">
       <Link>Stress/Core/Disposables/SingleAssignment.cs</Link>
     </Compile>
@@ -130,6 +136,9 @@
     <Compile Include="../../../../Tests.System.Reactive/TestLongRunningScheduler.cs">
       <Link>TestLongRunningScheduler.cs</Link>
     </Compile>
+    <Compile Include="../../../../Tests.System.Reactive/Tests/Aliases.cs">
+      <Link>Tests/Aliases.cs</Link>
+    </Compile>
     <Compile Include="../../../../Tests.System.Reactive/Tests/AnonymousTest.cs">
       <Link>Tests/AnonymousTest.cs</Link>
     </Compile>
diff --git a/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/QbservableEx.Generated.cs b/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/QbservableEx.Generated.cs
index 8103f32..2bda167 100644
--- a/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/QbservableEx.Generated.cs
+++ b/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/QbservableEx.Generated.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * WARNING: Auto-generated file (11/21/2013 11:07:25 AM)
  * Run Rx's auto-homoiconizer tool to generate this file (in the HomoIcon directory).
  */
diff --git a/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservable.cs b/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservable.cs
index 3d0b610..1244b9f 100644
--- a/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservable.cs
+++ b/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservable.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 #if !NO_EXPRESSIONS
 using System.Linq.Expressions;
diff --git a/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservableProvider.cs b/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservableProvider.cs
index 767a6a4..2b7d39f 100644
--- a/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservableProvider.cs
+++ b/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservableProvider.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 #if !NO_EXPRESSIONS
 using System.Linq.Expressions;
diff --git a/Rx/NET/Source/System.Reactive.Observable.Aliases/Observable.Aliases.cs b/Rx/NET/Source/System.Reactive.Observable.Aliases/Observable.Aliases.cs
index 8bacad8..d2205cb 100644
--- a/Rx/NET/Source/System.Reactive.Observable.Aliases/Observable.Aliases.cs
+++ b/Rx/NET/Source/System.Reactive.Observable.Aliases/Observable.Aliases.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 #pragma warning disable 1591
 
diff --git a/Rx/NET/Source/System.Reactive.Observable.Aliases/Qbservable.Aliases.Generated.cs b/Rx/NET/Source/System.Reactive.Observable.Aliases/Qbservable.Aliases.Generated.cs
index a73f0a3..deeaf57 100644
--- a/Rx/NET/Source/System.Reactive.Observable.Aliases/Qbservable.Aliases.Generated.cs
+++ b/Rx/NET/Source/System.Reactive.Observable.Aliases/Qbservable.Aliases.Generated.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * WARNING: Auto-generated file (11/21/2013 11:07:25 AM)
  * Run Rx's auto-homoiconizer tool to generate this file (in the HomoIcon directory).
  */
diff --git a/Rx/NET/Source/System.Reactive.Providers/Reactive/Joins/QueryablePattern.cs b/Rx/NET/Source/System.Reactive.Providers/Reactive/Joins/QueryablePattern.cs
index 306f934..0fe90d1 100644
--- a/Rx/NET/Source/System.Reactive.Providers/Reactive/Joins/QueryablePattern.cs
+++ b/Rx/NET/Source/System.Reactive.Providers/Reactive/Joins/QueryablePattern.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 #pragma warning disable 1591
 
diff --git a/Rx/NET/Source/System.Reactive.Providers/Reactive/Joins/QueryablePlan.cs b/Rx/NET/Source/System.Reactive.Providers/Reactive/Joins/QueryablePlan.cs
index cb89983..96aab7c 100644
--- a/Rx/NET/Source/System.Reactive.Providers/Reactive/Joins/QueryablePlan.cs
+++ b/Rx/NET/Source/System.Reactive.Providers/Reactive/Joins/QueryablePlan.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 #pragma warning disable 1591
 
diff --git a/Rx/NET/Source/System.Reactive.Providers/Reactive/Linq/Qbservable.Generated.cs b/Rx/NET/Source/System.Reactive.Providers/Reactive/Linq/Qbservable.Generated.cs
index 4a73c80..0c80cf9 100644
--- a/Rx/NET/Source/System.Reactive.Providers/Reactive/Linq/Qbservable.Generated.cs
+++ b/Rx/NET/Source/System.Reactive.Providers/Reactive/Linq/Qbservable.Generated.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * WARNING: Auto-generated file (11/21/2013 11:07:25 AM)
  * Run Rx's auto-homoiconizer tool to generate this file (in the HomoIcon directory).
  */
diff --git a/Rx/NET/Source/Tests.System.Reactive/App.cs b/Rx/NET/Source/Tests.System.Reactive/App.cs
index 4ed3c16..7744eed 100644
--- a/Rx/NET/Source/Tests.System.Reactive/App.cs
+++ b/Rx/NET/Source/Tests.System.Reactive/App.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 #if SILVERLIGHT && !SILVERLIGHTM7
 using System;
diff --git a/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Schedulers/EventLoop.cs b/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Schedulers/EventLoop.cs
index 41245a1..8ef60a5 100644
--- a/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Schedulers/EventLoop.cs
+++ b/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Schedulers/EventLoop.cs
@@ -9,7 +9,14 @@ using System.Reactive.Linq;
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 
 namespace ReactiveTests.Stress.Schedulers
 {
diff --git a/Rx/NET/Source/Tests.System.Reactive/Tests/Aliases.cs b/Rx/NET/Source/Tests.System.Reactive/Tests/Aliases.cs
index dd2ff20..741ab28 100644
--- a/Rx/NET/Source/Tests.System.Reactive/Tests/Aliases.cs
+++ b/Rx/NET/Source/Tests.System.Reactive/Tests/Aliases.cs
@@ -7,7 +7,14 @@ using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Threading;
 using Microsoft.Reactive.Testing;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Reactive.Linq;
 using System.Reactive.Observable.Aliases;