fix project files so that both VS and MD can load. switch to Windows-built binaries. Add Mono.Reactive.Testing.dll.

28 files changed, 51 insertions, 54 deletions

diff --git a/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln b/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
index ac5aafb..0f16f4b 100644..100755
--- a/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
+++ b/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
@@ -35,8 +35,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_Tests.System.Reacti
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C23266F1-B70D-414C-88CD-F5BD27F6ACE3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GithubApiClientSample", "..\..\..\..\..\..\..\..\..\..\svn\mono\external\rx\Rx\NET\Source\Rx_Xamarin\android\GithubApiClientSample\GithubApiClientSample.csproj", "{27910E6B-04A5-46E2-9AC6-BAC2A17A504A}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,10 +45,6 @@ Global
 		{00DC3654-E373-4E3F-80FE-109F795ADF1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{00DC3654-E373-4E3F-80FE-109F795ADF1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00DC3654-E373-4E3F-80FE-109F795ADF1F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{27910E6B-04A5-46E2-9AC6-BAC2A17A504A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{27910E6B-04A5-46E2-9AC6-BAC2A17A504A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{27910E6B-04A5-46E2-9AC6-BAC2A17A504A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{27910E6B-04A5-46E2-9AC6-BAC2A17A504A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33044C7B-47A4-4113-A61A-EB429407F818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{33044C7B-47A4-4113-A61A-EB429407F818}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33044C7B-47A4-4113-A61A-EB429407F818}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -145,7 +139,6 @@ Global
 		{47673BC8-F954-4304-9472-2773AA5A94EB} = {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}
-		{27910E6B-04A5-46E2-9AC6-BAC2A17A504A} = {C23266F1-B70D-414C-88CD-F5BD27F6ACE3}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		StartupItem = android\Andr.Unit\Andr.Unit\Andr.Unit.csproj
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll
new file mode 100755
index 0000000..4571647
--- /dev/null
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll.mdb
new file mode 100755
index 0000000..1bf810f
--- /dev/null
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll.mdb
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll
index f187dc1..ac31f1f 100755
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll.mdb
index eacaefe..730fcab 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll.mdb
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll.mdb
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll
index 1a5a507..3fcaa87 100755
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll.mdb
index c7bfa1e..d1117e7 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll.mdb
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll.mdb
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll
index 7b651d3..5f05cf5 100755
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll.mdb
index 1d57ec3..e4aa021 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll.mdb
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll.mdb
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll
index 915024a..b08589d 100755
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll.mdb
index ba8341c..9fa1098 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll.mdb
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll.mdb
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll
index ea6e2bc..dc1e421 100755
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll.mdb
index 8c0b3de..e3b7b54 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll.mdb
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll.mdb
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll
index 1cb565c..82c5df7 100755
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll.mdb
index 5fa73ae..f7cd3f0 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll.mdb
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll.mdb
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll
index ec91ecc..b96f77a 100755
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll.mdb
index 7895f0e..fa5acfa 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll.mdb
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll.mdb
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll
index 0e25534..e38a83e 100755
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll
diff --git a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll.mdb b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll.mdb
index 8274cab..de211c3 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll.mdb
+++ b/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll.mdb
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 3b6c5b8..4177055 100644..100755
--- 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
@@ -42,24 +42,24 @@
       <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">
+    <!--
+    <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>{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">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
       <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
       <Name>android_System.Reactive.Linq</Name>
     </ProjectReference>
-    <!--
-    <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
-      <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project>
-      <Name>Android.NUnitLite</Name>
-    </ProjectReference>
-    -->
   </ItemGroup>
   <ItemGroup>
     <!--
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 46dc153..9349d4a 100644..100755
--- 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
@@ -41,7 +41,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
       <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
       <Name>android_System.Reactive.Interfaces</Name>
     </ProjectReference>
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 cc45e01..5464b5c 100644..100755
--- 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
@@ -41,23 +41,23 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj">
       <Project>{D263C126-9D3C-4299-A0C1-F25C703D07C9}</Project>
       <Name>android_System.Reactive.PlatformServices</Name>
     </ProjectReference>
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 bc15650..c54d35f 100644..100755
--- 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
@@ -41,15 +41,15 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
       <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
       <Name>android_System.Reactive.Interfaces</Name>
     </ProjectReference>
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 80ce3d2..4b2bbe9 100644..100755
--- 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
@@ -41,11 +41,11 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
       <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
       <Name>android_System.Reactive.Interfaces</Name>
     </ProjectReference>
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 8802468..bb1286a 100644..100755
--- 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
@@ -41,15 +41,15 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
       <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
       <Name>android_System.Reactive.Linq</Name>
     </ProjectReference>
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 39af200..78205d1 100644..100755
--- 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
@@ -41,15 +41,15 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
       <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
       <Name>android_System.Reactive.Linq</Name>
     </ProjectReference>
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 3af8b52..58d2929 100644..100755
--- 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
@@ -41,11 +41,11 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj">
       <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project>
       <Name>android_System.Reactive.Interfaces</Name>
     </ProjectReference>
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 f751067..2a6ef7a 100644..100755
--- 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
@@ -42,44 +42,48 @@
       <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">
+    <!--
+    <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>{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">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-      <Project>{00DC3654-E373-4E3F-80FE-109F795ADF1F}</Project>
-      <Name>android_System.Reactive.Experimental</Name>
+    <ProjectReference Include="..\System.Reactive.Debugger\android_System.Reactive.Debugger.csproj">
+      <Project>{9360E845-D79D-4288-9100-63A80FAD2BF0}</Project>
+      <Name>android_System.Reactive.Debugger</Name>
     </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj">
+      <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project>
+      <Name>android_System.Reactive.Linq</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj">
       <Project>{D263C126-9D3C-4299-A0C1-F25C703D07C9}</Project>
       <Name>android_System.Reactive.PlatformServices</Name>
     </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Providers\android_System.Reactive.Providers.csproj" Condition=" '$(BuildFlavor)' != 'SILVERLIGHTM7' And '$(BuildPlatform)' != 'XNA' " xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <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.Providers\android_System.Reactive.Providers.csproj">
       <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">
+    <ProjectReference Include="..\System.Reactive.Runtime.Remoting\android_System.Reactive.Runtime.Remoting.csproj">
       <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>
-      <Name>Android.NUnitLite</Name>
-    </ProjectReference>
-    -->
   </ItemGroup>
   <ItemGroup>
     <!--