Make internal abstract methods virtual to fix MethodBase subclassing.

[mono.git] / mcs / class / build-rx-dll-sources.sh

diff --git a/mcs/class/build-rx-dll-sources.sh b/mcs/class/build-rx-dll-sources.sh
index 07552bfd1417f35d0f0aeed4c7ffca54b6dc2b83..0697463e3917fb6e4a48ba6fe037a6f91bfefe55 100644 (file)
--- a/mcs/class/build-rx-dll-sources.sh
+++ b/mcs/class/build-rx-dll-sources.sh
@@ -39,10 +39,6 @@ var excluded_ios_asses = new string [] {
        }
 
 var blacklist = new string [] {
-       // FIXME: this is the only source that we cannot build.
-       //Test/../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/ObservableExTest.cs(1478,27): error CS0411: The type arguments for method `System.Reactive.Linq.ObservableEx.ManySelect<TSource,TResult>(this System.IObservable<TSource>, System.Func<System.IObservable<TSource>,TResult>)' cannot be inferred from the usage. Try specifying the type arguments explicitly
-       "ObservableExTest.cs",
-
        // WPF Dispatcher.Invoke() is not implemented.
        "DispatcherSchedulerTest.cs",
        // This is not limited to Dispatcher, but many of them are relevant to it, or Winforms (we filter it out by not defining HAS_WINFORMS)
@@ -174,8 +170,8 @@ foreach (var ass in asses) {
                                                .Replace ("System", prj_prefix + "System")
                                                .Replace ("Mono", prj_prefix + "Mono")
                                                .Replace ("Include=\"..\\" + prj_prefix, "Include=\"..\\"))
-                               .Replace ("RESOURCES_GO_HERE", sourcesXml)
-                               .Replace ("SOURCES_GO_HERE", resourcesXml)
+                               .Replace ("RESOURCES_GO_HERE", sourcesXml.Replace ('\\', f == ios_proj ? '/' : '\\')) // whoa, BACKSLASH doesn't work only on android on MD/mac...!
+                               .Replace ("SOURCES_GO_HERE", resourcesXml.Replace ('\\', f == ios_proj ? '/' : '\\')) // whoa, BACKSLASH doesn't work only on android on MD/mac...!
                                .Replace ("SIGNING_SPEC_GOES_HERE", signingXml));
                }
        }