iOS projects now build too.

17 files changed, 81 insertions, 73 deletions

diff --git a/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_iOS.sln b/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_iOS.sln
index 6c18c00..181d00d 100644
--- a/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_iOS.sln
+++ b/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_iOS.sln
@@ -5,11 +5,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{231BAB54-E48
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{26F4BC01-FBB4-4FD3-962E-0CE3E2EA2DE2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ios_Mono.Reactive.Testing", "iOS\Mono.Reactive.Testing\ios_Mono.Reactive.Testing.csproj", "{47D85A91-E8E2-4088-BF5A-68A161754D48}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ios_UnitTest", "iOS\ios_UnitTest\ios_UnitTest.csproj", "{42520E71-AD33-45A4-90C8-92F87B0EB119}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ios_Tests.System.Reactive", "iOS\Tests.System.Reactive\ios_Tests.System.Reactive.csproj", "{45377009-1425-47FC-985E-05F98022F9E3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ios_Mono.Reactive.Testing", "iOS\rx\Mono.Reactive.Testing\ios_Mono.Reactive.Testing.csproj", "{47D85A91-E8E2-4088-BF5A-68A161754D48}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ios_UnitTest", "iOS\ios_UnitTest\ios_UnitTest.csproj", "{42520E71-AD33-45A4-90C8-92F87B0EB119}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ios_Tests.System.Reactive", "iOS\rx\Tests.System.Reactive\ios_Tests.System.Reactive.csproj", "{45377009-1425-47FC-985E-05F98022F9E3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rx", "rx", "{A38611CA-29F7-497B-9E9D-945943F3E5A0}"
 EndProject
@@ -39,10 +39,10 @@ Global
 		AppStore|iPhone = AppStore|iPhone
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -55,10 +55,10 @@ Global
 		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.Release|iPhone.Build.0 = Release|Any CPU
 		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{0A977063-0796-4CD4-84B8-AEDB2D648B26}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{24F995BD-7075-489C-B7A5-7FDE08C304B6}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -87,10 +87,10 @@ Global
 		{42520E71-AD33-45A4-90C8-92F87B0EB119}.Release|iPhone.Build.0 = Release|iPhone
 		{42520E71-AD33-45A4-90C8-92F87B0EB119}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
 		{42520E71-AD33-45A4-90C8-92F87B0EB119}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{45377009-1425-47FC-985E-05F98022F9E3}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{45377009-1425-47FC-985E-05F98022F9E3}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{45377009-1425-47FC-985E-05F98022F9E3}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{45377009-1425-47FC-985E-05F98022F9E3}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{45377009-1425-47FC-985E-05F98022F9E3}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{45377009-1425-47FC-985E-05F98022F9E3}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{45377009-1425-47FC-985E-05F98022F9E3}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{45377009-1425-47FC-985E-05F98022F9E3}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{45377009-1425-47FC-985E-05F98022F9E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{45377009-1425-47FC-985E-05F98022F9E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{45377009-1425-47FC-985E-05F98022F9E3}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -103,10 +103,10 @@ Global
 		{45377009-1425-47FC-985E-05F98022F9E3}.Release|iPhone.Build.0 = Release|Any CPU
 		{45377009-1425-47FC-985E-05F98022F9E3}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{45377009-1425-47FC-985E-05F98022F9E3}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{47D85A91-E8E2-4088-BF5A-68A161754D48}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{47D85A91-E8E2-4088-BF5A-68A161754D48}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{47D85A91-E8E2-4088-BF5A-68A161754D48}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{47D85A91-E8E2-4088-BF5A-68A161754D48}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{47D85A91-E8E2-4088-BF5A-68A161754D48}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{47D85A91-E8E2-4088-BF5A-68A161754D48}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{47D85A91-E8E2-4088-BF5A-68A161754D48}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{47D85A91-E8E2-4088-BF5A-68A161754D48}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{47D85A91-E8E2-4088-BF5A-68A161754D48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47D85A91-E8E2-4088-BF5A-68A161754D48}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47D85A91-E8E2-4088-BF5A-68A161754D48}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -119,10 +119,10 @@ Global
 		{47D85A91-E8E2-4088-BF5A-68A161754D48}.Release|iPhone.Build.0 = Release|Any CPU
 		{47D85A91-E8E2-4088-BF5A-68A161754D48}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{47D85A91-E8E2-4088-BF5A-68A161754D48}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -135,10 +135,10 @@ Global
 		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.Release|iPhone.Build.0 = Release|Any CPU
 		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -151,10 +151,10 @@ Global
 		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.Release|iPhone.Build.0 = Release|Any CPU
 		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{92857C8E-0E83-4D02-A831-8AF3FED43336}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{92857C8E-0E83-4D02-A831-8AF3FED43336}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{92857C8E-0E83-4D02-A831-8AF3FED43336}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{92857C8E-0E83-4D02-A831-8AF3FED43336}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{92857C8E-0E83-4D02-A831-8AF3FED43336}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{92857C8E-0E83-4D02-A831-8AF3FED43336}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{92857C8E-0E83-4D02-A831-8AF3FED43336}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{92857C8E-0E83-4D02-A831-8AF3FED43336}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{92857C8E-0E83-4D02-A831-8AF3FED43336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{92857C8E-0E83-4D02-A831-8AF3FED43336}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92857C8E-0E83-4D02-A831-8AF3FED43336}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -167,10 +167,10 @@ Global
 		{92857C8E-0E83-4D02-A831-8AF3FED43336}.Release|iPhone.Build.0 = Release|Any CPU
 		{92857C8E-0E83-4D02-A831-8AF3FED43336}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{92857C8E-0E83-4D02-A831-8AF3FED43336}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -183,10 +183,10 @@ Global
 		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.Release|iPhone.Build.0 = Release|Any CPU
 		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{A67F34B5-75C1-4319-A93E-93DF87E728A4}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
-		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
-		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
-		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
-		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.AppStore|iPhone.Build.0 = Release|Any CPU
 		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
@@ -211,9 +211,9 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{26F4BC01-FBB4-4FD3-962E-0CE3E2EA2DE2} = {231BAB54-E48C-4C64-B45D-83F395BF8BF6}
 		{A38611CA-29F7-497B-9E9D-945943F3E5A0} = {231BAB54-E48C-4C64-B45D-83F395BF8BF6}
+		{42520E71-AD33-45A4-90C8-92F87B0EB119} = {26F4BC01-FBB4-4FD3-962E-0CE3E2EA2DE2}
 		{47D85A91-E8E2-4088-BF5A-68A161754D48} = {26F4BC01-FBB4-4FD3-962E-0CE3E2EA2DE2}
 		{45377009-1425-47FC-985E-05F98022F9E3} = {26F4BC01-FBB4-4FD3-962E-0CE3E2EA2DE2}
-		{42520E71-AD33-45A4-90C8-92F87B0EB119} = {26F4BC01-FBB4-4FD3-962E-0CE3E2EA2DE2}
 		{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5} = {A38611CA-29F7-497B-9E9D-945943F3E5A0}
 		{A67F34B5-75C1-4319-A93E-93DF87E728A4} = {A38611CA-29F7-497B-9E9D-945943F3E5A0}
 		{0A977063-0796-4CD4-84B8-AEDB2D648B26} = {A38611CA-29F7-497B-9E9D-945943F3E5A0}
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 96bfd3b..1ca6fe9 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
@@ -42,6 +42,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+OPTIONAL_ANDROID_NUNITLITE
 <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>
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 a7ff75a..377c816 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
@@ -42,6 +42,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+OPTIONAL_ANDROID_NUNITLITE
 <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>
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 4441197..7848c0e 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
@@ -42,6 +42,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+OPTIONAL_ANDROID_NUNITLITE
 <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>
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 d288007..f50a2fb 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
@@ -42,6 +42,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+OPTIONAL_ANDROID_NUNITLITE
 
     <!--
     <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj">
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 588cb4f..0ba5023 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
@@ -42,6 +42,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+OPTIONAL_ANDROID_NUNITLITE
 <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>
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 27ec57b..dd07b0a 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
@@ -42,6 +42,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+OPTIONAL_ANDROID_NUNITLITE
 <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>
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 b37e688..4cd1995 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
@@ -42,6 +42,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+OPTIONAL_ANDROID_NUNITLITE
 <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>
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 e99b68b..80782a8 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
@@ -42,6 +42,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+OPTIONAL_ANDROID_NUNITLITE
 <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>
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/ios_UnitTest.csproj b/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/ios_UnitTest.csproj
index a836d9f..0cfd6d3 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/ios_UnitTest.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/ios_UnitTest.csproj
@@ -95,10 +95,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <ProjectReference Include="..\Tests.System.Reactive\ios_Tests.System.Reactive.csproj">
-      <Project>{45377009-1425-47FC-985E-05F98022F9E3}</Project>
-      <Name>ios_Tests.System.Reactive</Name>
-    </ProjectReference>
     <ProjectReference Include="..\rx\System.Reactive.Runtime.Remoting\ios_System.Reactive.Runtime.Remoting.csproj">
       <Project>{92857C8E-0E83-4D02-A831-8AF3FED43336}</Project>
       <Name>ios_System.Reactive.Runtime.Remoting</Name>
@@ -127,9 +123,13 @@
       <Project>{A67F34B5-75C1-4319-A93E-93DF87E728A4}</Project>
       <Name>ios_System.Reactive.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Mono.Reactive.Testing\ios_Mono.Reactive.Testing.csproj">
+    <ProjectReference Include="..\rx\Mono.Reactive.Testing\ios_Mono.Reactive.Testing.csproj">
       <Project>{47D85A91-E8E2-4088-BF5A-68A161754D48}</Project>
       <Name>ios_Mono.Reactive.Testing</Name>
     </ProjectReference>
+    <ProjectReference Include="..\rx\Tests.System.Reactive\ios_Tests.System.Reactive.csproj">
+      <Project>{45377009-1425-47FC-985E-05F98022F9E3}</Project>
+      <Name>ios_Tests.System.Reactive</Name>
+    </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Core/ios_System.Reactive.Core.csproj b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Core/ios_System.Reactive.Core.csproj
index c8ccc65..b4cb998 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Core/ios_System.Reactive.Core.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Core/ios_System.Reactive.Core.csproj
@@ -13,11 +13,12 @@
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>System.Reactive.Core</AssemblyName>
     <ProductSignAssembly>true</ProductSignAssembly>
-    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NUNIT;SIGNED</DefineConstants>
+    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
 
+    <additionalargs>-delaySign</additionalargs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -26,7 +27,7 @@
     <OutputPath>bin\Debug</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+    <DefineConstants>DEBUG;NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -34,10 +35,8 @@
     <OutputPath>bin\Release</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
     <!--
     <TargetFrameworkIdentifier>iOS</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v2.0.5</TargetFrameworkVersion>
@@ -54,6 +53,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="MonoTouch.NUnitLite" />
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Debugger/ios_System.Reactive.Debugger.csproj b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Debugger/ios_System.Reactive.Debugger.csproj
index be12a9a..7664952 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Debugger/ios_System.Reactive.Debugger.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Debugger/ios_System.Reactive.Debugger.csproj
@@ -13,11 +13,12 @@
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>System.Reactive.Debugger</AssemblyName>
     <ProductSignAssembly>true</ProductSignAssembly>
-    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NUNIT;SIGNED</DefineConstants>
+    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
 
+    <additionalargs>-delaySign</additionalargs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -26,7 +27,7 @@
     <OutputPath>bin\Debug</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+    <DefineConstants>DEBUG;NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -34,10 +35,8 @@
     <OutputPath>bin\Release</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
     <!--
     <TargetFrameworkIdentifier>iOS</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v2.0.5</TargetFrameworkVersion>
@@ -54,6 +53,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="MonoTouch.NUnitLite" />
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Experimental/ios_System.Reactive.Experimental.csproj b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Experimental/ios_System.Reactive.Experimental.csproj
index 0465c9f..2c939b0 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Experimental/ios_System.Reactive.Experimental.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Experimental/ios_System.Reactive.Experimental.csproj
@@ -13,11 +13,12 @@
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>System.Reactive.Experimental</AssemblyName>
     <ProductSignAssembly>true</ProductSignAssembly>
-    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NUNIT;SIGNED</DefineConstants>
+    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
 
+    <additionalargs>-delaySign</additionalargs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -26,7 +27,7 @@
     <OutputPath>bin\Debug</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+    <DefineConstants>DEBUG;NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -34,10 +35,8 @@
     <OutputPath>bin\Release</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
     <!--
     <TargetFrameworkIdentifier>iOS</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v2.0.5</TargetFrameworkVersion>
@@ -54,6 +53,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="MonoTouch.NUnitLite" />
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Interfaces/ios_System.Reactive.Interfaces.csproj b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Interfaces/ios_System.Reactive.Interfaces.csproj
index 7a741f0..f6cf4fe 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Interfaces/ios_System.Reactive.Interfaces.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Interfaces/ios_System.Reactive.Interfaces.csproj
@@ -13,11 +13,12 @@
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>System.Reactive.Interfaces</AssemblyName>
     <ProductSignAssembly>true</ProductSignAssembly>
-    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NUNIT;SIGNED</DefineConstants>
+    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
 
+    <additionalargs>-delaySign</additionalargs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -26,7 +27,7 @@
     <OutputPath>bin\Debug</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+    <DefineConstants>DEBUG;NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -34,10 +35,8 @@
     <OutputPath>bin\Release</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
     <!--
     <TargetFrameworkIdentifier>iOS</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v2.0.5</TargetFrameworkVersion>
@@ -54,6 +53,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="MonoTouch.NUnitLite" />
+    
   </ItemGroup>
   <ItemGroup>
     
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Linq/ios_System.Reactive.Linq.csproj b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Linq/ios_System.Reactive.Linq.csproj
index 844cf6e..cc518d7 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Linq/ios_System.Reactive.Linq.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Linq/ios_System.Reactive.Linq.csproj
@@ -13,11 +13,12 @@
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>System.Reactive.Linq</AssemblyName>
     <ProductSignAssembly>true</ProductSignAssembly>
-    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NUNIT;SIGNED</DefineConstants>
+    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
 
+    <additionalargs>-delaySign</additionalargs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -26,7 +27,7 @@
     <OutputPath>bin\Debug</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+    <DefineConstants>DEBUG;NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -34,10 +35,8 @@
     <OutputPath>bin\Release</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
     <!--
     <TargetFrameworkIdentifier>iOS</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v2.0.5</TargetFrameworkVersion>
@@ -54,6 +53,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="MonoTouch.NUnitLite" />
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.PlatformServices/ios_System.Reactive.PlatformServices.csproj b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.PlatformServices/ios_System.Reactive.PlatformServices.csproj
index 257a691..0894129 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.PlatformServices/ios_System.Reactive.PlatformServices.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.PlatformServices/ios_System.Reactive.PlatformServices.csproj
@@ -13,11 +13,12 @@
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>System.Reactive.PlatformServices</AssemblyName>
     <ProductSignAssembly>true</ProductSignAssembly>
-    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NUNIT;SIGNED</DefineConstants>
+    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
 
+    <additionalargs>-delaySign</additionalargs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -26,7 +27,7 @@
     <OutputPath>bin\Debug</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+    <DefineConstants>DEBUG;NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -34,10 +35,8 @@
     <OutputPath>bin\Release</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
     <!--
     <TargetFrameworkIdentifier>iOS</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v2.0.5</TargetFrameworkVersion>
@@ -54,6 +53,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="MonoTouch.NUnitLite" />
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
diff --git a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Runtime.Remoting/ios_System.Reactive.Runtime.Remoting.csproj b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Runtime.Remoting/ios_System.Reactive.Runtime.Remoting.csproj
index 342cc69..9ca7b7f 100644
--- a/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Runtime.Remoting/ios_System.Reactive.Runtime.Remoting.csproj
+++ b/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Runtime.Remoting/ios_System.Reactive.Runtime.Remoting.csproj
@@ -13,11 +13,12 @@
     <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
     <AssemblyName>System.Reactive.Runtime.Remoting</AssemblyName>
     <ProductSignAssembly>true</ProductSignAssembly>
-    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NUNIT;SIGNED</DefineConstants>
+    <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile>
 
+    <additionalargs>-delaySign</additionalargs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
@@ -26,7 +27,7 @@
     <OutputPath>bin\Debug</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
+    <DefineConstants>DEBUG;NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
@@ -34,10 +35,8 @@
     <OutputPath>bin\Release</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
   </PropertyGroup>
   <PropertyGroup>
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_PROGRESS;PREFER_ASYNC;HAS_APTCA;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;PLIB</DefineConstants>
     <!--
     <TargetFrameworkIdentifier>iOS</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v2.0.5</TargetFrameworkVersion>
@@ -54,6 +53,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="MonoTouch.NUnitLite" />
+    
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">