diff options
Diffstat (limited to 'external/rx/Rx/NET/Source/Rx_Xamarin/android/andr-unit-rx.patch')
-rw-r--r-- | external/rx/Rx/NET/Source/Rx_Xamarin/android/andr-unit-rx.patch | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/andr-unit-rx.patch b/external/rx/Rx/NET/Source/Rx_Xamarin/android/andr-unit-rx.patch deleted file mode 100644 index 8f19009bfc..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/andr-unit-rx.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/Andr.Unit/Andr.Unit.csproj b/Andr.Unit/Andr.Unit.csproj -index 1d64a1b..0ce74c0 100644 ---- a/Andr.Unit/Andr.Unit.csproj -+++ b/Andr.Unit/Andr.Unit.csproj -@@ -115,9 +115,17 @@ - <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> - <Name>Android.NUnitLite</Name> - </ProjectReference> -- <ProjectReference Include="..\m4a.tests\m4a.tests.csproj"> -- <Project>{06D00E82-E637-4A8A-95BE-3E1ADE925B9B}</Project> -- <Name>m4a.tests</Name> -+ <ProjectReference Include="..\..\Mono.Reactive.Testing\android_Mono.Reactive.Testing.csproj"> -+ <Project>{35DEE616-4AD5-4560-9E19-A86836857626}</Project> -+ <Name>android_Mono.Reactive.Testing</Name> -+ </ProjectReference> -+ <ProjectReference Include="..\..\MonoDroid.Dialog\MonoDroid.Dialog\MonoDroid.Dialog.csproj"> -+ <Project>{33044C7B-47A4-4113-A61A-EB429407F818}</Project> -+ <Name>MonoDroid.Dialog</Name> -+ </ProjectReference> -+ <ProjectReference Include="..\..\Tests.System.Reactive\android_Tests.System.Reactive.csproj"> -+ <Project>{93322E90-1596-443D-AE38-F4B4D868BE24}</Project> -+ <Name>android_Tests.System.Reactive</Name> - </ProjectReference> - </ItemGroup> - </Project> -\ No newline at end of file -diff --git a/Andr.Unit/MainActivity.cs b/Andr.Unit/MainActivity.cs -index ce19029..2a2da07 100644 ---- a/Andr.Unit/MainActivity.cs -+++ b/Andr.Unit/MainActivity.cs -@@ -32,7 +32,7 @@ namespace Andr.Unit - // tests can be inside the main assembly - AddTest (Assembly.GetExecutingAssembly ()); - // or in any reference assemblies -- AddTest (typeof (m4a.tests.RunnerTest).Assembly); -+ AddTest (typeof (ReactiveTests.Extensions).Assembly); - // or in any assembly that you load (since JIT is available) - - #if false -diff --git a/Andr.Unit/Resources/Resource.designer.cs b/Andr.Unit/Resources/Resource.designer.cs -index 291e7c6..b09da34 100644 ---- a/Andr.Unit/Resources/Resource.designer.cs -+++ b/Andr.Unit/Resources/Resource.designer.cs -@@ -1,3 +1,4 @@ -+#pragma warning disable 1591 - // ------------------------------------------------------------------------------ - // <autogenerated> - // This code was generated by a tool. -@@ -8,13 +9,20 @@ - // </autogenerated> - // ------------------------------------------------------------------------------ - -+[assembly: Android.Runtime.ResourceDesignerAttribute("Andr.Unit.Resource", IsApplication=true)] -+ - namespace Andr.Unit - { - - -+ [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] - public partial class Resource - { - -+ public static void UpdateIdValues() -+ { -+ } -+ - public partial class Attribute - { - -@@ -149,3 +157,4 @@ namespace Andr.Unit - } - } - } -+#pragma warning restore 1591 |