[Rx] some more csproj generator fixes; debug and release are different. Remove extran...

diff --git a/mcs/class/build-rx-dll-sources.sh b/mcs/class/build-rx-dll-sources.sh
index 86edbf1d0941c1dceb3575e91e5ed05e630c4a6b..6c68aa2025a917401a1ff658c554838f6ad49155 100644 (file)
--- a/mcs/class/build-rx-dll-sources.sh
+++ b/mcs/class/build-rx-dll-sources.sh
@@ -163,6 +163,7 @@ foreach (var ass in asses) {
                                .Replace ("OPTIONAL_MONOTOUCH_NUNITLITE", nunitRef)
                                .Replace ("PROJECT_REFERENCES_GO_HERE",
                                        projectRefsXml
+                                               .Replace (" xmlns=\"http://schemas.microsoft.com/developer/msbuild/2003\"", "")
                                                .Replace ("Microsoft.Reactive.Testing", "Mono.Reactive.Testing")
                                                .Replace ("System", prj_prefix + "System")
                                                .Replace ("Mono", prj_prefix + "Mono")

diff --git a/mcs/class/project_template_android.txt b/mcs/class/project_template_android.txt
index e149f5b00529320e3a5eeb53244c4cba5ca1a303..5444595d893f0616df9d74869d703e129c4f7678 100644 (file)
--- a/mcs/class/project_template_android.txt
+++ b/mcs/class/project_template_android.txt
@@ -21,6 +21,7 @@
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
     <ConsolePause>False</ConsolePause>
+    <DefineConstants>DEBUG;NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>

diff --git a/mcs/class/project_template_ios.txt b/mcs/class/project_template_ios.txt
index e671efa92ef985400353613f76c9cfb73ac7efeb..a912db67e6ed2b808db1c163fb27b17d8b1f4302 100644 (file)
--- a/mcs/class/project_template_ios.txt
+++ b/mcs/class/project_template_ios.txt
@@ -23,7 +23,7 @@
     <OutputPath>bin\Debug</OutputPath>
     <ConsolePause>False</ConsolePause>
     <WarningLevel>4</WarningLevel>
-    <DefineConstants>DEBUG;NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants>
+    <DefineConstants>DEBUG;NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>