WTF was the previous change? Regenerated the projects that both android and iOS should work.

11 files changed, 947 insertions, 965 deletions

diff --git a/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln b/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
index bf9ac69..1e5e288 100644
--- a/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
+++ b/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
@@ -29,10 +29,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDroid.Dialog", "android
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Andr.Unit", "android\Andr.Unit\Andr.Unit\Andr.Unit.csproj", "{47673BC8-F954-4304-9472-2773AA5A94EB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_Tests.System.Reactive", "android\rx\Tests.System.Reactive\android_Tests.System.Reactive.csproj", "{73C5260F-8972-4E7C-822B-1A3A0358FA0B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_Mono.Reactive.Testing", "android\rx\Mono.Reactive.Testing\android_Mono.Reactive.Testing.csproj", "{CB2AB716-BFCB-43BC-A03B-A3BDA427746C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_Tests.System.Reactive", "android\rx\Tests.System.Reactive\android_Tests.System.Reactive.csproj", "{73C5260F-8972-4E7C-822B-1A3A0358FA0B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -134,8 +134,8 @@ Global
 		{6A005891-A3D6-4398-A729-F645397D573A} = {BC795ED9-C969-496A-8433-C47BA91CA87C}
 		{33044C7B-47A4-4113-A61A-EB429407F818} = {BC795ED9-C969-496A-8433-C47BA91CA87C}
 		{47673BC8-F954-4304-9472-2773AA5A94EB} = {BC795ED9-C969-496A-8433-C47BA91CA87C}
-		{73C5260F-8972-4E7C-822B-1A3A0358FA0B} = {BC795ED9-C969-496A-8433-C47BA91CA87C}
 		{CB2AB716-BFCB-43BC-A03B-A3BDA427746C} = {BC795ED9-C969-496A-8433-C47BA91CA87C}
+		{73C5260F-8972-4E7C-822B-1A3A0358FA0B} = {BC795ED9-C969-496A-8433-C47BA91CA87C}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = android\Andr.Unit\Andr.Unit\Andr.Unit.csproj
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 d038af6..3b6c5b8 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
@@ -5,13 +5,12 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{cb2ab716-bfcb-43bc-a03b-a3bda427746c}</ProjectGuid>
+    <ProjectGuid>{CB2AB716-BFCB-43BC-A03B-A3BDA427746C}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>System.Reactive</RootNamespace>
     <AssemblyName>Mono.Reactive.Testing</AssemblyName>
     <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants>
-    
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -39,17 +38,22 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-<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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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>
+      <Name>Android.NUnitLite</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <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>
@@ -58,52 +62,50 @@
     -->
   </ItemGroup>
   <ItemGroup>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\ColdObservable.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\GlobalSuppressions.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\GlobalSuppressions.cs">
       <Link>GlobalSuppressions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\HotObservable.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\HotObservable.cs">
       <Link>HotObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\ITestObservable.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\ITestObservable.cs">
       <Link>ITestObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\ITestObserver.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\ITestObserver.cs">
       <Link>ITestObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\MockObserver.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\MockObserver.cs">
       <Link>MockObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\NamespaceDoc.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\NamespaceDoc.cs">
       <Link>NamespaceDoc.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\Properties\AssemblyInfo.cs'>
-      <Link>Properties/AssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\ReactiveAssert.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\ReactiveAssert.cs">
       <Link>ReactiveAssert.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\ReactiveTest.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\ReactiveTest.cs">
       <Link>ReactiveTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\Recorded.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\Recorded.cs">
       <Link>Recorded.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\Subscription.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\Subscription.cs">
       <Link>Subscription.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Microsoft.Reactive.Testing\TestScheduler.cs'>
+    <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\TestScheduler.cs">
       <Link>TestScheduler.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 b8ada78..46dc153 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
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{fef62c23-10cd-4def-a5ae-54a8b309e970}</ProjectGuid>
+    <ProjectGuid>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>System.Reactive</RootNamespace>
@@ -13,8 +13,7 @@
     <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
-    <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
-
+    <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -42,11 +41,10 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -55,250 +53,248 @@
     -->
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Core/Strings_Core.resx'>
-      <Link>Strings_Core.resx</Link>
-    </EmbeddedResource>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\GlobalSuppressions.cs'>
+    <EmbeddedResource Include="..\..\..\..\System.Reactive.Core\Strings_Core.resx">
+      <Link>Strings_Core.resx</Link>
+    </EmbeddedResource>
+    <Compile Include="..\..\..\..\System.Reactive.Core\GlobalSuppressions.cs">
       <Link>GlobalSuppressions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\InternalsVisibleTo.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Core\InternalsVisibleTo.cs">
       <Link>InternalsVisibleTo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\NamespaceDocs.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Core\NamespaceDocs.cs">
       <Link>NamespaceDocs.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Observable.Extensions.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Observable.Extensions.cs">
       <Link>Observable.Extensions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Observer.Extensions.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Observer.Extensions.cs">
       <Link>Observer.Extensions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Properties\AssemblyInfo.cs'>
-      <Link>Properties/AssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\AnonymousObservable.cs'>
-      <Link>Reactive/AnonymousObservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\AnonymousObservable.cs">
+      <Link>Reactive\AnonymousObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\AnonymousObserver.cs'>
-      <Link>Reactive/AnonymousObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\AnonymousObserver.cs">
+      <Link>Reactive\AnonymousObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\AnonymousSafeObserver.cs'>
-      <Link>Reactive/AnonymousSafeObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\AnonymousSafeObserver.cs">
+      <Link>Reactive\AnonymousSafeObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\AsyncLock.cs'>
-      <Link>Reactive/Concurrency/AsyncLock.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\AsyncLock.cs">
+      <Link>Reactive\Concurrency\AsyncLock.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\CatchScheduler.cs'>
-      <Link>Reactive/Concurrency/CatchScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\CatchScheduler.cs">
+      <Link>Reactive\Concurrency\CatchScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.cs'>
-      <Link>Reactive/Concurrency/ConcurrencyAbstractionLayer.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.cs">
+      <Link>Reactive\Concurrency\ConcurrencyAbstractionLayer.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.Default.cs'>
-      <Link>Reactive/Concurrency/ConcurrencyAbstractionLayer.Default.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\ConcurrencyAbstractionLayer.Default.cs">
+      <Link>Reactive\Concurrency\ConcurrencyAbstractionLayer.Default.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Wrappers.cs'>
-      <Link>Reactive/Concurrency/Scheduler.Wrappers.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Scheduler.Wrappers.cs">
+      <Link>Reactive\Concurrency\Scheduler.Wrappers.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\DisableOptimizationsScheduler.cs'>
-      <Link>Reactive/Concurrency/DisableOptimizationsScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\DisableOptimizationsScheduler.cs">
+      <Link>Reactive\Concurrency\DisableOptimizationsScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.Emulation.cs'>
-      <Link>Reactive/Concurrency/Scheduler.Services.Emulation.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.Emulation.cs">
+      <Link>Reactive\Concurrency\Scheduler.Services.Emulation.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.TimerQueue.cs'>
-      <Link>Reactive/Concurrency/LocalScheduler.TimerQueue.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.TimerQueue.cs">
+      <Link>Reactive\Concurrency\LocalScheduler.TimerQueue.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.cs'>
-      <Link>Reactive/Concurrency/Scheduler.Services.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Scheduler.Services.cs">
+      <Link>Reactive\Concurrency\Scheduler.Services.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\CurrentThreadScheduler.cs'>
-      <Link>Reactive/Concurrency/CurrentThreadScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\CurrentThreadScheduler.cs">
+      <Link>Reactive\Concurrency\CurrentThreadScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ImmediateScheduler.cs'>
-      <Link>Reactive/Concurrency/ImmediateScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\ImmediateScheduler.cs">
+      <Link>Reactive\Concurrency\ImmediateScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.cs'>
-      <Link>Reactive/Concurrency/LocalScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\LocalScheduler.cs">
+      <Link>Reactive\Concurrency\LocalScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\ScheduledItem.cs'>
-      <Link>Reactive/Concurrency/ScheduledItem.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\ScheduledItem.cs">
+      <Link>Reactive\Concurrency\ScheduledItem.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Async.cs'>
-      <Link>Reactive/Concurrency/Scheduler.Async.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Scheduler.Async.cs">
+      <Link>Reactive\Concurrency\Scheduler.Async.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.cs'>
-      <Link>Reactive/Concurrency/Scheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Scheduler.cs">
+      <Link>Reactive\Concurrency\Scheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Recursive.cs'>
-      <Link>Reactive/Concurrency/Scheduler.Recursive.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Scheduler.Recursive.cs">
+      <Link>Reactive\Concurrency\Scheduler.Recursive.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Scheduler.Simple.cs'>
-      <Link>Reactive/Concurrency/Scheduler.Simple.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Scheduler.Simple.cs">
+      <Link>Reactive\Concurrency\Scheduler.Simple.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerDefaults.cs'>
-      <Link>Reactive/Concurrency/SchedulerDefaults.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\SchedulerDefaults.cs">
+      <Link>Reactive\Concurrency\SchedulerDefaults.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerOperation.cs'>
-      <Link>Reactive/Concurrency/SchedulerOperation.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\SchedulerOperation.cs">
+      <Link>Reactive\Concurrency\SchedulerOperation.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerQueue.cs'>
-      <Link>Reactive/Concurrency/SchedulerQueue.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\SchedulerQueue.cs">
+      <Link>Reactive\Concurrency\SchedulerQueue.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SchedulerWrapper.cs'>
-      <Link>Reactive/Concurrency/SchedulerWrapper.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\SchedulerWrapper.cs">
+      <Link>Reactive\Concurrency\SchedulerWrapper.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Stopwatch.Default.cs'>
-      <Link>Reactive/Concurrency/Stopwatch.Default.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Stopwatch.Default.cs">
+      <Link>Reactive\Concurrency\Stopwatch.Default.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.cs'>
-      <Link>Reactive/Concurrency/Synchronization.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Synchronization.cs">
+      <Link>Reactive\Concurrency\Synchronization.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.ObserveOn.cs'>
-      <Link>Reactive/Concurrency/Synchronization.ObserveOn.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Synchronization.ObserveOn.cs">
+      <Link>Reactive\Concurrency\Synchronization.ObserveOn.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\Synchronization.Synchronize.cs'>
-      <Link>Reactive/Concurrency/Synchronization.Synchronize.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\Synchronization.Synchronize.cs">
+      <Link>Reactive\Concurrency\Synchronization.Synchronize.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\SynchronizationContextScheduler.cs'>
-      <Link>Reactive/Concurrency/SynchronizationContextScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\SynchronizationContextScheduler.cs">
+      <Link>Reactive\Concurrency\SynchronizationContextScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Concurrency\DefaultScheduler.cs'>
-      <Link>Reactive/Concurrency/DefaultScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Concurrency\DefaultScheduler.cs">
+      <Link>Reactive\Concurrency\DefaultScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\AsyncLockObserver.cs'>
-      <Link>Reactive/Internal/AsyncLockObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\AsyncLockObserver.cs">
+      <Link>Reactive\Internal\AsyncLockObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\CheckedObserver.cs'>
-      <Link>Reactive/Internal/CheckedObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\CheckedObserver.cs">
+      <Link>Reactive\Internal\CheckedObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ConcurrentDictionary.cs'>
-      <Link>Reactive/Internal/ConcurrentDictionary.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\ConcurrentDictionary.cs">
+      <Link>Reactive\Internal\ConcurrentDictionary.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ConcurrentQueue.cs'>
-      <Link>Reactive/Internal/ConcurrentQueue.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\ConcurrentQueue.cs">
+      <Link>Reactive\Internal\ConcurrentQueue.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Constants.cs'>
-      <Link>Reactive/Internal/Constants.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\Constants.cs">
+      <Link>Reactive\Internal\Constants.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\AnonymousDisposable.cs'>
-      <Link>Reactive/Disposables/AnonymousDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\AnonymousDisposable.cs">
+      <Link>Reactive\Disposables\AnonymousDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\BooleanDisposable.cs'>
-      <Link>Reactive/Disposables/BooleanDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\BooleanDisposable.cs">
+      <Link>Reactive\Disposables\BooleanDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\CancellationDisposable.cs'>
-      <Link>Reactive/Disposables/CancellationDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\CancellationDisposable.cs">
+      <Link>Reactive\Disposables\CancellationDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\CompositeDisposable.cs'>
-      <Link>Reactive/Disposables/CompositeDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\CompositeDisposable.cs">
+      <Link>Reactive\Disposables\CompositeDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\ContextDisposable.cs'>
-      <Link>Reactive/Disposables/ContextDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\ContextDisposable.cs">
+      <Link>Reactive\Disposables\ContextDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\DefaultDisposable.cs'>
-      <Link>Reactive/Disposables/DefaultDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\DefaultDisposable.cs">
+      <Link>Reactive\Disposables\DefaultDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\Disposable.cs'>
-      <Link>Reactive/Disposables/Disposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\Disposable.cs">
+      <Link>Reactive\Disposables\Disposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\MultipleAssignmentDisposable.cs'>
-      <Link>Reactive/Disposables/MultipleAssignmentDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\MultipleAssignmentDisposable.cs">
+      <Link>Reactive\Disposables\MultipleAssignmentDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\RefCountDisposable.cs'>
-      <Link>Reactive/Disposables/RefCountDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\RefCountDisposable.cs">
+      <Link>Reactive\Disposables\RefCountDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\ScheduledDisposable.cs'>
-      <Link>Reactive/Disposables/ScheduledDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\ScheduledDisposable.cs">
+      <Link>Reactive\Disposables\ScheduledDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\SerialDisposable.cs'>
-      <Link>Reactive/Disposables/SerialDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\SerialDisposable.cs">
+      <Link>Reactive\Disposables\SerialDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Disposables\SingleAssignmentDisposable.cs'>
-      <Link>Reactive/Disposables/SingleAssignmentDisposable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Disposables\SingleAssignmentDisposable.cs">
+      <Link>Reactive\Disposables\SingleAssignmentDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\AutoDetachObserver.cs'>
-      <Link>Reactive/Internal/AutoDetachObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\AutoDetachObserver.cs">
+      <Link>Reactive\Internal\AutoDetachObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ExceptionServices.Default.cs'>
-      <Link>Reactive/Internal/ExceptionServices.Default.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\ExceptionServices.Default.cs">
+      <Link>Reactive\Internal\ExceptionServices.Default.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ExceptionServices.cs'>
-      <Link>Reactive/Internal/ExceptionServices.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\ExceptionServices.cs">
+      <Link>Reactive\Internal\ExceptionServices.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\HostLifecycleService.cs'>
-      <Link>Reactive/Internal/HostLifecycleService.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\HostLifecycleService.cs">
+      <Link>Reactive\Internal\HostLifecycleService.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ImmutableList.cs'>
-      <Link>Reactive/Internal/ImmutableList.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\ImmutableList.cs">
+      <Link>Reactive\Internal\ImmutableList.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Lazy.cs'>
-      <Link>Reactive/Internal/Lazy.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\Lazy.cs">
+      <Link>Reactive\Internal\Lazy.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Observers.cs'>
-      <Link>Reactive/Internal/Observers.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\Observers.cs">
+      <Link>Reactive\Internal\Observers.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\PlatformEnlightenmentProvider.cs'>
-      <Link>Reactive/Internal/PlatformEnlightenmentProvider.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\PlatformEnlightenmentProvider.cs">
+      <Link>Reactive\Internal\PlatformEnlightenmentProvider.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\PriorityQueue.cs'>
-      <Link>Reactive/Internal/PriorityQueue.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\PriorityQueue.cs">
+      <Link>Reactive\Internal\PriorityQueue.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Producer.cs'>
-      <Link>Reactive/Internal/Producer.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\Producer.cs">
+      <Link>Reactive\Internal\Producer.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SafeObserver.cs'>
-      <Link>Reactive/Internal/SafeObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\SafeObserver.cs">
+      <Link>Reactive\Internal\SafeObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\ScheduledObserver.cs'>
-      <Link>Reactive/Internal/ScheduledObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\ScheduledObserver.cs">
+      <Link>Reactive\Internal\ScheduledObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Semaphore.Silverlight.cs'>
-      <Link>Reactive/Internal/Semaphore.Silverlight.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\Semaphore.Silverlight.cs">
+      <Link>Reactive\Internal\Semaphore.Silverlight.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Semaphore.Xna.cs'>
-      <Link>Reactive/Internal/Semaphore.Xna.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\Semaphore.Xna.cs">
+      <Link>Reactive\Internal\Semaphore.Xna.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Sink.cs'>
-      <Link>Reactive/Internal/Sink.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\Sink.cs">
+      <Link>Reactive\Internal\Sink.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\Stubs.cs'>
-      <Link>Reactive/Internal/Stubs.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\Stubs.cs">
+      <Link>Reactive\Internal\Stubs.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SynchronizationContextExtensions.cs'>
-      <Link>Reactive/Internal/SynchronizationContextExtensions.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\SynchronizationContextExtensions.cs">
+      <Link>Reactive\Internal\SynchronizationContextExtensions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SynchronizedObserver.cs'>
-      <Link>Reactive/Internal/SynchronizedObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\SynchronizedObserver.cs">
+      <Link>Reactive\Internal\SynchronizedObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SystemClock.cs'>
-      <Link>Reactive/Internal/SystemClock.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\SystemClock.cs">
+      <Link>Reactive\Internal\SystemClock.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Internal\SystemClock.Default.cs'>
-      <Link>Reactive/Internal/SystemClock.Default.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Internal\SystemClock.Default.cs">
+      <Link>Reactive\Internal\SystemClock.Default.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Notification.cs'>
-      <Link>Reactive/Notification.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Notification.cs">
+      <Link>Reactive\Notification.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\ObservableBase.cs'>
-      <Link>Reactive/ObservableBase.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\ObservableBase.cs">
+      <Link>Reactive\ObservableBase.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\ObserverBase.cs'>
-      <Link>Reactive/ObserverBase.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\ObserverBase.cs">
+      <Link>Reactive\ObserverBase.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Reactive\Unit.cs'>
-      <Link>Reactive/Unit.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Reactive\Unit.cs">
+      <Link>Reactive\Unit.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Core\Strings_Core.Generated.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Core\Strings_Core.Generated.cs">
       <Link>Strings_Core.Generated.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.Debugger/android_System.Reactive.Debugger.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj
index 1035748..cc45e01 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
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9360e845-d79d-4288-9100-63a80fad2bf0}</ProjectGuid>
+    <ProjectGuid>{9360E845-D79D-4288-9100-63A80FAD2BF0}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>System.Reactive</RootNamespace>
@@ -13,8 +13,7 @@
     <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
-    <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
-
+    <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -42,23 +41,26 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project>
-  <Name>android_System.Reactive.Experimental</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-  <Name>android_System.Reactive.Linq</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{0CCCF009-763F-40D2-8655-7A94828023BF}</Project>
-  <Name>android_System.Reactive.PlatformServices</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{00DC3654-E373-4E3F-80FE-109F795ADF1F}</Project>
+      <Name>android_System.Reactive.Experimental</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
+      <Name>android_System.Reactive.Linq</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{D263C126-9D3C-4299-A0C1-F25C703D07C9}</Project>
+      <Name>android_System.Reactive.PlatformServices</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -67,19 +69,17 @@
     -->
   </ItemGroup>
   <ItemGroup>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Debugger\Properties\AssemblyInfo.cs'>
-      <Link>Properties/AssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Debugger\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Debugger\Reactive\Linq\QueryDebugger.cs'>
-      <Link>Reactive/Linq/QueryDebugger.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Debugger\Reactive\Linq\QueryDebugger.cs">
+      <Link>Reactive\Linq\QueryDebugger.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 8a9af71..bc15650 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
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{00dc3654-e373-4e3f-80fe-109f795adf1f}</ProjectGuid>
+    <ProjectGuid>{00DC3654-E373-4E3F-80FE-109F795ADF1F}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>System.Reactive</RootNamespace>
@@ -13,8 +13,7 @@
     <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
-    <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
-
+    <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -42,17 +41,18 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-  <Name>android_System.Reactive.Linq</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
+      <Name>android_System.Reactive.Linq</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -61,43 +61,41 @@
     -->
   </ItemGroup>
   <ItemGroup>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\ExperimentalAttribute.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Experimental\ExperimentalAttribute.cs">
       <Link>ExperimentalAttribute.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\InternalsVisibleTo.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Experimental\InternalsVisibleTo.cs">
       <Link>InternalsVisibleTo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Properties\AssemblyInfo.cs'>
-      <Link>Properties/AssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Experimental\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Internal\BinaryObserver.cs'>
-      <Link>Reactive/Internal/BinaryObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Experimental\Reactive\Internal\BinaryObserver.cs">
+      <Link>Reactive\Internal\BinaryObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QbservableEx.cs'>
-      <Link>Reactive/Linq/QbservableEx.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Experimental\Reactive\Linq\QbservableEx.cs">
+      <Link>Reactive\Linq\QbservableEx.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\IQueryLanguageEx.cs'>
-      <Link>Reactive/Linq/IQueryLanguageEx.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Experimental\Reactive\Linq\IQueryLanguageEx.cs">
+      <Link>Reactive\Linq\IQueryLanguageEx.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\ObservableEx.cs'>
-      <Link>Reactive/Linq/ObservableEx.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Experimental\Reactive\Linq\ObservableEx.cs">
+      <Link>Reactive\Linq\ObservableEx.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QbservableEx.Generated.cs'>
-      <Link>Reactive/Linq/QbservableEx.Generated.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Experimental\Reactive\Linq\QbservableEx.Generated.cs">
+      <Link>Reactive\Linq\QbservableEx.Generated.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\Linq\QueryLanguageEx.cs'>
-      <Link>Reactive/Linq/QueryLanguageEx.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Experimental\Reactive\Linq\QueryLanguageEx.cs">
+      <Link>Reactive\Linq\QueryLanguageEx.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Experimental\Reactive\ListObservable.cs'>
-      <Link>Reactive/ListObservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Experimental\Reactive\ListObservable.cs">
+      <Link>Reactive\ListObservable.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 9fd6908..ab0d4ec 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
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{4fa878dc-6e88-43c4-b37b-8c1151cec56f}</ProjectGuid>
+    <ProjectGuid>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>System.Reactive</RootNamespace>
@@ -13,8 +13,7 @@
     <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
-    <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
-
+    <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -42,8 +41,6 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -52,85 +49,83 @@
     -->
   </ItemGroup>
   <ItemGroup>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\AssemblyFileVersionAttribute.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\AssemblyFileVersionAttribute.cs">
       <Link>AssemblyFileVersionAttribute.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\DateTimeOffset.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\DateTimeOffset.cs">
       <Link>DateTimeOffset.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\GlobalSuppressions.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\GlobalSuppressions.cs">
       <Link>GlobalSuppressions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\IObservable.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\IObservable.cs">
       <Link>IObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\IObserver.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\IObserver.cs">
       <Link>IObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\NamespaceDocs.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\NamespaceDocs.cs">
       <Link>NamespaceDocs.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Properties\AssemblyInfo.cs'>
-      <Link>Properties/AssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\ISchedulerPeriodic.cs'>
-      <Link>Reactive/Concurrency/ISchedulerPeriodic.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Concurrency\ISchedulerPeriodic.cs">
+      <Link>Reactive\Concurrency\ISchedulerPeriodic.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IStopwatchProvider.cs'>
-      <Link>Reactive/Concurrency/IStopwatchProvider.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Concurrency\IStopwatchProvider.cs">
+      <Link>Reactive\Concurrency\IStopwatchProvider.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IScheduledItem.cs'>
-      <Link>Reactive/Concurrency/IScheduledItem.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Concurrency\IScheduledItem.cs">
+      <Link>Reactive\Concurrency\IScheduledItem.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IScheduler.cs'>
-      <Link>Reactive/Concurrency/IScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Concurrency\IScheduler.cs">
+      <Link>Reactive\Concurrency\IScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\ISchedulerLongRunning.cs'>
-      <Link>Reactive/Concurrency/ISchedulerLongRunning.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Concurrency\ISchedulerLongRunning.cs">
+      <Link>Reactive\Concurrency\ISchedulerLongRunning.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Concurrency\IStopwatch.cs'>
-      <Link>Reactive/Concurrency/IStopwatch.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Concurrency\IStopwatch.cs">
+      <Link>Reactive\Concurrency\IStopwatch.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Disposables\ICancelable.cs'>
-      <Link>Reactive/Disposables/ICancelable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Disposables\ICancelable.cs">
+      <Link>Reactive\Disposables\ICancelable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IEventPattern.cs'>
-      <Link>Reactive/IEventPattern.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\IEventPattern.cs">
+      <Link>Reactive\IEventPattern.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IEventPatternSource.cs'>
-      <Link>Reactive/IEventPatternSource.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\IEventPatternSource.cs">
+      <Link>Reactive\IEventPatternSource.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IEventSource.cs'>
-      <Link>Reactive/IEventSource.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\IEventSource.cs">
+      <Link>Reactive\IEventSource.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\IObserver.Result.cs'>
-      <Link>Reactive/IObserver.Result.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\IObserver.Result.cs">
+      <Link>Reactive\IObserver.Result.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IGroupedObservable.cs'>
-      <Link>Reactive/Linq/IGroupedObservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Linq\IGroupedObservable.cs">
+      <Link>Reactive\Linq\IGroupedObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IQbservable.cs'>
-      <Link>Reactive/Linq/IQbservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Linq\IQbservable.cs">
+      <Link>Reactive\Linq\IQbservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IQbservableProvider.cs'>
-      <Link>Reactive/Linq/IQbservableProvider.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Linq\IQbservableProvider.cs">
+      <Link>Reactive\Linq\IQbservableProvider.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\IConnectableObservable.cs'>
-      <Link>Reactive/Subjects/IConnectableObservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Subjects\IConnectableObservable.cs">
+      <Link>Reactive\Subjects\IConnectableObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.cs'>
-      <Link>Reactive/Subjects/ISubject.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Subjects\ISubject.cs">
+      <Link>Reactive\Subjects\ISubject.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.Multi.cs'>
-      <Link>Reactive/Subjects/ISubject.Multi.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Subjects\ISubject.Multi.cs">
+      <Link>Reactive\Subjects\ISubject.Multi.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 02c792e..80ce3d2 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
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{ec704077-ea31-4852-ad24-6732244174c0}</ProjectGuid>
+    <ProjectGuid>{EC704077-EA31-4852-AD24-6732244174C0}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>System.Reactive</RootNamespace>
@@ -13,8 +13,7 @@
     <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
-    <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
-
+    <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -42,14 +41,14 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -58,529 +57,527 @@
     -->
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Strings_Linq.resx'>
-      <Link>Strings_Linq.resx</Link>
-    </EmbeddedResource>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\GlobalSuppressions.cs'>
+    <EmbeddedResource Include="..\..\..\..\System.Reactive.Linq\Strings_Linq.resx">
+      <Link>Strings_Linq.resx</Link>
+    </EmbeddedResource>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\GlobalSuppressions.cs">
       <Link>GlobalSuppressions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\NamespaceDocs.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\NamespaceDocs.cs">
       <Link>NamespaceDocs.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.Extensions.cs'>
-      <Link>Reactive/Concurrency/VirtualTimeScheduler.Extensions.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.Extensions.cs">
+      <Link>Reactive\Concurrency\VirtualTimeScheduler.Extensions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\ConcatSink.cs'>
-      <Link>Reactive/Internal/ConcatSink.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\ConcatSink.cs">
+      <Link>Reactive\Internal\ConcatSink.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Constants.cs'>
-      <Link>Reactive/Internal/Constants.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\Constants.cs">
+      <Link>Reactive\Internal\Constants.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Helpers.cs'>
-      <Link>Reactive/Internal/Helpers.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\Helpers.cs">
+      <Link>Reactive\Internal\Helpers.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\IConcatenatable.cs'>
-      <Link>Reactive/Internal/IConcatenatable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\IConcatenatable.cs">
+      <Link>Reactive\Internal\IConcatenatable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\IEvaluatableObservable.cs'>
-      <Link>Reactive/Internal/IEvaluatableObservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\IEvaluatableObservable.cs">
+      <Link>Reactive\Internal\IEvaluatableObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\QueryServices.cs'>
-      <Link>Reactive/Internal/QueryServices.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\QueryServices.cs">
+      <Link>Reactive\Internal\QueryServices.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\ReflectionUtils.cs'>
-      <Link>Reactive/Internal/ReflectionUtils.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\ReflectionUtils.cs">
+      <Link>Reactive\Internal\ReflectionUtils.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\HashSet.cs'>
-      <Link>Reactive/Internal/HashSet.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\HashSet.cs">
+      <Link>Reactive\Internal\HashSet.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Lookup.cs'>
-      <Link>Reactive/Internal/Lookup.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\Lookup.cs">
+      <Link>Reactive\Internal\Lookup.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\LocalQueryMethodImplementationTypeAttribute.cs'>
-      <Link>Reactive/Linq/LocalQueryMethodImplementationTypeAttribute.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\LocalQueryMethodImplementationTypeAttribute.cs">
+      <Link>Reactive\Linq\LocalQueryMethodImplementationTypeAttribute.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Case.cs'>
-      <Link>Reactive/Linq/Observable/Case.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Case.cs">
+      <Link>Reactive\Linq\Observable\Case.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Collect.cs'>
-      <Link>Reactive/Linq/Observable/Collect.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Collect.cs">
+      <Link>Reactive\Linq\Observable\Collect.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\If.cs'>
-      <Link>Reactive/Linq/Observable/If.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\If.cs">
+      <Link>Reactive\Linq\Observable\If.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\For.cs'>
-      <Link>Reactive/Linq/Observable/For.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\For.cs">
+      <Link>Reactive\Linq\Observable\For.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DoWhile.cs'>
-      <Link>Reactive/Linq/Observable/DoWhile.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\DoWhile.cs">
+      <Link>Reactive\Linq\Observable\DoWhile.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\While.cs'>
-      <Link>Reactive/Linq/Observable/While.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\While.cs">
+      <Link>Reactive\Linq\Observable\While.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeLastBuffer.cs'>
-      <Link>Reactive/Linq/Observable/TakeLastBuffer.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\TakeLastBuffer.cs">
+      <Link>Reactive\Linq\Observable\TakeLastBuffer.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Next.cs'>
-      <Link>Reactive/Linq/Observable/Next.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Next.cs">
+      <Link>Reactive\Linq\Observable\Next.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\MostRecent.cs'>
-      <Link>Reactive/Linq/Observable/MostRecent.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\MostRecent.cs">
+      <Link>Reactive\Linq\Observable\MostRecent.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Latest.cs'>
-      <Link>Reactive/Linq/Observable/Latest.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Latest.cs">
+      <Link>Reactive\Linq\Observable\Latest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\PushToPullAdapter.cs'>
-      <Link>Reactive/Linq/Observable/PushToPullAdapter.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\PushToPullAdapter.cs">
+      <Link>Reactive\Linq\Observable\PushToPullAdapter.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\RefCount.cs'>
-      <Link>Reactive/Linq/Observable/RefCount.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\RefCount.cs">
+      <Link>Reactive\Linq\Observable\RefCount.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Multicast.cs'>
-      <Link>Reactive/Linq/Observable/Multicast.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Multicast.cs">
+      <Link>Reactive\Linq\Observable\Multicast.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GroupBy.cs'>
-      <Link>Reactive/Linq/Observable/GroupBy.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\GroupBy.cs">
+      <Link>Reactive\Linq\Observable\GroupBy.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable_.cs'>
-      <Link>Reactive/Linq/Observable_.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable_.cs">
+      <Link>Reactive\Linq\Observable_.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage_.cs'>
-      <Link>Reactive/Linq/QueryLanguage_.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage_.cs">
+      <Link>Reactive\Linq\QueryLanguage_.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Joins.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Joins.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Joins.cs">
+      <Link>Reactive\Linq\QueryLanguage.Joins.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Multiple.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Multiple.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Multiple.cs">
+      <Link>Reactive\Linq\QueryLanguage.Multiple.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Single.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Single.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Single.cs">
+      <Link>Reactive\Linq\QueryLanguage.Single.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.StandardSequenceOperators.cs'>
-      <Link>Reactive/Linq/QueryLanguage.StandardSequenceOperators.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.StandardSequenceOperators.cs">
+      <Link>Reactive\Linq\QueryLanguage.StandardSequenceOperators.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Time.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Time.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Time.cs">
+      <Link>Reactive\Linq\QueryLanguage.Time.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Async.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Async.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Async.cs">
+      <Link>Reactive\Linq\QueryLanguage.Async.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Awaiter.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Awaiter.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Awaiter.cs">
+      <Link>Reactive\Linq\QueryLanguage.Awaiter.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Binding.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Binding.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Binding.cs">
+      <Link>Reactive\Linq\QueryLanguage.Binding.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Blocking.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Blocking.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Blocking.cs">
+      <Link>Reactive\Linq\QueryLanguage.Blocking.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Concurrency.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Concurrency.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Concurrency.cs">
+      <Link>Reactive\Linq\QueryLanguage.Concurrency.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Conversions.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Conversions.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Conversions.cs">
+      <Link>Reactive\Linq\QueryLanguage.Conversions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Creation.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Creation.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Creation.cs">
+      <Link>Reactive\Linq\QueryLanguage.Creation.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Events.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Events.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Events.cs">
+      <Link>Reactive\Linq\QueryLanguage.Events.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Aggregates.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Aggregates.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Aggregates.cs">
+      <Link>Reactive\Linq\QueryLanguage.Aggregates.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Imperative.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Imperative.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\QueryLanguage.Imperative.cs">
+      <Link>Reactive\Linq\QueryLanguage.Imperative.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\IQueryLanguage.cs'>
-      <Link>Reactive/Linq/IQueryLanguage.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\IQueryLanguage.cs">
+      <Link>Reactive\Linq\IQueryLanguage.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Imperative.cs'>
-      <Link>Reactive/Linq/Observable.Imperative.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Imperative.cs">
+      <Link>Reactive\Linq\Observable.Imperative.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPatternSourceBase.cs'>
-      <Link>Reactive/EventPatternSourceBase.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\EventPatternSourceBase.cs">
+      <Link>Reactive\EventPatternSourceBase.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPattern.cs'>
-      <Link>Reactive/EventPattern.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\EventPattern.cs">
+      <Link>Reactive\EventPattern.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventPatternSource.cs'>
-      <Link>Reactive/EventPatternSource.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\EventPatternSource.cs">
+      <Link>Reactive\EventPatternSource.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\EventSource.cs'>
-      <Link>Reactive/EventSource.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\EventSource.cs">
+      <Link>Reactive\EventSource.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\InternalsVisibleTo.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\InternalsVisibleTo.cs">
       <Link>InternalsVisibleTo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Async.cs'>
-      <Link>Reactive/Linq/Observable.Async.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Async.cs">
+      <Link>Reactive\Linq\Observable.Async.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Events.cs'>
-      <Link>Reactive/Linq/Observable.Events.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Events.cs">
+      <Link>Reactive\Linq\Observable.Events.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Properties\AssemblyInfo.cs'>
-      <Link>Properties/AssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\HistoricalScheduler.cs'>
-      <Link>Reactive/Concurrency/HistoricalScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Concurrency\HistoricalScheduler.cs">
+      <Link>Reactive\Concurrency\HistoricalScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.cs'>
-      <Link>Reactive/Concurrency/VirtualTimeScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Concurrency\VirtualTimeScheduler.cs">
+      <Link>Reactive\Concurrency\VirtualTimeScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\AnonymousEnumerable.cs'>
-      <Link>Reactive/Internal/AnonymousEnumerable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\AnonymousEnumerable.cs">
+      <Link>Reactive\Internal\AnonymousEnumerable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\BinaryObserver.cs'>
-      <Link>Reactive/Internal/BinaryObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\BinaryObserver.cs">
+      <Link>Reactive\Internal\BinaryObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\AddRef.cs'>
-      <Link>Reactive/Linq/Observable/AddRef.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\AddRef.cs">
+      <Link>Reactive\Linq\Observable\AddRef.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Aggregate.cs'>
-      <Link>Reactive/Linq/Observable/Aggregate.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Aggregate.cs">
+      <Link>Reactive\Linq\Observable\Aggregate.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\All.cs'>
-      <Link>Reactive/Linq/Observable/All.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\All.cs">
+      <Link>Reactive\Linq\Observable\All.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Amb.cs'>
-      <Link>Reactive/Linq/Observable/Amb.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Amb.cs">
+      <Link>Reactive\Linq\Observable\Amb.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Any.cs'>
-      <Link>Reactive/Linq/Observable/Any.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Any.cs">
+      <Link>Reactive\Linq\Observable\Any.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\AsObservable.cs'>
-      <Link>Reactive/Linq/Observable/AsObservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\AsObservable.cs">
+      <Link>Reactive\Linq\Observable\AsObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Average.cs'>
-      <Link>Reactive/Linq/Observable/Average.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Average.cs">
+      <Link>Reactive\Linq\Observable\Average.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Buffer.cs'>
-      <Link>Reactive/Linq/Observable/Buffer.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Buffer.cs">
+      <Link>Reactive\Linq\Observable\Buffer.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Catch.cs'>
-      <Link>Reactive/Linq/Observable/Catch.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Catch.cs">
+      <Link>Reactive\Linq\Observable\Catch.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Concat.cs'>
-      <Link>Reactive/Linq/Observable/Concat.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Concat.cs">
+      <Link>Reactive\Linq\Observable\Concat.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Contains.cs'>
-      <Link>Reactive/Linq/Observable/Contains.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Contains.cs">
+      <Link>Reactive\Linq\Observable\Contains.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Cast.cs'>
-      <Link>Reactive/Linq/Observable/Cast.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Cast.cs">
+      <Link>Reactive\Linq\Observable\Cast.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\CombineLatest.cs'>
-      <Link>Reactive/Linq/Observable/CombineLatest.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\CombineLatest.cs">
+      <Link>Reactive\Linq\Observable\CombineLatest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GetEnumerator.cs'>
-      <Link>Reactive/Linq/Observable/GetEnumerator.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\GetEnumerator.cs">
+      <Link>Reactive\Linq\Observable\GetEnumerator.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GroupJoin.cs'>
-      <Link>Reactive/Linq/Observable/GroupJoin.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\GroupJoin.cs">
+      <Link>Reactive\Linq\Observable\GroupJoin.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Join.cs'>
-      <Link>Reactive/Linq/Observable/Join.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Join.cs">
+      <Link>Reactive\Linq\Observable\Join.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SelectMany.cs'>
-      <Link>Reactive/Linq/Observable/SelectMany.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\SelectMany.cs">
+      <Link>Reactive\Linq\Observable\SelectMany.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Zip.cs'>
-      <Link>Reactive/Linq/Observable/Zip.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Zip.cs">
+      <Link>Reactive\Linq\Observable\Zip.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\OfType.cs'>
-      <Link>Reactive/Linq/Observable/OfType.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\OfType.cs">
+      <Link>Reactive\Linq\Observable\OfType.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Count.cs'>
-      <Link>Reactive/Linq/Observable/Count.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Count.cs">
+      <Link>Reactive\Linq\Observable\Count.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DefaultIfEmpty.cs'>
-      <Link>Reactive/Linq/Observable/DefaultIfEmpty.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\DefaultIfEmpty.cs">
+      <Link>Reactive\Linq\Observable\DefaultIfEmpty.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Defer.cs'>
-      <Link>Reactive/Linq/Observable/Defer.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Defer.cs">
+      <Link>Reactive\Linq\Observable\Defer.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Delay.cs'>
-      <Link>Reactive/Linq/Observable/Delay.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Delay.cs">
+      <Link>Reactive\Linq\Observable\Delay.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DelaySubscription.cs'>
-      <Link>Reactive/Linq/Observable/DelaySubscription.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\DelaySubscription.cs">
+      <Link>Reactive\Linq\Observable\DelaySubscription.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Dematerialize.cs'>
-      <Link>Reactive/Linq/Observable/Dematerialize.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Dematerialize.cs">
+      <Link>Reactive\Linq\Observable\Dematerialize.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Distinct.cs'>
-      <Link>Reactive/Linq/Observable/Distinct.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Distinct.cs">
+      <Link>Reactive\Linq\Observable\Distinct.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\DistinctUntilChanged.cs'>
-      <Link>Reactive/Linq/Observable/DistinctUntilChanged.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\DistinctUntilChanged.cs">
+      <Link>Reactive\Linq\Observable\DistinctUntilChanged.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Do.cs'>
-      <Link>Reactive/Linq/Observable/Do.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Do.cs">
+      <Link>Reactive\Linq\Observable\Do.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ElementAt.cs'>
-      <Link>Reactive/Linq/Observable/ElementAt.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\ElementAt.cs">
+      <Link>Reactive\Linq\Observable\ElementAt.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Empty.cs'>
-      <Link>Reactive/Linq/Observable/Empty.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Empty.cs">
+      <Link>Reactive\Linq\Observable\Empty.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Finally.cs'>
-      <Link>Reactive/Linq/Observable/Finally.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Finally.cs">
+      <Link>Reactive\Linq\Observable\Finally.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\FirstAsync.cs'>
-      <Link>Reactive/Linq/Observable/FirstAsync.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\FirstAsync.cs">
+      <Link>Reactive\Linq\Observable\FirstAsync.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ForEach.cs'>
-      <Link>Reactive/Linq/Observable/ForEach.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\ForEach.cs">
+      <Link>Reactive\Linq\Observable\ForEach.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\FromEvent.cs'>
-      <Link>Reactive/Linq/Observable/FromEvent.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\FromEvent.cs">
+      <Link>Reactive\Linq\Observable\FromEvent.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\FromEventPattern.cs'>
-      <Link>Reactive/Linq/Observable/FromEventPattern.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\FromEventPattern.cs">
+      <Link>Reactive\Linq\Observable\FromEventPattern.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Generate.cs'>
-      <Link>Reactive/Linq/Observable/Generate.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Generate.cs">
+      <Link>Reactive\Linq\Observable\Generate.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\GroupByUntil.cs'>
-      <Link>Reactive/Linq/Observable/GroupByUntil.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\GroupByUntil.cs">
+      <Link>Reactive\Linq\Observable\GroupByUntil.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\IgnoreElements.cs'>
-      <Link>Reactive/Linq/Observable/IgnoreElements.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\IgnoreElements.cs">
+      <Link>Reactive\Linq\Observable\IgnoreElements.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\IsEmpty.cs'>
-      <Link>Reactive/Linq/Observable/IsEmpty.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\IsEmpty.cs">
+      <Link>Reactive\Linq\Observable\IsEmpty.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\LastAsync.cs'>
-      <Link>Reactive/Linq/Observable/LastAsync.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\LastAsync.cs">
+      <Link>Reactive\Linq\Observable\LastAsync.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\LongCount.cs'>
-      <Link>Reactive/Linq/Observable/LongCount.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\LongCount.cs">
+      <Link>Reactive\Linq\Observable\LongCount.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Materialize.cs'>
-      <Link>Reactive/Linq/Observable/Materialize.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Materialize.cs">
+      <Link>Reactive\Linq\Observable\Materialize.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Max.cs'>
-      <Link>Reactive/Linq/Observable/Max.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Max.cs">
+      <Link>Reactive\Linq\Observable\Max.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\MaxBy.cs'>
-      <Link>Reactive/Linq/Observable/MaxBy.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\MaxBy.cs">
+      <Link>Reactive\Linq\Observable\MaxBy.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Merge.cs'>
-      <Link>Reactive/Linq/Observable/Merge.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Merge.cs">
+      <Link>Reactive\Linq\Observable\Merge.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Min.cs'>
-      <Link>Reactive/Linq/Observable/Min.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Min.cs">
+      <Link>Reactive\Linq\Observable\Min.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\MinBy.cs'>
-      <Link>Reactive/Linq/Observable/MinBy.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\MinBy.cs">
+      <Link>Reactive\Linq\Observable\MinBy.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Never.cs'>
-      <Link>Reactive/Linq/Observable/Never.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Never.cs">
+      <Link>Reactive\Linq\Observable\Never.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\OnErrorResumeNext.cs'>
-      <Link>Reactive/Linq/Observable/OnErrorResumeNext.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\OnErrorResumeNext.cs">
+      <Link>Reactive\Linq\Observable\OnErrorResumeNext.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Range.cs'>
-      <Link>Reactive/Linq/Observable/Range.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Range.cs">
+      <Link>Reactive\Linq\Observable\Range.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Repeat.cs'>
-      <Link>Reactive/Linq/Observable/Repeat.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Repeat.cs">
+      <Link>Reactive\Linq\Observable\Repeat.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Return.cs'>
-      <Link>Reactive/Linq/Observable/Return.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Return.cs">
+      <Link>Reactive\Linq\Observable\Return.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Sample.cs'>
-      <Link>Reactive/Linq/Observable/Sample.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Sample.cs">
+      <Link>Reactive\Linq\Observable\Sample.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Scan.cs'>
-      <Link>Reactive/Linq/Observable/Scan.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Scan.cs">
+      <Link>Reactive\Linq\Observable\Scan.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Select.cs'>
-      <Link>Reactive/Linq/Observable/Select.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Select.cs">
+      <Link>Reactive\Linq\Observable\Select.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SequenceEqual.cs'>
-      <Link>Reactive/Linq/Observable/SequenceEqual.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\SequenceEqual.cs">
+      <Link>Reactive\Linq\Observable\SequenceEqual.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SingleAsync.cs'>
-      <Link>Reactive/Linq/Observable/SingleAsync.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\SingleAsync.cs">
+      <Link>Reactive\Linq\Observable\SingleAsync.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Skip.cs'>
-      <Link>Reactive/Linq/Observable/Skip.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Skip.cs">
+      <Link>Reactive\Linq\Observable\Skip.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SkipLast.cs'>
-      <Link>Reactive/Linq/Observable/SkipLast.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\SkipLast.cs">
+      <Link>Reactive\Linq\Observable\SkipLast.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SkipUntil.cs'>
-      <Link>Reactive/Linq/Observable/SkipUntil.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\SkipUntil.cs">
+      <Link>Reactive\Linq\Observable\SkipUntil.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\SkipWhile.cs'>
-      <Link>Reactive/Linq/Observable/SkipWhile.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\SkipWhile.cs">
+      <Link>Reactive\Linq\Observable\SkipWhile.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Sum.cs'>
-      <Link>Reactive/Linq/Observable/Sum.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Sum.cs">
+      <Link>Reactive\Linq\Observable\Sum.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Switch.cs'>
-      <Link>Reactive/Linq/Observable/Switch.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Switch.cs">
+      <Link>Reactive\Linq\Observable\Switch.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\TailRecursiveSink.cs'>
-      <Link>Reactive/Internal/TailRecursiveSink.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\TailRecursiveSink.cs">
+      <Link>Reactive\Internal\TailRecursiveSink.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Take.cs'>
-      <Link>Reactive/Linq/Observable/Take.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Take.cs">
+      <Link>Reactive\Linq\Observable\Take.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeLast.cs'>
-      <Link>Reactive/Linq/Observable/TakeLast.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\TakeLast.cs">
+      <Link>Reactive\Linq\Observable\TakeLast.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeUntil.cs'>
-      <Link>Reactive/Linq/Observable/TakeUntil.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\TakeUntil.cs">
+      <Link>Reactive\Linq\Observable\TakeUntil.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TakeWhile.cs'>
-      <Link>Reactive/Linq/Observable/TakeWhile.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\TakeWhile.cs">
+      <Link>Reactive\Linq\Observable\TakeWhile.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Throttle.cs'>
-      <Link>Reactive/Linq/Observable/Throttle.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Throttle.cs">
+      <Link>Reactive\Linq\Observable\Throttle.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Throw.cs'>
-      <Link>Reactive/Linq/Observable/Throw.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Throw.cs">
+      <Link>Reactive\Linq\Observable\Throw.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\TimeInterval.cs'>
-      <Link>Reactive/Linq/Observable/TimeInterval.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\TimeInterval.cs">
+      <Link>Reactive\Linq\Observable\TimeInterval.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Timeout.cs'>
-      <Link>Reactive/Linq/Observable/Timeout.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Timeout.cs">
+      <Link>Reactive\Linq\Observable\Timeout.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Timer.cs'>
-      <Link>Reactive/Linq/Observable/Timer.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Timer.cs">
+      <Link>Reactive\Linq\Observable\Timer.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Timestamp.cs'>
-      <Link>Reactive/Linq/Observable/Timestamp.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Timestamp.cs">
+      <Link>Reactive\Linq\Observable\Timestamp.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToArray.cs'>
-      <Link>Reactive/Linq/Observable/ToArray.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\ToArray.cs">
+      <Link>Reactive\Linq\Observable\ToArray.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToDictionary.cs'>
-      <Link>Reactive/Linq/Observable/ToDictionary.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\ToDictionary.cs">
+      <Link>Reactive\Linq\Observable\ToDictionary.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToList.cs'>
-      <Link>Reactive/Linq/Observable/ToList.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\ToList.cs">
+      <Link>Reactive\Linq\Observable\ToList.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToLookup.cs'>
-      <Link>Reactive/Linq/Observable/ToLookup.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\ToLookup.cs">
+      <Link>Reactive\Linq\Observable\ToLookup.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\ToObservable.cs'>
-      <Link>Reactive/Linq/Observable/ToObservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\ToObservable.cs">
+      <Link>Reactive\Linq\Observable\ToObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Using.cs'>
-      <Link>Reactive/Linq/Observable/Using.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Using.cs">
+      <Link>Reactive\Linq\Observable\Using.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Where.cs'>
-      <Link>Reactive/Linq/Observable/Where.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Where.cs">
+      <Link>Reactive\Linq\Observable\Where.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\Window.cs'>
-      <Link>Reactive/Linq/Observable/Window.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\Window.cs">
+      <Link>Reactive\Linq\Observable\Window.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable\_.cs'>
-      <Link>Reactive/Linq/Observable/_.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable\_.cs">
+      <Link>Reactive\Linq\Observable\_.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\ConnectableObservable.cs'>
-      <Link>Reactive/Subjects/ConnectableObservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Subjects\ConnectableObservable.cs">
+      <Link>Reactive\Subjects\ConnectableObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\Subject.Extensions.cs'>
-      <Link>Reactive/Subjects/Subject.Extensions.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Subjects\Subject.Extensions.cs">
+      <Link>Reactive\Subjects\Subject.Extensions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\Either.Generic.cs'>
-      <Link>Reactive/Internal/Either.Generic.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\Either.Generic.cs">
+      <Link>Reactive\Internal\Either.Generic.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\AsyncSubject.cs'>
-      <Link>Reactive/Subjects/AsyncSubject.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Subjects\AsyncSubject.cs">
+      <Link>Reactive\Subjects\AsyncSubject.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\BehaviorSubject.cs'>
-      <Link>Reactive/Subjects/BehaviorSubject.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Subjects\BehaviorSubject.cs">
+      <Link>Reactive\Subjects\BehaviorSubject.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\Subject.cs'>
-      <Link>Reactive/Subjects/Subject.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Subjects\Subject.cs">
+      <Link>Reactive\Subjects\Subject.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\GroupedObservable.cs'>
-      <Link>Reactive/Linq/GroupedObservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\GroupedObservable.cs">
+      <Link>Reactive\Linq\GroupedObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\ActivePlan.cs'>
-      <Link>Reactive/Joins/ActivePlan.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Joins\ActivePlan.cs">
+      <Link>Reactive\Joins\ActivePlan.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\JoinObserver.cs'>
-      <Link>Reactive/Joins/JoinObserver.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Joins\JoinObserver.cs">
+      <Link>Reactive\Joins\JoinObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\Pattern.cs'>
-      <Link>Reactive/Joins/Pattern.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Joins\Pattern.cs">
+      <Link>Reactive\Joins\Pattern.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Joins\Plan.cs'>
-      <Link>Reactive/Joins/Plan.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Joins\Plan.cs">
+      <Link>Reactive\Joins\Plan.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Aggregates.cs'>
-      <Link>Reactive/Linq/Observable.Aggregates.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Aggregates.cs">
+      <Link>Reactive\Linq\Observable.Aggregates.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Awaiter.cs'>
-      <Link>Reactive/Linq/Observable.Awaiter.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Awaiter.cs">
+      <Link>Reactive\Linq\Observable.Awaiter.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Binding.cs'>
-      <Link>Reactive/Linq/Observable.Binding.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Binding.cs">
+      <Link>Reactive\Linq\Observable.Binding.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Blocking.cs'>
-      <Link>Reactive/Linq/Observable.Blocking.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Blocking.cs">
+      <Link>Reactive\Linq\Observable.Blocking.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Concurrency.cs'>
-      <Link>Reactive/Linq/Observable.Concurrency.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Concurrency.cs">
+      <Link>Reactive\Linq\Observable.Concurrency.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Conversions.cs'>
-      <Link>Reactive/Linq/Observable.Conversions.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Conversions.cs">
+      <Link>Reactive\Linq\Observable.Conversions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Creation.cs'>
-      <Link>Reactive/Linq/Observable.Creation.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Creation.cs">
+      <Link>Reactive\Linq\Observable.Creation.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Joins.cs'>
-      <Link>Reactive/Linq/Observable.Joins.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Joins.cs">
+      <Link>Reactive\Linq\Observable.Joins.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Multiple.cs'>
-      <Link>Reactive/Linq/Observable.Multiple.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Multiple.cs">
+      <Link>Reactive\Linq\Observable.Multiple.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Single.cs'>
-      <Link>Reactive/Linq/Observable.Single.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Single.cs">
+      <Link>Reactive\Linq\Observable.Single.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.StandardSequenceOperators.cs'>
-      <Link>Reactive/Linq/Observable.StandardSequenceOperators.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.StandardSequenceOperators.cs">
+      <Link>Reactive\Linq\Observable.StandardSequenceOperators.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Linq\Observable.Time.cs'>
-      <Link>Reactive/Linq/Observable.Time.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Linq\Observable.Time.cs">
+      <Link>Reactive\Linq\Observable.Time.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Internal\PushPullAdapter.cs'>
-      <Link>Reactive/Internal/PushPullAdapter.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Internal\PushPullAdapter.cs">
+      <Link>Reactive\Internal\PushPullAdapter.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Subjects\ReplaySubject.cs'>
-      <Link>Reactive/Subjects/ReplaySubject.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Subjects\ReplaySubject.cs">
+      <Link>Reactive\Subjects\ReplaySubject.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Threading\Tasks\NamespaceDoc.cs'>
-      <Link>Reactive/Threading/Tasks/NamespaceDoc.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Threading\Tasks\NamespaceDoc.cs">
+      <Link>Reactive\Threading\Tasks\NamespaceDoc.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Threading\Tasks\TaskObservableExtensions.cs'>
-      <Link>Reactive/Threading/Tasks/TaskObservableExtensions.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Threading\Tasks\TaskObservableExtensions.cs">
+      <Link>Reactive\Threading\Tasks\TaskObservableExtensions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\TimeInterval.cs'>
-      <Link>Reactive/TimeInterval.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\TimeInterval.cs">
+      <Link>Reactive\TimeInterval.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Reactive\Timestamped.cs'>
-      <Link>Reactive/Timestamped.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Reactive\Timestamped.cs">
+      <Link>Reactive\Timestamped.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Linq\Strings_Linq.Generated.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Linq\Strings_Linq.Generated.cs">
       <Link>Strings_Linq.Generated.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.PlatformServices/android_System.Reactive.PlatformServices.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj
index 800d741..8802468 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
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{d263c126-9d3c-4299-a0c1-f25c703d07c9}</ProjectGuid>
+    <ProjectGuid>{D263C126-9D3C-4299-A0C1-F25C703D07C9}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>System.Reactive</RootNamespace>
@@ -13,8 +13,7 @@
     <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
-    <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
-
+    <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -42,17 +41,18 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-  <Name>android_System.Reactive.Linq</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <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>
@@ -61,73 +61,71 @@
     -->
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Strings_PlatformServices.resx'>
-      <Link>Strings_PlatformServices.resx</Link>
-    </EmbeddedResource>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\GlobalSuppressions.cs'>
+    <EmbeddedResource Include="..\..\..\..\System.Reactive.PlatformServices\Strings_PlatformServices.resx">
+      <Link>Strings_PlatformServices.resx</Link>
+    </EmbeddedResource>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\GlobalSuppressions.cs">
       <Link>GlobalSuppressions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Properties\AssemblyInfo.cs'>
-      <Link>Properties/AssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.Windows.cs'>
-      <Link>Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.Windows.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.Windows.cs">
+      <Link>Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.Windows.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\EventLoopScheduler.cs'>
-      <Link>Reactive/Concurrency/EventLoopScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Concurrency\EventLoopScheduler.cs">
+      <Link>Reactive\Concurrency\EventLoopScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\NewThreadScheduler.cs'>
-      <Link>Reactive/Concurrency/NewThreadScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Concurrency\NewThreadScheduler.cs">
+      <Link>Reactive\Concurrency\NewThreadScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.cs'>
-      <Link>Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.cs">
+      <Link>Reactive\Concurrency\ConcurrencyAbstractionLayerImpl.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\Thread.Stub.cs'>
-      <Link>Reactive/Concurrency/Thread.Stub.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Concurrency\Thread.Stub.cs">
+      <Link>Reactive\Concurrency\Thread.Stub.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.Windows.cs'>
-      <Link>Reactive/Concurrency/ThreadPoolScheduler.Windows.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.Windows.cs">
+      <Link>Reactive\Concurrency\ThreadPoolScheduler.Windows.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\EnlightenmentProvider.cs'>
-      <Link>Reactive/EnlightenmentProvider.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\EnlightenmentProvider.cs">
+      <Link>Reactive\EnlightenmentProvider.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\HostLifecycleNotifications.WindowsPhone.cs'>
-      <Link>Reactive/Internal/HostLifecycleNotifications.WindowsPhone.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Internal\HostLifecycleNotifications.WindowsPhone.cs">
+      <Link>Reactive\Internal\HostLifecycleNotifications.WindowsPhone.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\HostLifecycleNotifications.Windows.cs'>
-      <Link>Reactive/Internal/HostLifecycleNotifications.Windows.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Internal\HostLifecycleNotifications.Windows.cs">
+      <Link>Reactive\Internal\HostLifecycleNotifications.Windows.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\PhoneShellThunks.cs'>
-      <Link>Reactive/Internal/PhoneShellThunks.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Internal\PhoneShellThunks.cs">
+      <Link>Reactive\Internal\PhoneShellThunks.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\StopwatchImpl.cs'>
-      <Link>Reactive/Internal/StopwatchImpl.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Internal\StopwatchImpl.cs">
+      <Link>Reactive\Internal\StopwatchImpl.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\TaskPoolScheduler.cs'>
-      <Link>Reactive/Concurrency/TaskPoolScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Concurrency\TaskPoolScheduler.cs">
+      <Link>Reactive\Concurrency\TaskPoolScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.cs'>
-      <Link>Reactive/Concurrency/ThreadPoolScheduler.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Concurrency\ThreadPoolScheduler.cs">
+      <Link>Reactive\Concurrency\ThreadPoolScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\ExceptionServicesImpl.cs'>
-      <Link>Reactive/Internal/ExceptionServicesImpl.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Internal\ExceptionServicesImpl.cs">
+      <Link>Reactive\Internal\ExceptionServicesImpl.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\PlatformEnlightenmentProvider.cs'>
-      <Link>Reactive/Internal/PlatformEnlightenmentProvider.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Internal\PlatformEnlightenmentProvider.cs">
+      <Link>Reactive\Internal\PlatformEnlightenmentProvider.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Reactive\Internal\Stubs.cs'>
-      <Link>Reactive/Internal/Stubs.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Reactive\Internal\Stubs.cs">
+      <Link>Reactive\Internal\Stubs.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.PlatformServices\Strings_PlatformServices.Generated.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Strings_PlatformServices.Generated.cs">
       <Link>Strings_PlatformServices.Generated.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.Providers/android_System.Reactive.Providers.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj
index a39c85a..39af200 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
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{e662282b-4341-4f86-aaaa-a942335b47fb}</ProjectGuid>
+    <ProjectGuid>{E662282B-4341-4F86-AAAA-A942335B47FB}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>System.Reactive</RootNamespace>
@@ -13,8 +13,7 @@
     <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
-    <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
-
+    <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -42,17 +41,18 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-  <Name>android_System.Reactive.Linq</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <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>
@@ -61,52 +61,50 @@
     -->
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Strings_Providers.resx'>
-      <Link>Strings_Providers.resx</Link>
-    </EmbeddedResource>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\GlobalSuppressions.cs'>
+    <EmbeddedResource Include="..\..\..\..\System.Reactive.Providers\Strings_Providers.resx">
+      <Link>Strings_Providers.resx</Link>
+    </EmbeddedResource>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\GlobalSuppressions.cs">
       <Link>GlobalSuppressions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Properties\AssemblyInfo.cs'>
-      <Link>Properties/AssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Internal\Constants.cs'>
-      <Link>Reactive/Internal/Constants.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Reactive\Internal\Constants.cs">
+      <Link>Reactive\Internal\Constants.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Joins\QueryablePattern.cs'>
-      <Link>Reactive/Joins/QueryablePattern.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Reactive\Joins\QueryablePattern.cs">
+      <Link>Reactive\Joins\QueryablePattern.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Joins\QueryablePlan.cs'>
-      <Link>Reactive/Joins/QueryablePlan.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Reactive\Joins\QueryablePlan.cs">
+      <Link>Reactive\Joins\QueryablePlan.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\ExpressionVisitor.cs'>
-      <Link>Reactive/Linq/ExpressionVisitor.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Reactive\Linq\ExpressionVisitor.cs">
+      <Link>Reactive\Linq\ExpressionVisitor.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Observable.Queryable.cs'>
-      <Link>Reactive/Linq/Observable.Queryable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Reactive\Linq\Observable.Queryable.cs">
+      <Link>Reactive\Linq\Observable.Queryable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.cs'>
-      <Link>Reactive/Linq/Qbservable.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Reactive\Linq\Qbservable.cs">
+      <Link>Reactive\Linq\Qbservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.Generated.cs'>
-      <Link>Reactive/Linq/Qbservable.Generated.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Reactive\Linq\Qbservable.Generated.cs">
+      <Link>Reactive\Linq\Qbservable.Generated.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.Joins.cs'>
-      <Link>Reactive/Linq/Qbservable.Joins.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Reactive\Linq\Qbservable.Joins.cs">
+      <Link>Reactive\Linq\Qbservable.Joins.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\ObservableQuery.cs'>
-      <Link>Reactive/ObservableQuery.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Reactive\ObservableQuery.cs">
+      <Link>Reactive\ObservableQuery.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Strings_Providers.Generated.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Providers\Strings_Providers.Generated.cs">
       <Link>Strings_Providers.Generated.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.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 ba1c4d8..3af8b52 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
@@ -5,7 +5,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{a153a379-670c-42c2-9018-fc0d933a4f7f}</ProjectGuid>
+    <ProjectGuid>{A153A379-670C-42C2-9018-FC0D933A4F7F}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>System.Reactive</RootNamespace>
@@ -13,8 +13,7 @@
     <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
-    <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
-
+    <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -42,14 +41,14 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -58,25 +57,23 @@
     -->
   </ItemGroup>
   <ItemGroup>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\GlobalSuppressions.cs'>
+    <Compile Include="..\..\..\..\System.Reactive.Runtime.Remoting\GlobalSuppressions.cs">
       <Link>GlobalSuppressions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Properties\AssemblyInfo.cs'>
-      <Link>Properties/AssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Runtime.Remoting\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Reactive\Linq\Observable.Remoting.cs'>
-      <Link>Reactive/Linq/Observable.Remoting.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Runtime.Remoting\Reactive\Linq\Observable.Remoting.cs">
+      <Link>Reactive\Linq\Observable.Remoting.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\System.Reactive.Runtime.Remoting\Reactive\Linq\QueryLanguage.Remoting.cs'>
-      <Link>Reactive/Linq/QueryLanguage.Remoting.cs</Link>
+    <Compile Include="..\..\..\..\System.Reactive.Runtime.Remoting\Reactive\Linq\QueryLanguage.Remoting.cs">
+      <Link>Reactive\Linq\QueryLanguage.Remoting.cs</Link>
     </Compile>
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
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 389dbf9..f751067 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
@@ -5,13 +5,12 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>10.0.0</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{73c5260f-8972-4e7c-822b-1a3a0358fa0b}</ProjectGuid>
+    <ProjectGuid>{73C5260F-8972-4E7C-822B-1A3A0358FA0B}</ProjectGuid>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <RootNamespace>System.Reactive</RootNamespace>
     <AssemblyName>Tests.System.Reactive</AssemblyName>
     <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants>
-    
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -39,38 +38,42 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-<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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}</Project>
-  <Name>android_Mono.Reactive.Testing</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project>
-  <Name>android_System.Reactive.Experimental</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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' " xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Project>{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}</Project>
-  <Name>android_System.Reactive.Providers</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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' " xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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' " xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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>
+      <Name>Android.NUnitLite</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Mono.Reactive.Testing\android_Mono.Reactive.Testing.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{CB2AB716-BFCB-43BC-A03B-A3BDA427746C}</Project>
+      <Name>android_Mono.Reactive.Testing</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{00DC3654-E373-4E3F-80FE-109F795ADF1F}</Project>
+      <Name>android_System.Reactive.Experimental</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <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' " xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{E662282B-4341-4F86-AAAA-A942335B47FB}</Project>
+      <Name>android_System.Reactive.Providers</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</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' " xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+      <Project>{A153A379-670C-42C2-9018-FC0D933A4F7F}</Project>
+      <Name>android_System.Reactive.Runtime.Remoting</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -79,262 +82,260 @@
     -->
   </ItemGroup>
   <ItemGroup>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\App.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\App.cs">
       <Link>App.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\DispatcherHelpers.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\DispatcherHelpers.cs">
       <Link>DispatcherHelpers.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Semaphore.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Semaphore.cs">
       <Link>Semaphore.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Stress\Core\Disposables\Composite.cs'>
-      <Link>Stress/Core/Disposables/Composite.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Core\Disposables\Composite.cs">
+      <Link>Stress\Core\Disposables\Composite.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Stress\Core\Disposables\Serial.cs'>
-      <Link>Stress/Core/Disposables/Serial.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Core\Disposables\Serial.cs">
+      <Link>Stress\Core\Disposables\Serial.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Stress\Core\Disposables\SingleAssignment.cs'>
-      <Link>Stress/Core/Disposables/SingleAssignment.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Core\Disposables\SingleAssignment.cs">
+      <Link>Stress\Core\Disposables\SingleAssignment.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Stress\Core\Disposables\RefCount.cs'>
-      <Link>Stress/Core/Disposables/RefCount.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Core\Disposables\RefCount.cs">
+      <Link>Stress\Core\Disposables\RefCount.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Stress\Linq\Delay.cs'>
-      <Link>Stress/Linq/Delay.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Linq\Delay.cs">
+      <Link>Stress\Linq\Delay.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Stress\Linq\FromEvent.cs'>
-      <Link>Stress/Linq/FromEvent.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Linq\FromEvent.cs">
+      <Link>Stress\Linq\FromEvent.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Stress\Helpers.cs'>
-      <Link>Stress/Helpers.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Helpers.cs">
+      <Link>Stress\Helpers.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Stress\Linq\Replay.cs'>
-      <Link>Stress/Linq/Replay.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Linq\Replay.cs">
+      <Link>Stress\Linq\Replay.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\TestBase.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\TestBase.cs">
       <Link>TestBase.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\TestLongRunningScheduler.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\TestLongRunningScheduler.cs">
       <Link>TestLongRunningScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\AnonymousTest.cs'>
-      <Link>Tests/AnonymousTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\AnonymousTest.cs">
+      <Link>Tests\AnonymousTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\ConcurrencyTest.cs'>
-      <Link>Tests/Concurrency/ConcurrencyTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\ConcurrencyTest.cs">
+      <Link>Tests\Concurrency\ConcurrencyTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\ScheduledItemTest.cs'>
-      <Link>Tests/Concurrency/ScheduledItemTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\ScheduledItemTest.cs">
+      <Link>Tests\Concurrency\ScheduledItemTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\StopwatchTest.cs'>
-      <Link>Tests/Concurrency/StopwatchTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\StopwatchTest.cs">
+      <Link>Tests\Concurrency\StopwatchTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\SynchronizationTest.cs'>
-      <Link>Tests/Concurrency/SynchronizationTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\SynchronizationTest.cs">
+      <Link>Tests\Concurrency\SynchronizationTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\ConnectableObservable.cs'>
-      <Link>Tests/ConnectableObservable.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\ConnectableObservable.cs">
+      <Link>Tests\ConnectableObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\ConnectableObservableTest.cs'>
-      <Link>Tests/ConnectableObservableTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\ConnectableObservableTest.cs">
+      <Link>Tests\ConnectableObservableTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\AsyncLockTest.cs'>
-      <Link>Tests/Concurrency/AsyncLockTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\AsyncLockTest.cs">
+      <Link>Tests\Concurrency\AsyncLockTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\ControlSchedulerTest.cs'>
-      <Link>Tests/Concurrency/ControlSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\ControlSchedulerTest.cs">
+      <Link>Tests\Concurrency\ControlSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\CurrentThreadSchedulerTest.cs'>
-      <Link>Tests/Concurrency/CurrentThreadSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\CurrentThreadSchedulerTest.cs">
+      <Link>Tests\Concurrency\CurrentThreadSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\DefaultSchedulerTest.cs'>
-      <Link>Tests/Concurrency/DefaultSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\DefaultSchedulerTest.cs">
+      <Link>Tests\Concurrency\DefaultSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\EventLoopSchedulerTest.cs'>
-      <Link>Tests/Concurrency/EventLoopSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\EventLoopSchedulerTest.cs">
+      <Link>Tests\Concurrency\EventLoopSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\HistoricalSchedulerTest.cs'>
-      <Link>Tests/Concurrency/HistoricalSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\HistoricalSchedulerTest.cs">
+      <Link>Tests\Concurrency\HistoricalSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\ImmediateSchedulerTest.cs'>
-      <Link>Tests/Concurrency/ImmediateSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\ImmediateSchedulerTest.cs">
+      <Link>Tests\Concurrency\ImmediateSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\NewThreadSchedulerTest.cs'>
-      <Link>Tests/Concurrency/NewThreadSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\NewThreadSchedulerTest.cs">
+      <Link>Tests\Concurrency\NewThreadSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\SchedulerTest.cs'>
-      <Link>Tests/Concurrency/SchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\SchedulerTest.cs">
+      <Link>Tests\Concurrency\SchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\SynchronizationContextSchedulerTest.cs'>
-      <Link>Tests/Concurrency/SynchronizationContextSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\SynchronizationContextSchedulerTest.cs">
+      <Link>Tests\Concurrency\SynchronizationContextSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\TaskPoolSchedulerTest.cs'>
-      <Link>Tests/Concurrency/TaskPoolSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\TaskPoolSchedulerTest.cs">
+      <Link>Tests\Concurrency\TaskPoolSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\ThreadPoolSchedulerTest.cs'>
-      <Link>Tests/Concurrency/ThreadPoolSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\ThreadPoolSchedulerTest.cs">
+      <Link>Tests\Concurrency\ThreadPoolSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Concurrency\VirtualSchedulerTest.cs'>
-      <Link>Tests/Concurrency/VirtualSchedulerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Concurrency\VirtualSchedulerTest.cs">
+      <Link>Tests\Concurrency\VirtualSchedulerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Disposables\DisposableTests.cs'>
-      <Link>Tests/Disposables/DisposableTests.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Disposables\DisposableTests.cs">
+      <Link>Tests\Disposables\DisposableTests.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableAggregateTest.cs'>
-      <Link>Tests/Linq/ObservableAggregateTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableAggregateTest.cs">
+      <Link>Tests\Linq\ObservableAggregateTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableAsyncTest.cs'>
-      <Link>Tests/Linq/ObservableAsyncTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableAsyncTest.cs">
+      <Link>Tests\Linq\ObservableAsyncTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableAwaiterTest.cs'>
-      <Link>Tests/Linq/ObservableAwaiterTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableAwaiterTest.cs">
+      <Link>Tests\Linq\ObservableAwaiterTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableBindingTest.cs'>
-      <Link>Tests/Linq/ObservableBindingTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableBindingTest.cs">
+      <Link>Tests\Linq\ObservableBindingTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableBlockingTest.cs'>
-      <Link>Tests/Linq/ObservableBlockingTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableBlockingTest.cs">
+      <Link>Tests\Linq\ObservableBlockingTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableConversionTests.cs'>
-      <Link>Tests/Linq/ObservableConversionTests.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableConversionTests.cs">
+      <Link>Tests\Linq\ObservableConversionTests.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableCreationTest.cs'>
-      <Link>Tests/Linq/ObservableCreationTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableCreationTest.cs">
+      <Link>Tests\Linq\ObservableCreationTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableEventsTest.cs'>
-      <Link>Tests/Linq/ObservableEventsTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableEventsTest.cs">
+      <Link>Tests\Linq\ObservableEventsTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableExtensionsTest.cs'>
-      <Link>Tests/Linq/ObservableExtensionsTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableExtensionsTest.cs">
+      <Link>Tests\Linq\ObservableExtensionsTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableImperativeTest.cs'>
-      <Link>Tests/Linq/ObservableImperativeTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableImperativeTest.cs">
+      <Link>Tests\Linq\ObservableImperativeTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableJoinsTest.cs'>
-      <Link>Tests/Linq/ObservableJoinsTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableJoinsTest.cs">
+      <Link>Tests\Linq\ObservableJoinsTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableMultipleTest.cs'>
-      <Link>Tests/Linq/ObservableMultipleTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableMultipleTest.cs">
+      <Link>Tests\Linq\ObservableMultipleTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableRemotingTest.cs'>
-      <Link>Tests/Linq/ObservableRemotingTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableRemotingTest.cs">
+      <Link>Tests\Linq\ObservableRemotingTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableSafetyTest.cs'>
-      <Link>Tests/Linq/ObservableSafetyTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableSafetyTest.cs">
+      <Link>Tests\Linq\ObservableSafetyTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableSingleTest.cs'>
-      <Link>Tests/Linq/ObservableSingleTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableSingleTest.cs">
+      <Link>Tests\Linq\ObservableSingleTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableStandardQueryOperatorTest.cs'>
-      <Link>Tests/Linq/ObservableStandardQueryOperatorTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableStandardQueryOperatorTest.cs">
+      <Link>Tests\Linq\ObservableStandardQueryOperatorTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\ObservableTimeTest.cs'>
-      <Link>Tests/Linq/ObservableTimeTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableTimeTest.cs">
+      <Link>Tests\Linq\ObservableTimeTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\QbservableExTest.cs'>
-      <Link>Tests/Linq/QbservableExTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\QbservableExTest.cs">
+      <Link>Tests\Linq\QbservableExTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\QbservableTest.cs'>
-      <Link>Tests/Linq/QbservableTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\QbservableTest.cs">
+      <Link>Tests\Linq\QbservableTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\Subjects\AsyncSubjectTest.cs'>
-      <Link>Tests/Linq/Subjects/AsyncSubjectTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\Subjects\AsyncSubjectTest.cs">
+      <Link>Tests\Linq\Subjects\AsyncSubjectTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\Subjects\BehaviorSubjectTest.cs'>
-      <Link>Tests/Linq/Subjects/BehaviorSubjectTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\Subjects\BehaviorSubjectTest.cs">
+      <Link>Tests\Linq\Subjects\BehaviorSubjectTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\Subjects\ReplaySubjectTest.cs'>
-      <Link>Tests/Linq/Subjects/ReplaySubjectTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\Subjects\ReplaySubjectTest.cs">
+      <Link>Tests\Linq\Subjects\ReplaySubjectTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\Linq\Subjects\SubjectTest.cs'>
-      <Link>Tests/Linq/Subjects/SubjectTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\Subjects\SubjectTest.cs">
+      <Link>Tests\Linq\Subjects\SubjectTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\MySubject.cs'>
-      <Link>Tests/MySubject.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\MySubject.cs">
+      <Link>Tests\MySubject.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\RogueEnumerable.cs'>
-      <Link>Tests/RogueEnumerable.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\RogueEnumerable.cs">
+      <Link>Tests\RogueEnumerable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\SystemClockTest.cs'>
-      <Link>Tests/SystemClockTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\SystemClockTest.cs">
+      <Link>Tests\SystemClockTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\DefaultConcurrencyAbstractionLayerTest.cs'>
-      <Link>Tests/DefaultConcurrencyAbstractionLayerTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\DefaultConcurrencyAbstractionLayerTest.cs">
+      <Link>Tests\DefaultConcurrencyAbstractionLayerTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\EventPatternSourceBaseTest.cs'>
-      <Link>Tests/EventPatternSourceBaseTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\EventPatternSourceBaseTest.cs">
+      <Link>Tests\EventPatternSourceBaseTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\NotificationTest.cs'>
-      <Link>Tests/NotificationTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\NotificationTest.cs">
+      <Link>Tests\NotificationTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\TaskObservableExtensionsTest.cs'>
-      <Link>Tests/TaskObservableExtensionsTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\TaskObservableExtensionsTest.cs">
+      <Link>Tests\TaskObservableExtensionsTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\TimeTests.cs'>
-      <Link>Tests/TimeTests.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\TimeTests.cs">
+      <Link>Tests\TimeTests.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\UnitTest.cs'>
-      <Link>Tests/UnitTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\UnitTest.cs">
+      <Link>Tests\UnitTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Dummies\DummyDisposable.cs'>
-      <Link>Dummies/DummyDisposable.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Dummies\DummyDisposable.cs">
+      <Link>Dummies\DummyDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Dummies\DummyEnumerable.cs'>
-      <Link>Dummies/DummyEnumerable.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Dummies\DummyEnumerable.cs">
+      <Link>Dummies\DummyEnumerable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Dummies\DummyFunc.cs'>
-      <Link>Dummies/DummyFunc.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Dummies\DummyFunc.cs">
+      <Link>Dummies\DummyFunc.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Dummies\DummyObservable.cs'>
-      <Link>Dummies/DummyObservable.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Dummies\DummyObservable.cs">
+      <Link>Dummies\DummyObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Dummies\DummyObserver.cs'>
-      <Link>Dummies/DummyObserver.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Dummies\DummyObserver.cs">
+      <Link>Dummies\DummyObserver.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Dummies\DummyScheduler.cs'>
-      <Link>Dummies/DummyScheduler.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Dummies\DummyScheduler.cs">
+      <Link>Dummies\DummyScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Extensions.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Extensions.cs">
       <Link>Extensions.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\MockDisposable.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\MockDisposable.cs">
       <Link>MockDisposable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\MockEnumerable.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\MockEnumerable.cs">
       <Link>MockEnumerable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\NullErrorObservable.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\NullErrorObservable.cs">
       <Link>NullErrorObservable.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Properties\AssemblyInfo.cs'>
-      <Link>Properties/AssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Properties\AssemblyInfo.cs">
+      <Link>Properties\AssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\ListObservableTest.cs'>
-      <Link>Tests/ListObservableTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\ListObservableTest.cs">
+      <Link>Tests\ListObservableTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\ObserverTest.cs'>
-      <Link>Tests/ObserverTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\ObserverTest.cs">
+      <Link>Tests\ObserverTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\PrivateTypesTest.cs'>
-      <Link>Tests/PrivateTypesTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\PrivateTypesTest.cs">
+      <Link>Tests\PrivateTypesTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Tests\RegressionTest.cs'>
-      <Link>Tests/RegressionTest.cs</Link>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\RegressionTest.cs">
+      <Link>Tests\RegressionTest.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\TestTaskScheduler.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\TestTaskScheduler.cs">
       <Link>TestTaskScheduler.cs</Link>
     </Compile>
-    <Compile Include='..\..\..\..\..\..\..\..\..\external\rx\Rx\NET\Source\Tests.System.Reactive\Utils.cs'>
+    <Compile Include="..\..\..\..\Tests.System.Reactive\Utils.cs">
       <Link>Utils.cs</Link>
     </Compile>
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>