Use new Unit Test project instead of Andr.Unit.

Then now we are not bothered to see messy text overlap.

11 files changed, 11 insertions, 29 deletions

diff --git a/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln b/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
index 830b128..ad15edb 100644
--- a/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
+++ b/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln
@@ -21,16 +21,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_System.Reactive.Pro
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BC795ED9-C969-496A-8433-C47BA91CA87C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Android.NUnitLite", "android\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj", "{6A005891-A3D6-4398-A729-F645397D573A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoDroid.Dialog", "android\MonoDroid.Dialog\MonoDroid.Dialog\MonoDroid.Dialog.csproj", "{33044C7B-47A4-4113-A61A-EB429407F818}"
-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_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
+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}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C23266F1-B70D-414C-88CD-F5BD27F6ACE3}"
 EndProject
 Global
@@ -43,22 +39,14 @@ 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
-		{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
-		{33044C7B-47A4-4113-A61A-EB429407F818}.Release|Any CPU.Build.0 = Release|Any CPU
-		{47673BC8-F954-4304-9472-2773AA5A94EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{47673BC8-F954-4304-9472-2773AA5A94EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{47673BC8-F954-4304-9472-2773AA5A94EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{47673BC8-F954-4304-9472-2773AA5A94EB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{307C128B-762F-478D-AF70-485A1792DA9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{307C128B-762F-478D-AF70-485A1792DA9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{307C128B-762F-478D-AF70-485A1792DA9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{307C128B-762F-478D-AF70-485A1792DA9A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6A005891-A3D6-4398-A729-F645397D573A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A005891-A3D6-4398-A729-F645397D573A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A005891-A3D6-4398-A729-F645397D573A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A005891-A3D6-4398-A729-F645397D573A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73C5260F-8972-4E7C-822B-1A3A0358FA0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73C5260F-8972-4E7C-822B-1A3A0358FA0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73C5260F-8972-4E7C-822B-1A3A0358FA0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -130,10 +118,12 @@ 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}
+		{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}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = android\Andr.Unit\Andr.Unit\Andr.Unit.csproj
+		StartupItem = android\ReactiveTestApplication\ReactiveTestApplication.csproj
 	EndGlobalSection
 EndGlobal
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 800e248..9fcb8ad 100755..100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/Mono.Reactive.Testing/android_Mono.Reactive.Testing.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/Mono.Reactive.Testing/android_Mono.Reactive.Testing.csproj
@@ -30,13 +30,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
+    <Reference Include="Xamarin.Android.NUnitLite" />
   </ItemGroup>
   <ItemGroup>
 <ProjectReference Include="..\..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"><Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project><Name>Android.NUnitLite</Name></ProjectReference>
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 2a5c851..daac19e 100755..100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/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 d336157..547b855 100755..100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/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 6c3099c..3b07f8c 100755..100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/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 88dce4c..0587511 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/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 afd5491..b910c1c 100755..100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/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 d5968cb..9126046 100755..100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/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 1b04227..9843304 100755..100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/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 c908963..49b3318 100755..100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Runtime.Remoting/android_System.Reactive.Runtime.Remoting.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Runtime.Remoting/android_System.Reactive.Runtime.Remoting.csproj
@@ -30,7 +30,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
diff --git a/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj b/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj
index 8a603c2..54df307 100644
--- a/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj
@@ -30,13 +30,13 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>False</ConsolePause>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
+    <Reference Include="Xamarin.Android.NUnitLite" />
   </ItemGroup>
   <ItemGroup>
 <ProjectReference Include="..\..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"><Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project><Name>Android.NUnitLite</Name></ProjectReference>