Fix project paths in sln. The earlier commits are done when monodevelop had some bug to generate invalid paths.rx-oss-v2.1

10 files changed, 113 insertions, 135 deletions

diff --git a/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln b/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
index ad15edb..ef90645 100644
--- a/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
+++ b/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
@@ -25,7 +25,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_Mono.Reactive.Testi
 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}") = "ReactiveTestApplication", "..\..\..\..\..\..\..\..\..\..\svn\mono\external\rx\Rx\NET\Source\Rx_Xamarin\android\ReactiveTestApplication\ReactiveTestApplication.csproj", "{307C128B-762F-478D-AF70-485A1792DA9A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveTestApplication", "android\ReactiveTestApplication\ReactiveTestApplication.csproj", "{307C128B-762F-478D-AF70-485A1792DA9A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C23266F1-B70D-414C-88CD-F5BD27F6ACE3}"
 EndProject
@@ -115,10 +115,6 @@ Global
 		{00DC3654-E373-4E3F-80FE-109F795ADF1F} = {9AF9A490-2CD2-47CE-9E01-F3A799524F58}
 		{9360E845-D79D-4288-9100-63A80FAD2BF0} = {9AF9A490-2CD2-47CE-9E01-F3A799524F58}
 		{E662282B-4341-4F86-AAAA-A942335B47FB} = {9AF9A490-2CD2-47CE-9E01-F3A799524F58}
-		{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}
-		{A153A379-670C-42C2-9018-FC0D933A4F7F} = {9AF9A490-2CD2-47CE-9E01-F3A799524F58}
 		{CB2AB716-BFCB-43BC-A03B-A3BDA427746C} = {BC795ED9-C969-496A-8433-C47BA91CA87C}
 		{73C5260F-8972-4E7C-822B-1A3A0358FA0B} = {BC795ED9-C969-496A-8433-C47BA91CA87C}
 		{307C128B-762F-478D-AF70-485A1792DA9A} = {BC795ED9-C969-496A-8433-C47BA91CA87C}
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 9fcb8ad..9840754 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
@@ -39,17 +39,18 @@
     <Reference Include="Xamarin.Android.NUnitLite" />
   </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">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-  <Name>android_System.Reactive.Linq</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
+      <Name>android_System.Reactive.Linq</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -97,13 +98,11 @@
     <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\TestScheduler.cs">
       <Link>TestScheduler.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj
index daac19e..9490291 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
@@ -38,11 +38,10 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+      <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>
@@ -285,16 +284,14 @@
     <Compile Include="..\..\..\..\System.Reactive.Core\Strings_Core.Generated.cs">
       <Link>Strings_Core.Generated.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Core/Strings_Core.resx'>
+    <EmbeddedResource Include="..\..\..\..\System.Reactive.Core\Strings_Core.resx">
       <Link>Strings_Core.resx</Link>
     </EmbeddedResource>
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj
index 547b855..7b35028 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
@@ -38,23 +38,26 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj">
-  <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project>
-  <Name>android_System.Reactive.Experimental</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-  <Name>android_System.Reactive.Linq</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj">
-  <Project>{0CCCF009-763F-40D2-8655-7A94828023BF}</Project>
-  <Name>android_System.Reactive.PlatformServices</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj">
+      <Project>{00DC3654-E373-4E3F-80FE-109F795ADF1F}</Project>
+      <Name>android_System.Reactive.Experimental</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
+      <Name>android_System.Reactive.Linq</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj">
+      <Project>{D263C126-9D3C-4299-A0C1-F25C703D07C9}</Project>
+      <Name>android_System.Reactive.PlatformServices</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -69,13 +72,11 @@
     <Compile Include="..\..\..\..\System.Reactive.Debugger\Reactive\Linq\QueryDebugger.cs">
       <Link>Reactive\Linq\QueryDebugger.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj
index 3b07f8c..91ec222 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
@@ -38,17 +38,18 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-  <Name>android_System.Reactive.Linq</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
+      <Name>android_System.Reactive.Linq</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -87,13 +88,11 @@
     <Compile Include="..\..\..\..\System.Reactive.Experimental\Reactive\ListObservable.cs">
       <Link>Reactive\ListObservable.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj
index 0587511..02609bd 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
@@ -38,8 +38,6 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -120,13 +118,11 @@
     <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Subjects\ISubject.Multi.cs">
       <Link>Reactive\Subjects\ISubject.Multi.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj
index b910c1c..e84e793 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
@@ -38,14 +38,14 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -567,16 +567,14 @@
     <Compile Include="..\..\..\..\System.Reactive.Linq\Strings_Linq.Generated.cs">
       <Link>Strings_Linq.Generated.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Strings_Linq.resx'>
+    <EmbeddedResource Include="..\..\..\..\System.Reactive.Linq\Strings_Linq.resx">
       <Link>Strings_Linq.resx</Link>
     </EmbeddedResource>
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj
index 9126046..f7d7cf5 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
@@ -38,17 +38,18 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-  <Name>android_System.Reactive.Linq</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
+      <Name>android_System.Reactive.Linq</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -114,16 +115,14 @@
     <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Strings_PlatformServices.Generated.cs">
       <Link>Strings_PlatformServices.Generated.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Strings_PlatformServices.resx'>
+    <EmbeddedResource Include="..\..\..\..\System.Reactive.PlatformServices\Strings_PlatformServices.resx">
       <Link>Strings_PlatformServices.resx</Link>
     </EmbeddedResource>
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj
index 9843304..ea3eccc 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
@@ -38,17 +38,18 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-
-<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-  <Name>android_System.Reactive.Linq</Name>
-</ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
+      <Name>android_System.Reactive.Linq</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -93,16 +94,14 @@
     <Compile Include="..\..\..\..\System.Reactive.Providers\Strings_Providers.Generated.cs">
       <Link>Strings_Providers.Generated.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-    <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Strings_Providers.resx'>
+    <EmbeddedResource Include="..\..\..\..\System.Reactive.Providers\Strings_Providers.resx">
       <Link>Strings_Providers.resx</Link>
     </EmbeddedResource>
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/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 54df307..b1f3ffb 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
@@ -39,38 +39,34 @@
     <Reference Include="Xamarin.Android.NUnitLite" />
   </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">
-  <Project>{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}</Project>
-  <Name>android_Mono.Reactive.Testing</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
-  <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-  <Name>android_System.Reactive.Core</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj">
-  <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project>
-  <Name>android_System.Reactive.Experimental</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
-  <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-  <Name>android_System.Reactive.Interfaces</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj">
-  <Project>{0CCCF009-763F-40D2-8655-7A94828023BF}</Project>
-  <Name>android_System.Reactive.PlatformServices</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Providers\android_System.Reactive.Providers.csproj" Condition=" '$(BuildFlavor)' != 'SILVERLIGHTM7' And '$(BuildPlatform)' != 'XNA' ">
-  <Project>{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}</Project>
-  <Name>android_System.Reactive.Providers</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
-  <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-  <Name>android_System.Reactive.Linq</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Runtime.Remoting\android_System.Reactive.Runtime.Remoting.csproj" Condition=" '$(BuildPlatform)' != 'WINDOWS_PHONE' And '$(BuildTarget)' != 'WP7' ">
-  <Project>{7A6EF49E-7946-4101-9C89-407B9C53A173}</Project>
-  <Name>android_System.Reactive.Runtime.Remoting</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Windows.Forms\android_System.Reactive.Windows.Forms.csproj" Condition=" '$(BuildPlatform)' == 'DESKTOPCLR' ">
-  <Project>{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}</Project>
-  <Name>android_System.Reactive.Windows.Forms</Name>
-</ProjectReference><ProjectReference Include="..\System.Reactive.Windows.Threading\android_System.Reactive.Windows.Threading.csproj">
-  <Project>{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}</Project>
-  <Name>android_System.Reactive.Windows.Threading</Name>
-</ProjectReference>
+    <ProjectReference Include="..\Mono.Reactive.Testing\android_Mono.Reactive.Testing.csproj">
+      <Project>{CB2AB716-BFCB-43BC-A03B-A3BDA427746C}</Project>
+      <Name>android_Mono.Reactive.Testing</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj">
+      <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project>
+      <Name>android_System.Reactive.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj">
+      <Project>{00DC3654-E373-4E3F-80FE-109F795ADF1F}</Project>
+      <Name>android_System.Reactive.Experimental</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
+      <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
+      <Name>android_System.Reactive.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj">
+      <Project>{D263C126-9D3C-4299-A0C1-F25C703D07C9}</Project>
+      <Name>android_System.Reactive.PlatformServices</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Providers\android_System.Reactive.Providers.csproj" Condition=" '$(BuildFlavor)' != 'SILVERLIGHTM7' And '$(BuildPlatform)' != 'XNA' ">
+      <Project>{E662282B-4341-4F86-AAAA-A942335B47FB}</Project>
+      <Name>android_System.Reactive.Providers</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
+      <Name>android_System.Reactive.Linq</Name>
+    </ProjectReference>
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
       <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
@@ -331,13 +327,11 @@
     <Compile Include="..\..\..\..\Tests.System.Reactive\Utils.cs">
       <Link>Utils.cs</Link>
     </Compile>
-
     <!--
     <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs">
       <Link>ColdObservable.cs</Link>
     </Compile>
     -->
-
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" />
 </Project>