diff options
| author | Jo Shields <directhex@apebox.org> | 2014-02-19 22:12:43 +0000 |
|---|---|---|
| committer | Jo Shields <directhex@apebox.org> | 2014-02-19 22:12:43 +0000 |
| commit | 9972bf87b4f27d9c8f358ef8414ac1ab957a2f0f (patch) | |
| tree | 5bb230c1d698659115f918e243c1d4b0aa4c7f51 /external/rx/Rx/NET/Source/Rx_Xamarin | |
| parent | d0a215f5626219ff7927f576588a777e5331c7be (diff) | |
| download | mono-upstream/3.2.8+dfsg.tar.gz | |
Imported Upstream version 3.2.8+dfsgupstream/3.2.8+dfsg
Diffstat (limited to 'external/rx/Rx/NET/Source/Rx_Xamarin')
62 files changed, 1618 insertions, 997 deletions
diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/ReactiveExtensionsForAndroid.nuspec b/external/rx/Rx/NET/Source/Rx_Xamarin/ReactiveExtensionsForAndroid.nuspec new file mode 100644 index 0000000000..df4659482c --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/ReactiveExtensionsForAndroid.nuspec @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<package > + <metadata> + <id>ReactiveExtensionsForAndroid</id> + <version>2.1.0</version> + <authors>Microsoft Open Technologies, Inc</authors> + <owners>Xamarin Inc.</owners> + <licenseUrl>https://raw.github.com/mono/rx/master/Rx/NET/Source/license.txt</licenseUrl> + <projectUrl>https://github.com/mono/rx</projectUrl> + <iconUrl>https://raw.github.com/mono/rx/master/Rx/NET/Resources/Artwork/Logo_Color.png</iconUrl> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <description>a library for composing asynchronous and event-based programs using observable sequences and LINQ-style query operators. (Android)</description> + <releaseNotes>Initial NuGet package release. WARNING: this won't work as expected if you are not using Xamarin.Android v4.7.x or later, which ships with some runtime bugfixes.</releaseNotes> + <copyright>Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.</copyright> + <tags>Rx Reactive Linq Xamarin Android</tags> + <frameworkAssemblies> + <frameworkAssembly assemblyName="System.Core" targetFramework="MonoAndroid" /> + </frameworkAssemblies> + </metadata> + <files> + <file target="lib/MonoAndroid" src="android/rx/System.Reactive.Interfaces/bin/Release/System.Reactive.Interfaces.dll" /> + <file target="lib/MonoAndroid" src="android/rx/System.Reactive.Core/bin/Release/System.Reactive.Core.dll" /> + <file target="lib/MonoAndroid" src="android/rx/System.Reactive.Linq/bin/Release/System.Reactive.Linq.dll" /> + <file target="lib/MonoAndroid" src="android/rx/System.Reactive.PlatformServices/bin/Release/System.Reactive.PlatformServices.dll" /> + <file target="lib/MonoAndroid" src="android/rx/System.Reactive.Providers/bin/Release/System.Reactive.Providers.dll" /> + <file target="lib/MonoAndroid" src="android/rx/System.Reactive.Debugger/bin/Release/System.Reactive.Debugger.dll" /> + <file target="lib/MonoAndroid" src="android/rx/System.Reactive.Experimental/bin/Release/System.Reactive.Experimental.dll" /> + </files> +</package> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/ReactiveExtensionsForiOS.nuspec b/external/rx/Rx/NET/Source/Rx_Xamarin/ReactiveExtensionsForiOS.nuspec new file mode 100644 index 0000000000..9f417d305a --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/ReactiveExtensionsForiOS.nuspec @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<package > + <metadata> + <id>ReactiveExtensionsForiOS</id> + <version>2.1.0</version> + <authors>Microsoft Open Technologies, Inc</authors> + <owners>Xamarin Inc.</owners> + <licenseUrl>https://raw.github.com/mono/rx/master/Rx/NET/Source/license.txt</licenseUrl> + <projectUrl>https://github.com/mono/rx</projectUrl> + <iconUrl>https://raw.github.com/mono/rx/master/Rx/NET/Resources/Artwork/Logo_Color.png</iconUrl> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <description>a library for composing asynchronous and event-based programs using observable sequences and LINQ-style query operators. (iOS)</description> + <releaseNotes>Initial NuGet package release. WARNING: Rx depends on generics a lot, and they will fail on device. You should really test your code on device. Also you want to use the generic enhanced versions of Xamarin.iOS.</releaseNotes> + <copyright>Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.</copyright> + <tags>Rx Reactive Linq Xamarin iOS</tags> + <frameworkAssemblies> + <frameworkAssembly assemblyName="System.Core" targetFramework="MonoTouch" /> + </frameworkAssemblies> + </metadata> + <files> + <file target="lib/MonoTouch" src="iOS/rx/System.Reactive.Interfaces/bin/Release/System.Reactive.Interfaces.dll" /> + <file target="lib/MonoTouch" src="iOS/rx/System.Reactive.Core/bin/Release/System.Reactive.Core.dll" /> + <file target="lib/MonoTouch" src="iOS/rx/System.Reactive.Linq/bin/Release/System.Reactive.Linq.dll" /> + <file target="lib/MonoTouch" src="iOS/rx/System.Reactive.PlatformServices/bin/Release/System.Reactive.PlatformServices.dll" /> + <file target="lib/MonoTouch" src="iOS/rx/System.Reactive.Debugger/bin/Release/System.Reactive.Debugger.dll" /> + <file target="lib/MonoTouch" src="iOS/rx/System.Reactive.Experimental/bin/Release/System.Reactive.Experimental.dll" /> + </files> +</package> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln b/external/rx/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln index 0f16f4b96e..ef906455df 100755..100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_android.sln @@ -19,20 +19,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_System.Reactive.Deb EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_System.Reactive.Providers", "android\rx\System.Reactive.Providers\android_System.Reactive.Providers.csproj", "{E662282B-4341-4F86-AAAA-A942335B47FB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "android_System.Reactive.Runtime.Remoting", "android\rx\System.Reactive.Runtime.Remoting\android_System.Reactive.Runtime.Remoting.csproj", "{A153A379-670C-42C2-9018-FC0D933A4F7F}" -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", "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 @@ -45,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 @@ -69,10 +55,6 @@ Global {9360E845-D79D-4288-9100-63A80FAD2BF0}.Debug|Any CPU.Build.0 = Debug|Any CPU {9360E845-D79D-4288-9100-63A80FAD2BF0}.Release|Any CPU.ActiveCfg = Release|Any CPU {9360E845-D79D-4288-9100-63A80FAD2BF0}.Release|Any CPU.Build.0 = Release|Any CPU - {A153A379-670C-42C2-9018-FC0D933A4F7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A153A379-670C-42C2-9018-FC0D933A4F7F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A153A379-670C-42C2-9018-FC0D933A4F7F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A153A379-670C-42C2-9018-FC0D933A4F7F}.Release|Any CPU.Build.0 = Release|Any CPU {CB2AB716-BFCB-43BC-A03B-A3BDA427746C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB2AB716-BFCB-43BC-A03B-A3BDA427746C}.Debug|Any CPU.Build.0 = Debug|Any CPU {CB2AB716-BFCB-43BC-A03B-A3BDA427746C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -133,14 +115,11 @@ Global {00DC3654-E373-4E3F-80FE-109F795ADF1F} = {9AF9A490-2CD2-47CE-9E01-F3A799524F58} {9360E845-D79D-4288-9100-63A80FAD2BF0} = {9AF9A490-2CD2-47CE-9E01-F3A799524F58} {E662282B-4341-4F86-AAAA-A942335B47FB} = {9AF9A490-2CD2-47CE-9E01-F3A799524F58} - {A153A379-670C-42C2-9018-FC0D933A4F7F} = {9AF9A490-2CD2-47CE-9E01-F3A799524F58} - {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} {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/external/rx/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_iOS.sln b/external/rx/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_iOS.sln index 181d00d95a..a0928e6979 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_iOS.sln +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/Rx_Xamarin_iOS.sln @@ -25,8 +25,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ios_System.Reactive.Experim EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ios_System.Reactive.Debugger", "iOS\rx\System.Reactive.Debugger\ios_System.Reactive.Debugger.csproj", "{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ios_System.Reactive.Runtime.Remoting", "iOS\rx\System.Reactive.Runtime.Remoting\ios_System.Reactive.Runtime.Remoting.csproj", "{92857C8E-0E83-4D02-A831-8AF3FED43336}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -151,22 +149,6 @@ 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 = 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 - {92857C8E-0E83-4D02-A831-8AF3FED43336}.Debug|iPhone.Build.0 = Debug|Any CPU - {92857C8E-0E83-4D02-A831-8AF3FED43336}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {92857C8E-0E83-4D02-A831-8AF3FED43336}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {92857C8E-0E83-4D02-A831-8AF3FED43336}.Release|Any CPU.ActiveCfg = Release|Any CPU - {92857C8E-0E83-4D02-A831-8AF3FED43336}.Release|Any CPU.Build.0 = Release|Any CPU - {92857C8E-0E83-4D02-A831-8AF3FED43336}.Release|iPhone.ActiveCfg = Release|Any CPU - {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 = 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 @@ -220,7 +202,6 @@ Global {79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A} = {A38611CA-29F7-497B-9E9D-945943F3E5A0} {24F995BD-7075-489C-B7A5-7FDE08C304B6} = {A38611CA-29F7-497B-9E9D-945943F3E5A0} {B41CB61A-DCA0-4539-8F99-7B3499E18E6D} = {A38611CA-29F7-497B-9E9D-945943F3E5A0} - {92857C8E-0E83-4D02-A831-8AF3FED43336} = {A38611CA-29F7-497B-9E9D-945943F3E5A0} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = iOS\ios_UnitTest\ios_UnitTest.csproj diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/Makefile b/external/rx/Rx/NET/Source/Rx_Xamarin/android/Makefile deleted file mode 100644 index d2ecc1870f..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/Makefile +++ /dev/null @@ -1,11 +0,0 @@ - -all: MonoDroid.Dialog Andr.Unit - -MonoDroid.Dialog: - git clone git://github.com/atsushieno/MonoDroid.Dialog.git - -Andr.Unit: - git clone git://github.com/pjcollins/Andr.Unit.git - cd Andr.Unit && git checkout bae4bbfc && patch -i ../andr-unit-rx.patch -p1 || exit 1 - - diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Assets/AboutAssets.txt b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Assets/AboutAssets.txt new file mode 100644 index 0000000000..a9b0638eb1 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Assets/AboutAssets.txt @@ -0,0 +1,19 @@ +Any raw assets you want to be deployed with your application can be placed in +this directory (and child directories) and given a Build Action of "AndroidAsset". + +These files will be deployed with your package and will be accessible using Android's +AssetManager, like this: + +public class ReadAsset : Activity +{ + protected override void OnCreate (Bundle bundle) + { + base.OnCreate (bundle); + + InputStream input = Assets.Open ("my_asset.txt"); + } +} + +Additionally, some Android functions will automatically load asset files: + +Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf"); diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/MainActivity.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/MainActivity.cs new file mode 100644 index 0000000000..c350b3394d --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/MainActivity.cs @@ -0,0 +1,19 @@ +using System.Reflection; +using Android.App; +using Android.OS; +using Xamarin.Android.NUnitLite; + +namespace ReactiveTestApplication +{ + [Activity (Label = "ReactiveTestApplication", MainLauncher = true)] + public class MainActivity : TestSuiteActivity + { + protected override void OnCreate (Bundle bundle) + { + AddTest (typeof (ReactiveTests.Extensions).Assembly); + // Once you called base.OnCreate(), you cannot add more assemblies. + base.OnCreate (bundle); + } + } +} + diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AndroidManifest.xml b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AndroidManifest.xml new file mode 100644 index 0000000000..9431e6d459 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AndroidManifest.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="ReactiveTestApplication.ReactiveTestApplication"> + <uses-sdk /> + <application android:label="ReactiveTestApplication"> + </application> +</manifest>
\ No newline at end of file diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AssemblyInfo.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..2ae849ff32 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Properties/AssemblyInfo.cs @@ -0,0 +1,23 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using Android.App; + +// Information about this assembly is defined by the following attributes. +// Change them to the values specific to your project. +[assembly: AssemblyTitle ("ReactiveTestApplication")] +[assembly: AssemblyDescription ("")] +[assembly: AssemblyConfiguration ("")] +[assembly: AssemblyCompany ("")] +[assembly: AssemblyProduct ("")] +[assembly: AssemblyCopyright ("atsushi")] +[assembly: AssemblyTrademark ("")] +[assembly: AssemblyCulture ("")] +// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". +// The form "{Major}.{Minor}.*" will automatically update the build and revision, +// and "{Major}.{Minor}.{Build}.*" will update just the revision. +[assembly: AssemblyVersion ("1.0.0")] +// The following attributes are used to specify the signing key for the assembly, +// if desired. See the Mono documentation for more information about signing. +//[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("")] + diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/ReactiveTestApplication.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/ReactiveTestApplication.csproj new file mode 100644 index 0000000000..4ece925e78 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/ReactiveTestApplication.csproj @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{307C128B-762F-478D-AF70-485A1792DA9A}</ProjectGuid> + <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <OutputType>Library</OutputType> + <RootNamespace>ReactiveTestApplication</RootNamespace> + <AndroidApplication>True</AndroidApplication> + <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile> + <AndroidResgenClass>Resource</AndroidResgenClass> + <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> + <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> + <AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk> + <AssemblyName>ReactiveTestApplication</AssemblyName> + <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG;</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AndroidLinkMode>None</AndroidLinkMode> + <ConsolePause>false</ConsolePause> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>full</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime> + <ConsolePause>false</ConsolePause> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Xml" /> + <Reference Include="System.Core" /> + <Reference Include="Mono.Android" /> + <Reference Include="Xamarin.Android.NUnitLite" /> + </ItemGroup> + <ItemGroup> + <Compile Include="MainActivity.cs" /> + <Compile Include="Resources\Resource.designer.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="Resources\AboutResources.txt" /> + <None Include="Assets\AboutAssets.txt" /> + <None Include="Properties\AndroidManifest.xml" /> + </ItemGroup> + <ItemGroup> + <AndroidResource Include="Resources\drawable\Icon.png" /> + </ItemGroup> + <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> + <ItemGroup> + <ProjectReference Include="..\..\..\..\..\..\..\..\..\..\home\atsushi\svn\mono\external\rx\Rx\NET\Source\Rx_Xamarin\android\rx\Tests.System.Reactive\android_Tests.System.Reactive.csproj"> + <Project>{73C5260F-8972-4E7C-822B-1A3A0358FA0B}</Project> + <Name>android_Tests.System.Reactive</Name> + </ProjectReference> + </ItemGroup> +</Project>
\ No newline at end of file diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/AboutResources.txt b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/AboutResources.txt new file mode 100644 index 0000000000..10f52d4602 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/AboutResources.txt @@ -0,0 +1,44 @@ +Images, layout descriptions, binary blobs and string dictionaries can be included +in your application as resource files. Various Android APIs are designed to +operate on the resource IDs instead of dealing with images, strings or binary blobs +directly. + +For example, a sample Android app that contains a user interface layout (main.axml), +an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) +would keep its resources in the "Resources" directory of the application: + +Resources/ + drawable/ + icon.png + + layout/ + main.axml + + values/ + strings.xml + +In order to get the build system to recognize Android resources, set the build action to +"AndroidResource". The native Android APIs do not operate directly with filenames, but +instead operate on resource IDs. When you compile an Android application that uses resources, +the build system will package the resources for distribution and generate a class called "R" +(this is an Android convention) that contains the tokens for each one of the resources +included. For example, for the above Resources layout, this is what the R class would expose: + +public class R { + public class drawable { + public const int icon = 0x123; + } + + public class layout { + public const int main = 0x456; + } + + public class strings { + public const int first_string = 0xabc; + public const int second_string = 0xbcd; + } +} + +You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main +to reference the layout/main.axml file, or R.strings.first_string to reference the first +string in the dictionary file values/strings.xml. diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/Resource.designer.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/Resource.designer.cs new file mode 100644 index 0000000000..1e5e640ddb --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/Resource.designer.cs @@ -0,0 +1,171 @@ +#pragma warning disable 1591 +// ------------------------------------------------------------------------------ +// <autogenerated> +// This code was generated by a tool. +// Mono Runtime Version: 4.0.30319.17020 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </autogenerated> +// ------------------------------------------------------------------------------ + +[assembly: Android.Runtime.ResourceDesignerAttribute("ReactiveTestApplication.Resource", IsApplication=true)] + +namespace ReactiveTestApplication +{ + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] + public partial class Resource + { + + static Resource() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + public static void UpdateIdValues() + { + global::Xamarin.Android.NUnitLite.Resource.Id.OptionHostName = global::ReactiveTestApplication.Resource.Id.OptionHostName; + global::Xamarin.Android.NUnitLite.Resource.Id.OptionPort = global::ReactiveTestApplication.Resource.Id.OptionPort; + global::Xamarin.Android.NUnitLite.Resource.Id.OptionRemoteServer = global::ReactiveTestApplication.Resource.Id.OptionRemoteServer; + global::Xamarin.Android.NUnitLite.Resource.Id.OptionsButton = global::ReactiveTestApplication.Resource.Id.OptionsButton; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultFullName = global::ReactiveTestApplication.Resource.Id.ResultFullName; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultMessage = global::ReactiveTestApplication.Resource.Id.ResultMessage; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultResultState = global::ReactiveTestApplication.Resource.Id.ResultResultState; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultStackTrace = global::ReactiveTestApplication.Resource.Id.ResultStackTrace; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsFailed = global::ReactiveTestApplication.Resource.Id.ResultsFailed; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsId = global::ReactiveTestApplication.Resource.Id.ResultsId; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsIgnored = global::ReactiveTestApplication.Resource.Id.ResultsIgnored; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsInconclusive = global::ReactiveTestApplication.Resource.Id.ResultsInconclusive; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsMessage = global::ReactiveTestApplication.Resource.Id.ResultsMessage; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsPassed = global::ReactiveTestApplication.Resource.Id.ResultsPassed; + global::Xamarin.Android.NUnitLite.Resource.Id.ResultsResult = global::ReactiveTestApplication.Resource.Id.ResultsResult; + global::Xamarin.Android.NUnitLite.Resource.Id.RunTestsButton = global::ReactiveTestApplication.Resource.Id.RunTestsButton; + global::Xamarin.Android.NUnitLite.Resource.Id.TestSuiteListView = global::ReactiveTestApplication.Resource.Id.TestSuiteListView; + global::Xamarin.Android.NUnitLite.Resource.Layout.options = global::ReactiveTestApplication.Resource.Layout.options; + global::Xamarin.Android.NUnitLite.Resource.Layout.results = global::ReactiveTestApplication.Resource.Layout.results; + global::Xamarin.Android.NUnitLite.Resource.Layout.test_result = global::ReactiveTestApplication.Resource.Layout.test_result; + global::Xamarin.Android.NUnitLite.Resource.Layout.test_suite = global::ReactiveTestApplication.Resource.Layout.test_suite; + } + + public partial class Attribute + { + + static Attribute() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Attribute() + { + } + } + + public partial class Drawable + { + + // aapt resource value: 0x7f020000 + public const int Icon = 2130837504; + + static Drawable() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Drawable() + { + } + } + + public partial class Id + { + + // aapt resource value: 0x7f040001 + public const int OptionHostName = 2130968577; + + // aapt resource value: 0x7f040002 + public const int OptionPort = 2130968578; + + // aapt resource value: 0x7f040000 + public const int OptionRemoteServer = 2130968576; + + // aapt resource value: 0x7f040010 + public const int OptionsButton = 2130968592; + + // aapt resource value: 0x7f04000a + public const int ResultFullName = 2130968586; + + // aapt resource value: 0x7f04000c + public const int ResultMessage = 2130968588; + + // aapt resource value: 0x7f04000b + public const int ResultResultState = 2130968587; + + // aapt resource value: 0x7f04000d + public const int ResultStackTrace = 2130968589; + + // aapt resource value: 0x7f040006 + public const int ResultsFailed = 2130968582; + + // aapt resource value: 0x7f040003 + public const int ResultsId = 2130968579; + + // aapt resource value: 0x7f040007 + public const int ResultsIgnored = 2130968583; + + // aapt resource value: 0x7f040008 + public const int ResultsInconclusive = 2130968584; + + // aapt resource value: 0x7f040009 + public const int ResultsMessage = 2130968585; + + // aapt resource value: 0x7f040005 + public const int ResultsPassed = 2130968581; + + // aapt resource value: 0x7f040004 + public const int ResultsResult = 2130968580; + + // aapt resource value: 0x7f04000f + public const int RunTestsButton = 2130968591; + + // aapt resource value: 0x7f04000e + public const int TestSuiteListView = 2130968590; + + static Id() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Id() + { + } + } + + public partial class Layout + { + + // aapt resource value: 0x7f030000 + public const int options = 2130903040; + + // aapt resource value: 0x7f030001 + public const int results = 2130903041; + + // aapt resource value: 0x7f030002 + public const int test_result = 2130903042; + + // aapt resource value: 0x7f030003 + public const int test_suite = 2130903043; + + static Layout() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Layout() + { + } + } + } +} +#pragma warning restore 1591 diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/drawable/Icon.png b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/drawable/Icon.png Binary files differnew file mode 100644 index 0000000000..a07c69fa5a --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/ReactiveTestApplication/Resources/drawable/Icon.png 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 diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll.mdb b/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll.mdb Binary files differdeleted file mode 100755 index 1bf810f963..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/Mono.Reactive.Testing.dll.mdb +++ /dev/null diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll.mdb b/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll.mdb Binary files differdeleted file mode 100644 index 730fcabb7a..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Core.dll.mdb +++ /dev/null diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll.mdb b/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll.mdb Binary files differdeleted file mode 100644 index d1117e7c11..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Debugger.dll.mdb +++ /dev/null diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll.mdb b/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll.mdb Binary files differdeleted file mode 100644 index e4aa021702..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Experimental.dll.mdb +++ /dev/null diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll.mdb b/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll.mdb Binary files differdeleted file mode 100644 index 9fa1098537..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Interfaces.dll.mdb +++ /dev/null diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll.mdb b/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll.mdb Binary files differdeleted file mode 100644 index e3b7b549ad..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Linq.dll.mdb +++ /dev/null diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll.mdb b/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll.mdb Binary files differdeleted file mode 100644 index f7cd3f032c..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.PlatformServices.dll.mdb +++ /dev/null diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll.mdb b/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll.mdb Binary files differdeleted file mode 100644 index fa5acfa916..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Providers.dll.mdb +++ /dev/null diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll.mdb b/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll.mdb Binary files differdeleted file mode 100644 index de211c3f9f..0000000000 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/libs/System.Reactive.Runtime.Remoting.dll.mdb +++ /dev/null diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/Mono.Reactive.Testing/android_Mono.Reactive.Testing.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/Mono.Reactive.Testing/android_Mono.Reactive.Testing.csproj index 4177055211..800e248480 100755..100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/Mono.Reactive.Testing/android_Mono.Reactive.Testing.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/Mono.Reactive.Testing/android_Mono.Reactive.Testing.csproj @@ -10,7 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>System.Reactive</RootNamespace> <AssemblyName>Mono.Reactive.Testing</AssemblyName> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants> + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -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> @@ -38,35 +39,25 @@ <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> - <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> - <Name>Android.NUnitLite</Name> - </ProjectReference> +<ProjectReference Include="..\..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"><Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project><Name>Android.NUnitLite</Name></ProjectReference> +<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> + <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> + <Name>android_System.Reactive.Core</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> + <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> + <Name>android_System.Reactive.Interfaces</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> + <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> + <Name>android_System.Reactive.Linq</Name> +</ProjectReference> <!-- <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> <Name>Android.NUnitLite</Name> </ProjectReference> --> - <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> - <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project> - <Name>android_System.Reactive.Core</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> - <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project> - <Name>android_System.Reactive.Interfaces</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> - <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project> - <Name>android_System.Reactive.Linq</Name> - </ProjectReference> </ItemGroup> <ItemGroup> - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> <Link>ColdObservable.cs</Link> </Compile> @@ -106,6 +97,13 @@ <Compile Include="..\..\..\..\Microsoft.Reactive.Testing\TestScheduler.cs"> <Link>TestScheduler.cs</Link> </Compile> + + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> </Project> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj index 9349d4ae23..2a5c851804 100755..100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Core/android_System.Reactive.Core.csproj @@ -10,10 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>System.Reactive</RootNamespace> <AssemblyName>System.Reactive.Core</AssemblyName> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile> + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -24,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> @@ -41,10 +39,11 @@ <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> - <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project> - <Name>android_System.Reactive.Interfaces</Name> - </ProjectReference> + +<ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> + <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> + <Name>android_System.Reactive.Interfaces</Name> +</ProjectReference> <!-- <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> @@ -53,14 +52,6 @@ --> </ItemGroup> <ItemGroup> - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <EmbeddedResource Include="..\..\..\..\System.Reactive.Core\Strings_Core.resx"> - <Link>Strings_Core.resx</Link> - </EmbeddedResource> <Compile Include="..\..\..\..\System.Reactive.Core\GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> @@ -295,6 +286,16 @@ <Compile Include="..\..\..\..\System.Reactive.Core\Strings_Core.Generated.cs"> <Link>Strings_Core.Generated.cs</Link> </Compile> + + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Core/Strings_Core.resx'> + <Link>Strings_Core.resx</Link> + </EmbeddedResource> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> </Project> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj index 5464b5c883..d3361578d6 100755..100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Debugger/android_System.Reactive.Debugger.csproj @@ -10,10 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>System.Reactive</RootNamespace> <AssemblyName>System.Reactive.Debugger</AssemblyName> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile> + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -24,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> @@ -41,26 +39,23 @@ <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> - <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project> - <Name>android_System.Reactive.Core</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj"> - <Project>{00DC3654-E373-4E3F-80FE-109F795ADF1F}</Project> - <Name>android_System.Reactive.Experimental</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> - <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project> - <Name>android_System.Reactive.Interfaces</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> - <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project> - <Name>android_System.Reactive.Linq</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj"> - <Project>{D263C126-9D3C-4299-A0C1-F25C703D07C9}</Project> - <Name>android_System.Reactive.PlatformServices</Name> - </ProjectReference> + +<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> + <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> + <Name>android_System.Reactive.Core</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj"> + <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project> + <Name>android_System.Reactive.Experimental</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> + <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> + <Name>android_System.Reactive.Interfaces</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> + <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> + <Name>android_System.Reactive.Linq</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj"> + <Project>{0CCCF009-763F-40D2-8655-7A94828023BF}</Project> + <Name>android_System.Reactive.PlatformServices</Name> +</ProjectReference> <!-- <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> @@ -69,17 +64,19 @@ --> </ItemGroup> <ItemGroup> - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> <Compile Include="..\..\..\..\System.Reactive.Debugger\Properties\AssemblyInfo.cs"> <Link>Properties\AssemblyInfo.cs</Link> </Compile> <Compile Include="..\..\..\..\System.Reactive.Debugger\Reactive\Linq\QueryDebugger.cs"> <Link>Reactive\Linq\QueryDebugger.cs</Link> </Compile> + + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> </Project> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj index c54d35fab2..6c3099c5c0 100755..100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Experimental/android_System.Reactive.Experimental.csproj @@ -10,10 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>System.Reactive</RootNamespace> <AssemblyName>System.Reactive.Experimental</AssemblyName> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile> + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -24,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> @@ -41,18 +39,17 @@ <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> - <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project> - <Name>android_System.Reactive.Linq</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> - <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project> - <Name>android_System.Reactive.Core</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> - <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project> - <Name>android_System.Reactive.Interfaces</Name> - </ProjectReference> + +<ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> + <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> + <Name>android_System.Reactive.Linq</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> + <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> + <Name>android_System.Reactive.Core</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> + <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> + <Name>android_System.Reactive.Interfaces</Name> +</ProjectReference> <!-- <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> @@ -61,11 +58,6 @@ --> </ItemGroup> <ItemGroup> - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> <Compile Include="..\..\..\..\System.Reactive.Experimental\ExperimentalAttribute.cs"> <Link>ExperimentalAttribute.cs</Link> </Compile> @@ -96,6 +88,13 @@ <Compile Include="..\..\..\..\System.Reactive.Experimental\Reactive\ListObservable.cs"> <Link>Reactive\ListObservable.cs</Link> </Compile> + + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> </Project> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj index ab0d4ec5a3..88dce4c41e 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Interfaces/android_System.Reactive.Interfaces.csproj @@ -10,10 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>System.Reactive</RootNamespace> <AssemblyName>System.Reactive.Interfaces</AssemblyName> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile> + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -24,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> @@ -41,6 +39,8 @@ <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> + + <!-- <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> @@ -49,11 +49,6 @@ --> </ItemGroup> <ItemGroup> - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> <Compile Include="..\..\..\..\System.Reactive.Interfaces\AssemblyFileVersionAttribute.cs"> <Link>AssemblyFileVersionAttribute.cs</Link> </Compile> @@ -126,6 +121,13 @@ <Compile Include="..\..\..\..\System.Reactive.Interfaces\Reactive\Subjects\ISubject.Multi.cs"> <Link>Reactive\Subjects\ISubject.Multi.cs</Link> </Compile> + + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> </Project> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj index 4b2bbe9a90..afd549176b 100755..100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Linq/android_System.Reactive.Linq.csproj @@ -10,10 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>System.Reactive</RootNamespace> <AssemblyName>System.Reactive.Linq</AssemblyName> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile> + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -24,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> @@ -41,14 +39,14 @@ <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> - <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project> - <Name>android_System.Reactive.Core</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> - <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project> - <Name>android_System.Reactive.Interfaces</Name> - </ProjectReference> + +<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> + <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> + <Name>android_System.Reactive.Core</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> + <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> + <Name>android_System.Reactive.Interfaces</Name> +</ProjectReference> <!-- <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> @@ -57,14 +55,6 @@ --> </ItemGroup> <ItemGroup> - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <EmbeddedResource Include="..\..\..\..\System.Reactive.Linq\Strings_Linq.resx"> - <Link>Strings_Linq.resx</Link> - </EmbeddedResource> <Compile Include="..\..\..\..\System.Reactive.Linq\GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> @@ -578,6 +568,16 @@ <Compile Include="..\..\..\..\System.Reactive.Linq\Strings_Linq.Generated.cs"> <Link>Strings_Linq.Generated.cs</Link> </Compile> + + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Strings_Linq.resx'> + <Link>Strings_Linq.resx</Link> + </EmbeddedResource> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> </Project> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj index bb1286a3e9..d5968cbd48 100755..100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.PlatformServices/android_System.Reactive.PlatformServices.csproj @@ -10,10 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>System.Reactive</RootNamespace> <AssemblyName>System.Reactive.PlatformServices</AssemblyName> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile> + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -24,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> @@ -41,18 +39,17 @@ <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> - <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project> - <Name>android_System.Reactive.Core</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> - <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project> - <Name>android_System.Reactive.Interfaces</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> - <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project> - <Name>android_System.Reactive.Linq</Name> - </ProjectReference> + +<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> + <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> + <Name>android_System.Reactive.Core</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> + <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> + <Name>android_System.Reactive.Interfaces</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> + <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> + <Name>android_System.Reactive.Linq</Name> +</ProjectReference> <!-- <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> @@ -61,14 +58,6 @@ --> </ItemGroup> <ItemGroup> - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <EmbeddedResource Include="..\..\..\..\System.Reactive.PlatformServices\Strings_PlatformServices.resx"> - <Link>Strings_PlatformServices.resx</Link> - </EmbeddedResource> <Compile Include="..\..\..\..\System.Reactive.PlatformServices\GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> @@ -126,6 +115,16 @@ <Compile Include="..\..\..\..\System.Reactive.PlatformServices\Strings_PlatformServices.Generated.cs"> <Link>Strings_PlatformServices.Generated.cs</Link> </Compile> + + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Strings_PlatformServices.resx'> + <Link>Strings_PlatformServices.resx</Link> + </EmbeddedResource> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> </Project> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj index 78205d1bed..1b04227d63 100755..100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Providers/android_System.Reactive.Providers.csproj @@ -10,10 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>System.Reactive</RootNamespace> <AssemblyName>System.Reactive.Providers</AssemblyName> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile> + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -24,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> @@ -41,18 +39,17 @@ <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> - <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project> - <Name>android_System.Reactive.Core</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> - <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project> - <Name>android_System.Reactive.Interfaces</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> - <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project> - <Name>android_System.Reactive.Linq</Name> - </ProjectReference> + +<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> + <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> + <Name>android_System.Reactive.Core</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> + <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> + <Name>android_System.Reactive.Interfaces</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> + <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> + <Name>android_System.Reactive.Linq</Name> +</ProjectReference> <!-- <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> @@ -61,14 +58,6 @@ --> </ItemGroup> <ItemGroup> - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <EmbeddedResource Include="..\..\..\..\System.Reactive.Providers\Strings_Providers.resx"> - <Link>Strings_Providers.resx</Link> - </EmbeddedResource> <Compile Include="..\..\..\..\System.Reactive.Providers\GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> @@ -105,6 +94,16 @@ <Compile Include="..\..\..\..\System.Reactive.Providers\Strings_Providers.Generated.cs"> <Link>Strings_Providers.Generated.cs</Link> </Compile> + + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + <EmbeddedResource Include='..\..\..\..\..\..\../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Strings_Providers.resx'> + <Link>Strings_Providers.resx</Link> + </EmbeddedResource> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> </Project> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Runtime.Remoting/android_System.Reactive.Runtime.Remoting.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Runtime.Remoting/android_System.Reactive.Runtime.Remoting.csproj index 58d292919e..c908963081 100755..100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Runtime.Remoting/android_System.Reactive.Runtime.Remoting.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/System.Reactive.Runtime.Remoting/android_System.Reactive.Runtime.Remoting.csproj @@ -10,10 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>System.Reactive</RootNamespace> <AssemblyName>System.Reactive.Runtime.Remoting</AssemblyName> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>..\..\..\reactive.pub</AssemblyOriginatorKeyFile> + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -24,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> @@ -41,14 +39,14 @@ <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> - <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project> - <Name>android_System.Reactive.Core</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> - <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project> - <Name>android_System.Reactive.Interfaces</Name> - </ProjectReference> + +<ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> + <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> + <Name>android_System.Reactive.Core</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> + <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> + <Name>android_System.Reactive.Interfaces</Name> +</ProjectReference> <!-- <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> @@ -57,11 +55,6 @@ --> </ItemGroup> <ItemGroup> - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> <Compile Include="..\..\..\..\System.Reactive.Runtime.Remoting\GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> @@ -74,6 +67,13 @@ <Compile Include="..\..\..\..\System.Reactive.Runtime.Remoting\Reactive\Linq\QueryLanguage.Remoting.cs"> <Link>Reactive\Linq\QueryLanguage.Remoting.cs</Link> </Compile> + + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> </Project> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj index 2a6ef7a55d..abdcfdc6cb 100755..100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/rx/Tests.System.Reactive/android_Tests.System.Reactive.csproj @@ -10,7 +10,7 @@ <OutputType>Library</OutputType> <RootNamespace>System.Reactive</RootNamespace> <AssemblyName>Tests.System.Reactive</AssemblyName> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;SIGNED;NUNIT;MONODROID</DefineConstants> + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;HAS_AWAIT;NUNIT;MONODROID;$(SignAssemblySpec)</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> @@ -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> @@ -38,59 +39,49 @@ <Reference Include="System.Core" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> - <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> - <Name>Android.NUnitLite</Name> - </ProjectReference> +<ProjectReference Include="..\..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"><Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project><Name>Android.NUnitLite</Name></ProjectReference> +<ProjectReference Include="..\Mono.Reactive.Testing\android_Mono.Reactive.Testing.csproj"> + <Project>{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}</Project> + <Name>android_Mono.Reactive.Testing</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> + <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> + <Name>android_System.Reactive.Core</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj"> + <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project> + <Name>android_System.Reactive.Experimental</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> + <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> + <Name>android_System.Reactive.Interfaces</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Observable.Aliases\android_System.Reactive.Observable.Aliases.csproj"> + <Project>{9ffac385-10a4-4ddd-b800-de67e8469cc0}</Project> + <Name>android_System.Reactive.Observable.Aliases</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj"> + <Project>{0CCCF009-763F-40D2-8655-7A94828023BF}</Project> + <Name>android_System.Reactive.PlatformServices</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Providers\android_System.Reactive.Providers.csproj" Condition=" '$(BuildFlavor)' != 'SILVERLIGHTM7' And '$(BuildPlatform)' != 'XNA' "> + <Project>{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}</Project> + <Name>android_System.Reactive.Providers</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> + <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> + <Name>android_System.Reactive.Linq</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Runtime.Remoting\android_System.Reactive.Runtime.Remoting.csproj" Condition=" '$(BuildPlatform)' != 'WINDOWS_PHONE' And '$(BuildTarget)' != 'WP7' "> + <Project>{7A6EF49E-7946-4101-9C89-407B9C53A173}</Project> + <Name>android_System.Reactive.Runtime.Remoting</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Windows.Forms\android_System.Reactive.Windows.Forms.csproj" Condition=" '$(BuildPlatform)' == 'DESKTOPCLR' "> + <Project>{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}</Project> + <Name>android_System.Reactive.Windows.Forms</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.Windows.Threading\android_System.Reactive.Windows.Threading.csproj"> + <Project>{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}</Project> + <Name>android_System.Reactive.Windows.Threading</Name> +</ProjectReference> <!-- <ProjectReference Include="..\Andr.Unit\Android.NUnitLite\Android.NUnitLite.csproj"> <Project>{6A005891-A3D6-4398-A729-F645397D573A}</Project> <Name>Android.NUnitLite</Name> </ProjectReference> --> - <ProjectReference Include="..\Mono.Reactive.Testing\android_Mono.Reactive.Testing.csproj"> - <Project>{CB2AB716-BFCB-43BC-A03B-A3BDA427746C}</Project> - <Name>android_Mono.Reactive.Testing</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Core\android_System.Reactive.Core.csproj"> - <Project>{FEF62C23-10CD-4DEF-A5AE-54A8B309E970}</Project> - <Name>android_System.Reactive.Core</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Debugger\android_System.Reactive.Debugger.csproj"> - <Project>{9360E845-D79D-4288-9100-63A80FAD2BF0}</Project> - <Name>android_System.Reactive.Debugger</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Interfaces\android_System.Reactive.Interfaces.csproj"> - <Project>{4FA878DC-6E88-43C4-B37B-8C1151CEC56F}</Project> - <Name>android_System.Reactive.Interfaces</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Linq\android_System.Reactive.Linq.csproj"> - <Project>{EC704077-EA31-4852-AD24-6732244174C0}</Project> - <Name>android_System.Reactive.Linq</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.PlatformServices\android_System.Reactive.PlatformServices.csproj"> - <Project>{D263C126-9D3C-4299-A0C1-F25C703D07C9}</Project> - <Name>android_System.Reactive.PlatformServices</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Experimental\android_System.Reactive.Experimental.csproj"> - <Project>{00DC3654-E373-4E3F-80FE-109F795ADF1F}</Project> - <Name>android_System.Reactive.Experimental</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Providers\android_System.Reactive.Providers.csproj"> - <Project>{E662282B-4341-4F86-AAAA-A942335B47FB}</Project> - <Name>android_System.Reactive.Providers</Name> - </ProjectReference> - <ProjectReference Include="..\System.Reactive.Runtime.Remoting\android_System.Reactive.Runtime.Remoting.csproj"> - <Project>{A153A379-670C-42C2-9018-FC0D933A4F7F}</Project> - <Name>android_System.Reactive.Runtime.Remoting</Name> - </ProjectReference> </ItemGroup> <ItemGroup> - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> <Compile Include="..\..\..\..\Tests.System.Reactive\App.cs"> <Link>App.cs</Link> </Compile> @@ -106,6 +97,9 @@ <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Core\Disposables\Serial.cs"> <Link>Stress\Core\Disposables\Serial.cs</Link> </Compile> + <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Core\Schedulers\EventLoop.cs"> + <Link>Stress\Core\Schedulers\EventLoop.cs</Link> + </Compile> <Compile Include="..\..\..\..\Tests.System.Reactive\Stress\Core\Disposables\SingleAssignment.cs"> <Link>Stress\Core\Disposables\SingleAssignment.cs</Link> </Compile> @@ -130,6 +124,9 @@ <Compile Include="..\..\..\..\Tests.System.Reactive\TestLongRunningScheduler.cs"> <Link>TestLongRunningScheduler.cs</Link> </Compile> + <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Aliases.cs"> + <Link>Tests\Aliases.cs</Link> + </Compile> <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\AnonymousTest.cs"> <Link>Tests\AnonymousTest.cs</Link> </Compile> @@ -220,6 +217,9 @@ <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableExtensionsTest.cs"> <Link>Tests\Linq\ObservableExtensionsTest.cs</Link> </Compile> + <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableExTest.cs"> + <Link>Tests\Linq\ObservableExTest.cs</Link> + </Compile> <Compile Include="..\..\..\..\Tests.System.Reactive\Tests\Linq\ObservableImperativeTest.cs"> <Link>Tests\Linq\ObservableImperativeTest.cs</Link> </Compile> @@ -340,6 +340,13 @@ <Compile Include="..\..\..\..\Tests.System.Reactive\Utils.cs"> <Link>Utils.cs</Link> </Compile> + + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> </Project> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/MainActivity.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/MainActivity.cs index 224315ddd4..33485df5e3 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/MainActivity.cs +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/MainActivity.cs @@ -1,4 +1,4 @@ -#define REACTIVE +#define REACTIVE using System; using System.Collections.Generic; using System.IO; diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Properties/AssemblyInfo.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Properties/AssemblyInfo.cs index 757ab880aa..064daa16a7 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Properties/AssemblyInfo.cs +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -using System.Reflection; +using System.Reflection; using System.Runtime.CompilerServices; using Android.App; diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Resources/Resource.designer.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Resources/Resource.designer.cs index 5eed766d55..8466952b8b 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Resources/Resource.designer.cs +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/GithubApiClientSample/Resources/Resource.designer.cs @@ -1,4 +1,4 @@ -#pragma warning disable 1591 +#pragma warning disable 1591 // ------------------------------------------------------------------------------ // <autogenerated> // This code was generated by a tool. diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample.sln b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample.sln new file mode 100644 index 0000000000..fadcb164d2 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveAndroidSample", "ReactiveAndroidSample\ReactiveAndroidSample.csproj", "{0A024D57-A5E0-4648-80E6-C5F525167625}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0A024D57-A5E0-4648-80E6-C5F525167625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A024D57-A5E0-4648-80E6-C5F525167625}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A024D57-A5E0-4648-80E6-C5F525167625}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A024D57-A5E0-4648-80E6-C5F525167625}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = ReactiveAndroidSample\ReactiveAndroidSample.csproj + EndGlobalSection +EndGlobal diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Assets/AboutAssets.txt b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Assets/AboutAssets.txt new file mode 100644 index 0000000000..ee39886295 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Assets/AboutAssets.txt @@ -0,0 +1,19 @@ +Any raw assets you want to be deployed with your application can be placed in +this directory (and child directories) and given a Build Action of "AndroidAsset". + +These files will be deployed with you package and will be accessible using Android's +AssetManager, like this: + +public class ReadAsset : Activity +{ + protected override void OnCreate (Bundle bundle) + { + base.OnCreate (bundle); + + InputStream input = Assets.Open ("my_asset.txt"); + } +} + +Additionally, some Android functions will automatically load asset files: + +Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
\ No newline at end of file diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/MainActivity.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/MainActivity.cs new file mode 100644 index 0000000000..268372636a --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/MainActivity.cs @@ -0,0 +1,47 @@ +using System; +using System.Reactive; +using System.Reactive.Linq; +using Android.App; +using Android.OS; +using Android.Views; +using Android.Widget; + +namespace ReactiveAndroidSample +{ + [Activity (Label = "ReactiveAndroidSample", MainLauncher = true)] + public class Activity1 : Activity + { + protected override void OnCreate (Bundle bundle) + { + base.OnCreate (bundle); + + SetContentView (Resource.Layout.Main); + + var text = FindViewById<TextView> (Resource.Id.theText); + + var surface = FindViewById<View> (Resource.Id.theToucheable); + + triple_touch_source = Observable.FromEventPattern<View.TouchEventArgs> (surface, "Touch") + .Where (ev => ev.EventArgs.Event.Action == MotionEventActions.Move) + .Where (ev => ev.EventArgs.Event.PointerCount == 3) + //.SubscribeOn (Application.SynchronizationContext) + .ToEventPattern (); + + TripleTouch += (sender, ev) => + this.RunOnUiThread (() => + text.Text = GetEventDescription (ev.Event)); + } + + IEventPatternSource<View.TouchEventArgs> triple_touch_source; + + public event EventHandler<View.TouchEventArgs> TripleTouch { + add { triple_touch_source.OnNext += value; } + remove { triple_touch_source.OnNext -= value; } + } + + static string GetEventDescription (MotionEvent e) + { + return string.Format ("({0}, {1})", e.RawX, e.RawY); + } + } +} diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Properties/AssemblyInfo.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..57340a1600 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Properties/AssemblyInfo.cs @@ -0,0 +1,28 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using Android.App; + +// Information about this assembly is defined by the following attributes. +// Change them to the values specific to your project. + +[assembly: AssemblyTitle("ReactiveAndroidSample")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("")] +[assembly: AssemblyCopyright("atsushi")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". +// The form "{Major}.{Minor}.*" will automatically update the build and revision, +// and "{Major}.{Minor}.{Build}.*" will update just the revision. + +[assembly: AssemblyVersion("1.0.0")] + +// The following attributes are used to specify the signing key for the assembly, +// if desired. See the Mono documentation for more information about signing. + +//[assembly: AssemblyDelaySign(false)] +//[assembly: AssemblyKeyFile("")] + diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/ReactiveAndroidSample.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/ReactiveAndroidSample.csproj new file mode 100644 index 0000000000..53eec679a0 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/ReactiveAndroidSample.csproj @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProductVersion>10.0.0</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{0A024D57-A5E0-4648-80E6-C5F525167625}</ProjectGuid> + <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> + <OutputType>Library</OutputType> + <RootNamespace>ReactiveAndroidSample</RootNamespace> + <AndroidApplication>True</AndroidApplication> + <AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile> + <AndroidResgenClass>Resource</AndroidResgenClass> + <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> + <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> + <AssemblyName>ReactiveAndroidSample</AssemblyName> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug</OutputPath> + <DefineConstants>DEBUG;</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <AndroidLinkMode>None</AndroidLinkMode> + <ConsolePause>false</ConsolePause> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>none</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release</OutputPath> + <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="Mono.Android" /> + <Reference Include="System.Reactive.Core"> + <HintPath>..\..\..\libs\System.Reactive.Core.dll</HintPath> + </Reference> + <Reference Include="System.Reactive.Interfaces"> + <HintPath>..\..\..\libs\System.Reactive.Interfaces.dll</HintPath> + </Reference> + <Reference Include="System.Reactive.Linq"> + <HintPath>..\..\..\libs\System.Reactive.Linq.dll</HintPath> + </Reference> + <Reference Include="System.Reactive.PlatformServices"> + <HintPath>..\..\..\libs\System.Reactive.PlatformServices.dll</HintPath> + </Reference> + </ItemGroup> + <ItemGroup> + <Compile Include="MainActivity.cs" /> + <Compile Include="Resources\Resource.designer.cs" /> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="Resources\AboutResources.txt" /> + <None Include="Assets\AboutAssets.txt" /> + </ItemGroup> + <ItemGroup> + <AndroidResource Include="Resources\layout\Main.axml" /> + <AndroidResource Include="Resources\values\Strings.xml" /> + <AndroidResource Include="Resources\drawable\Icon.png" /> + </ItemGroup> + <Import Project="$(MSBuildExtensionsPath)\Novell\Novell.MonoDroid.CSharp.targets" /> +</Project>
\ No newline at end of file diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/AboutResources.txt b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/AboutResources.txt new file mode 100644 index 0000000000..10f52d4602 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/AboutResources.txt @@ -0,0 +1,44 @@ +Images, layout descriptions, binary blobs and string dictionaries can be included +in your application as resource files. Various Android APIs are designed to +operate on the resource IDs instead of dealing with images, strings or binary blobs +directly. + +For example, a sample Android app that contains a user interface layout (main.axml), +an internationalization string table (strings.xml) and some icons (drawable-XXX/icon.png) +would keep its resources in the "Resources" directory of the application: + +Resources/ + drawable/ + icon.png + + layout/ + main.axml + + values/ + strings.xml + +In order to get the build system to recognize Android resources, set the build action to +"AndroidResource". The native Android APIs do not operate directly with filenames, but +instead operate on resource IDs. When you compile an Android application that uses resources, +the build system will package the resources for distribution and generate a class called "R" +(this is an Android convention) that contains the tokens for each one of the resources +included. For example, for the above Resources layout, this is what the R class would expose: + +public class R { + public class drawable { + public const int icon = 0x123; + } + + public class layout { + public const int main = 0x456; + } + + public class strings { + public const int first_string = 0xabc; + public const int second_string = 0xbcd; + } +} + +You would then use R.drawable.icon to reference the drawable/icon.png file, or R.layout.main +to reference the layout/main.axml file, or R.strings.first_string to reference the first +string in the dictionary file values/strings.xml. diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/Resource.designer.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/Resource.designer.cs new file mode 100644 index 0000000000..1f475286c2 --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/Resource.designer.cs @@ -0,0 +1,115 @@ +#pragma warning disable 1591 +// ------------------------------------------------------------------------------ +// <autogenerated> +// This code was generated by a tool. +// Mono Runtime Version: 4.0.30319.17020 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// </autogenerated> +// ------------------------------------------------------------------------------ + +[assembly: Android.Runtime.ResourceDesignerAttribute("ReactiveAndroidSample.Resource", IsApplication=true)] + +namespace ReactiveAndroidSample +{ + + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")] + public partial class Resource + { + + static Resource() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + public static void UpdateIdValues() + { + } + + public partial class Attribute + { + + static Attribute() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Attribute() + { + } + } + + public partial class Drawable + { + + // aapt resource value: 0x7f020000 + public const int Icon = 2130837504; + + static Drawable() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Drawable() + { + } + } + + public partial class Id + { + + // aapt resource value: 0x7f050001 + public const int theText = 2131034113; + + // aapt resource value: 0x7f050000 + public const int theToucheable = 2131034112; + + static Id() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Id() + { + } + } + + public partial class Layout + { + + // aapt resource value: 0x7f030000 + public const int Main = 2130903040; + + static Layout() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private Layout() + { + } + } + + public partial class String + { + + // aapt resource value: 0x7f040001 + public const int app_name = 2130968577; + + // aapt resource value: 0x7f040000 + public const int hello = 2130968576; + + static String() + { + global::Android.Runtime.ResourceIdManager.UpdateIdValues(); + } + + private String() + { + } + } + } +} +#pragma warning restore 1591 diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/drawable/Icon.png b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/drawable/Icon.png Binary files differnew file mode 100644 index 0000000000..a07c69fa5a --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/drawable/Icon.png diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/layout/Main.axml b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/layout/Main.axml new file mode 100644 index 0000000000..84cf9868df --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/layout/Main.axml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + <View + android:id="@+id/theToucheable" + android:layout_width="fill_parent" + android:layout_height="440.7dp" + android:layout_marginBottom="0.0dp" /> + <TextView + android:id="@+id/theText" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="(touch corrdinates shown here)" /> +</LinearLayout> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/values/Strings.xml b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/values/Strings.xml new file mode 100644 index 0000000000..0174c8518a --- /dev/null +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/android/samples/ReactiveAndroidSample/ReactiveAndroidSample/Resources/values/Strings.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="hello">Hello World, Click Me!</string> + <string name="app_name">ReactiveAndroidSample</string> +</resources> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/AppDelegate.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/AppDelegate.cs index 64d549fedb..f262349289 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/AppDelegate.cs +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/AppDelegate.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/Main.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/Main.cs index 01eff67060..0401ce5b9c 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/Main.cs +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/Tests.System.Reactive/Main.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/Main.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/Main.cs index 677972735a..0e2e29c9c6 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/Main.cs +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/Main.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/UnitTestAppDelegate.cs b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/UnitTestAppDelegate.cs index 7ba7e00b2e..0fa2496a90 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/UnitTestAppDelegate.cs +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/ios_UnitTest/UnitTestAppDelegate.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/Mono.Reactive.Testing/ios_Mono.Reactive.Testing.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/Mono.Reactive.Testing/ios_Mono.Reactive.Testing.csproj index c38caa8290..ccb9faceec 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/Mono.Reactive.Testing/ios_Mono.Reactive.Testing.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/Mono.Reactive.Testing/ios_Mono.Reactive.Testing.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{47d85a91-e8e2-4088-bf5a-68a161754d48}</ProjectGuid> + <ProjectGuid>{47D85A91-E8E2-4088-BF5A-68A161754D48}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,8 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>Mono.Reactive.Testing</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -24,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> @@ -53,13 +52,13 @@ <Reference Include='MonoTouch.NUnitLite' /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj"> <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> <Name>ios_System.Reactive.Core</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj"> <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> <Name>ios_System.Reactive.Linq</Name> </ProjectReference> @@ -71,52 +70,52 @@ --> </ItemGroup> <ItemGroup> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ColdObservable.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/ColdObservable.cs"> <Link>ColdObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/GlobalSuppressions.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/HotObservable.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/HotObservable.cs"> <Link>HotObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ITestObservable.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/ITestObservable.cs"> <Link>ITestObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ITestObserver.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/ITestObserver.cs"> <Link>ITestObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/MockObserver.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/MockObserver.cs"> <Link>MockObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/NamespaceDoc.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/NamespaceDoc.cs"> <Link>NamespaceDoc.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ReactiveAssert.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/ReactiveAssert.cs"> <Link>ReactiveAssert.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/ReactiveTest.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/ReactiveTest.cs"> <Link>ReactiveTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/Recorded.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/Recorded.cs"> <Link>Recorded.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/Subscription.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/Subscription.cs"> <Link>Subscription.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Microsoft.Reactive.Testing/TestScheduler.cs'> + <Compile Include="../../../../Microsoft.Reactive.Testing/TestScheduler.cs"> <Link>TestScheduler.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Core/ios_System.Reactive.Core.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Core/ios_System.Reactive.Core.csproj index 145957cb2b..f17389eef2 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Core/ios_System.Reactive.Core.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Core/ios_System.Reactive.Core.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{a67f34b5-75c1-4319-a93e-93df87e728a4}</ProjectGuid> + <ProjectGuid>{A67F34B5-75C1-4319-A93E-93DF87E728A4}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,11 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>System.Reactive.Core</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -27,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> @@ -56,7 +52,7 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> </ProjectReference> @@ -68,250 +64,250 @@ --> </ItemGroup> <ItemGroup> - <EmbeddedResource Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Strings_Core.resx'> - <Link>Strings_Core.resx</Link> - </EmbeddedResource> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/GlobalSuppressions.cs'> + <Compile Include="../../../../System.Reactive.Core/GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/InternalsVisibleTo.cs'> + <Compile Include="../../../../System.Reactive.Core/InternalsVisibleTo.cs"> <Link>InternalsVisibleTo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/NamespaceDocs.cs'> + <Compile Include="../../../../System.Reactive.Core/NamespaceDocs.cs"> <Link>NamespaceDocs.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Observable.Extensions.cs'> + <Compile Include="../../../../System.Reactive.Core/Observable.Extensions.cs"> <Link>Observable.Extensions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Observer.Extensions.cs'> + <Compile Include="../../../../System.Reactive.Core/Observer.Extensions.cs"> <Link>Observer.Extensions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../System.Reactive.Core/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/AnonymousObservable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/AnonymousObservable.cs"> <Link>Reactive/AnonymousObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/AnonymousObserver.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/AnonymousObserver.cs"> <Link>Reactive/AnonymousObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/AnonymousSafeObserver.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/AnonymousSafeObserver.cs"> <Link>Reactive/AnonymousSafeObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/AsyncLock.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/AsyncLock.cs"> <Link>Reactive/Concurrency/AsyncLock.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/CatchScheduler.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/CatchScheduler.cs"> <Link>Reactive/Concurrency/CatchScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/ConcurrencyAbstractionLayer.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/ConcurrencyAbstractionLayer.cs"> <Link>Reactive/Concurrency/ConcurrencyAbstractionLayer.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/ConcurrencyAbstractionLayer.Default.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/ConcurrencyAbstractionLayer.Default.cs"> <Link>Reactive/Concurrency/ConcurrencyAbstractionLayer.Default.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Scheduler.Wrappers.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Scheduler.Wrappers.cs"> <Link>Reactive/Concurrency/Scheduler.Wrappers.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/DisableOptimizationsScheduler.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/DisableOptimizationsScheduler.cs"> <Link>Reactive/Concurrency/DisableOptimizationsScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Scheduler.Services.Emulation.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Scheduler.Services.Emulation.cs"> <Link>Reactive/Concurrency/Scheduler.Services.Emulation.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/LocalScheduler.TimerQueue.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/LocalScheduler.TimerQueue.cs"> <Link>Reactive/Concurrency/LocalScheduler.TimerQueue.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Scheduler.Services.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Scheduler.Services.cs"> <Link>Reactive/Concurrency/Scheduler.Services.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/CurrentThreadScheduler.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/CurrentThreadScheduler.cs"> <Link>Reactive/Concurrency/CurrentThreadScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/ImmediateScheduler.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/ImmediateScheduler.cs"> <Link>Reactive/Concurrency/ImmediateScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/LocalScheduler.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/LocalScheduler.cs"> <Link>Reactive/Concurrency/LocalScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/ScheduledItem.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/ScheduledItem.cs"> <Link>Reactive/Concurrency/ScheduledItem.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Scheduler.Async.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Scheduler.Async.cs"> <Link>Reactive/Concurrency/Scheduler.Async.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Scheduler.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Scheduler.cs"> <Link>Reactive/Concurrency/Scheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Scheduler.Recursive.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Scheduler.Recursive.cs"> <Link>Reactive/Concurrency/Scheduler.Recursive.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Scheduler.Simple.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Scheduler.Simple.cs"> <Link>Reactive/Concurrency/Scheduler.Simple.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/SchedulerDefaults.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/SchedulerDefaults.cs"> <Link>Reactive/Concurrency/SchedulerDefaults.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/SchedulerOperation.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/SchedulerOperation.cs"> <Link>Reactive/Concurrency/SchedulerOperation.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/SchedulerQueue.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/SchedulerQueue.cs"> <Link>Reactive/Concurrency/SchedulerQueue.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/SchedulerWrapper.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/SchedulerWrapper.cs"> <Link>Reactive/Concurrency/SchedulerWrapper.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Stopwatch.Default.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Stopwatch.Default.cs"> <Link>Reactive/Concurrency/Stopwatch.Default.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Synchronization.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Synchronization.cs"> <Link>Reactive/Concurrency/Synchronization.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Synchronization.ObserveOn.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Synchronization.ObserveOn.cs"> <Link>Reactive/Concurrency/Synchronization.ObserveOn.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/Synchronization.Synchronize.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/Synchronization.Synchronize.cs"> <Link>Reactive/Concurrency/Synchronization.Synchronize.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/SynchronizationContextScheduler.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/SynchronizationContextScheduler.cs"> <Link>Reactive/Concurrency/SynchronizationContextScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Concurrency/DefaultScheduler.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Concurrency/DefaultScheduler.cs"> <Link>Reactive/Concurrency/DefaultScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/AsyncLockObserver.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/AsyncLockObserver.cs"> <Link>Reactive/Internal/AsyncLockObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/CheckedObserver.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/CheckedObserver.cs"> <Link>Reactive/Internal/CheckedObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/ConcurrentDictionary.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/ConcurrentDictionary.cs"> <Link>Reactive/Internal/ConcurrentDictionary.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/ConcurrentQueue.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/ConcurrentQueue.cs"> <Link>Reactive/Internal/ConcurrentQueue.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/Constants.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/Constants.cs"> <Link>Reactive/Internal/Constants.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/AnonymousDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/AnonymousDisposable.cs"> <Link>Reactive/Disposables/AnonymousDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/BooleanDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/BooleanDisposable.cs"> <Link>Reactive/Disposables/BooleanDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/CancellationDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/CancellationDisposable.cs"> <Link>Reactive/Disposables/CancellationDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/CompositeDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/CompositeDisposable.cs"> <Link>Reactive/Disposables/CompositeDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/ContextDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/ContextDisposable.cs"> <Link>Reactive/Disposables/ContextDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/DefaultDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/DefaultDisposable.cs"> <Link>Reactive/Disposables/DefaultDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/Disposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/Disposable.cs"> <Link>Reactive/Disposables/Disposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/MultipleAssignmentDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/MultipleAssignmentDisposable.cs"> <Link>Reactive/Disposables/MultipleAssignmentDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/RefCountDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/RefCountDisposable.cs"> <Link>Reactive/Disposables/RefCountDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/ScheduledDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/ScheduledDisposable.cs"> <Link>Reactive/Disposables/ScheduledDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/SerialDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/SerialDisposable.cs"> <Link>Reactive/Disposables/SerialDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Disposables/SingleAssignmentDisposable.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Disposables/SingleAssignmentDisposable.cs"> <Link>Reactive/Disposables/SingleAssignmentDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/AutoDetachObserver.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/AutoDetachObserver.cs"> <Link>Reactive/Internal/AutoDetachObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/ExceptionServices.Default.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/ExceptionServices.Default.cs"> <Link>Reactive/Internal/ExceptionServices.Default.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/ExceptionServices.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/ExceptionServices.cs"> <Link>Reactive/Internal/ExceptionServices.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/HostLifecycleService.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/HostLifecycleService.cs"> <Link>Reactive/Internal/HostLifecycleService.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/ImmutableList.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/ImmutableList.cs"> <Link>Reactive/Internal/ImmutableList.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/Lazy.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/Lazy.cs"> <Link>Reactive/Internal/Lazy.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/Observers.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/Observers.cs"> <Link>Reactive/Internal/Observers.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/PlatformEnlightenmentProvider.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/PlatformEnlightenmentProvider.cs"> <Link>Reactive/Internal/PlatformEnlightenmentProvider.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/PriorityQueue.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/PriorityQueue.cs"> <Link>Reactive/Internal/PriorityQueue.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/Producer.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/Producer.cs"> <Link>Reactive/Internal/Producer.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/SafeObserver.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/SafeObserver.cs"> <Link>Reactive/Internal/SafeObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/ScheduledObserver.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/ScheduledObserver.cs"> <Link>Reactive/Internal/ScheduledObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/Semaphore.Silverlight.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/Semaphore.Silverlight.cs"> <Link>Reactive/Internal/Semaphore.Silverlight.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/Semaphore.Xna.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/Semaphore.Xna.cs"> <Link>Reactive/Internal/Semaphore.Xna.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/Sink.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/Sink.cs"> <Link>Reactive/Internal/Sink.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/Stubs.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/Stubs.cs"> <Link>Reactive/Internal/Stubs.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/SynchronizationContextExtensions.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/SynchronizationContextExtensions.cs"> <Link>Reactive/Internal/SynchronizationContextExtensions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/SynchronizedObserver.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/SynchronizedObserver.cs"> <Link>Reactive/Internal/SynchronizedObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/SystemClock.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/SystemClock.cs"> <Link>Reactive/Internal/SystemClock.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Internal/SystemClock.Default.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Internal/SystemClock.Default.cs"> <Link>Reactive/Internal/SystemClock.Default.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Notification.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Notification.cs"> <Link>Reactive/Notification.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/ObservableBase.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/ObservableBase.cs"> <Link>Reactive/ObservableBase.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/ObserverBase.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/ObserverBase.cs"> <Link>Reactive/ObserverBase.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Reactive/Unit.cs'> + <Compile Include="../../../../System.Reactive.Core/Reactive/Unit.cs"> <Link>Reactive/Unit.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Strings_Core.Generated.cs'> + <Compile Include="../../../../System.Reactive.Core/Strings_Core.Generated.cs"> <Link>Strings_Core.Generated.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + <EmbeddedResource Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Core/Strings_Core.resx'> + <Link>Strings_Core.resx</Link> + </EmbeddedResource> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Debugger/ios_System.Reactive.Debugger.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Debugger/ios_System.Reactive.Debugger.csproj index 2cc9b862e5..c4d8dd9070 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Debugger/ios_System.Reactive.Debugger.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Debugger/ios_System.Reactive.Debugger.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{b41cb61a-dca0-4539-8f99-7b3499e18e6d}</ProjectGuid> + <ProjectGuid>{B41CB61A-DCA0-4539-8F99-7B3499E18E6D}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,11 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>System.Reactive.Debugger</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -27,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> @@ -56,19 +52,19 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj"> <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> <Name>ios_System.Reactive.Core</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\ios_System.Reactive.Experimental.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\ios_System.Reactive.Experimental.csproj"> <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project> <Name>ios_System.Reactive.Experimental</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj"> <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> <Name>ios_System.Reactive.Linq</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\ios_System.Reactive.PlatformServices.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\ios_System.Reactive.PlatformServices.csproj"> <Project>{0CCCF009-763F-40D2-8655-7A94828023BF}</Project> <Name>ios_System.Reactive.PlatformServices</Name> </ProjectReference> @@ -80,19 +76,19 @@ --> </ItemGroup> <ItemGroup> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Debugger/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../System.Reactive.Debugger/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Debugger/Reactive/Linq/QueryDebugger.cs'> + <Compile Include="../../../../System.Reactive.Debugger/Reactive/Linq/QueryDebugger.cs"> <Link>Reactive/Linq/QueryDebugger.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Experimental/ios_System.Reactive.Experimental.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Experimental/ios_System.Reactive.Experimental.csproj index 686350c792..0326fabcc6 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Experimental/ios_System.Reactive.Experimental.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Experimental/ios_System.Reactive.Experimental.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{24f995bd-7075-489c-b7a5-7fde08c304b6}</ProjectGuid> + <ProjectGuid>{24F995BD-7075-489C-B7A5-7FDE08C304B6}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,11 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>System.Reactive.Experimental</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -27,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> @@ -56,13 +52,13 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj"> <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> <Name>ios_System.Reactive.Linq</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj"> <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> <Name>ios_System.Reactive.Core</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> </ProjectReference> @@ -74,43 +70,43 @@ --> </ItemGroup> <ItemGroup> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/ExperimentalAttribute.cs'> + <Compile Include="../../../../System.Reactive.Experimental/ExperimentalAttribute.cs"> <Link>ExperimentalAttribute.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/InternalsVisibleTo.cs'> + <Compile Include="../../../../System.Reactive.Experimental/InternalsVisibleTo.cs"> <Link>InternalsVisibleTo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../System.Reactive.Experimental/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/Reactive/Internal/BinaryObserver.cs'> + <Compile Include="../../../../System.Reactive.Experimental/Reactive/Internal/BinaryObserver.cs"> <Link>Reactive/Internal/BinaryObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/QbservableEx.cs'> + <Compile Include="../../../../System.Reactive.Experimental/Reactive/Linq/QbservableEx.cs"> <Link>Reactive/Linq/QbservableEx.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/IQueryLanguageEx.cs'> + <Compile Include="../../../../System.Reactive.Experimental/Reactive/Linq/IQueryLanguageEx.cs"> <Link>Reactive/Linq/IQueryLanguageEx.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/ObservableEx.cs'> + <Compile Include="../../../../System.Reactive.Experimental/Reactive/Linq/ObservableEx.cs"> <Link>Reactive/Linq/ObservableEx.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/QbservableEx.Generated.cs'> + <Compile Include="../../../../System.Reactive.Experimental/Reactive/Linq/QbservableEx.Generated.cs"> <Link>Reactive/Linq/QbservableEx.Generated.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/QueryLanguageEx.cs'> + <Compile Include="../../../../System.Reactive.Experimental/Reactive/Linq/QueryLanguageEx.cs"> <Link>Reactive/Linq/QueryLanguageEx.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Experimental/Reactive/ListObservable.cs'> + <Compile Include="../../../../System.Reactive.Experimental/Reactive/ListObservable.cs"> <Link>Reactive/ListObservable.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Interfaces/ios_System.Reactive.Interfaces.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Interfaces/ios_System.Reactive.Interfaces.csproj index 905db4d87d..87f877d67e 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Interfaces/ios_System.Reactive.Interfaces.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Interfaces/ios_System.Reactive.Interfaces.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{6f2675f5-fcc7-4a28-9dc3-657b4613dcc5}</ProjectGuid> + <ProjectGuid>{6F2675F5-FCC7-4A28-9DC3-657B4613DCC5}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,11 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>System.Reactive.Interfaces</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -27,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> @@ -65,85 +61,85 @@ --> </ItemGroup> <ItemGroup> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/AssemblyFileVersionAttribute.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/AssemblyFileVersionAttribute.cs"> <Link>AssemblyFileVersionAttribute.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/DateTimeOffset.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/DateTimeOffset.cs"> <Link>DateTimeOffset.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/GlobalSuppressions.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/IObservable.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/IObservable.cs"> <Link>IObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/IObserver.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/IObserver.cs"> <Link>IObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/NamespaceDocs.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/NamespaceDocs.cs"> <Link>NamespaceDocs.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Concurrency/ISchedulerPeriodic.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Concurrency/ISchedulerPeriodic.cs"> <Link>Reactive/Concurrency/ISchedulerPeriodic.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Concurrency/IStopwatchProvider.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Concurrency/IStopwatchProvider.cs"> <Link>Reactive/Concurrency/IStopwatchProvider.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Concurrency/IScheduledItem.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Concurrency/IScheduledItem.cs"> <Link>Reactive/Concurrency/IScheduledItem.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Concurrency/IScheduler.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Concurrency/IScheduler.cs"> <Link>Reactive/Concurrency/IScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Concurrency/ISchedulerLongRunning.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Concurrency/ISchedulerLongRunning.cs"> <Link>Reactive/Concurrency/ISchedulerLongRunning.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Concurrency/IStopwatch.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Concurrency/IStopwatch.cs"> <Link>Reactive/Concurrency/IStopwatch.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Disposables/ICancelable.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Disposables/ICancelable.cs"> <Link>Reactive/Disposables/ICancelable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/IEventPattern.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/IEventPattern.cs"> <Link>Reactive/IEventPattern.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/IEventPatternSource.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/IEventPatternSource.cs"> <Link>Reactive/IEventPatternSource.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/IEventSource.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/IEventSource.cs"> <Link>Reactive/IEventSource.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/IObserver.Result.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/IObserver.Result.cs"> <Link>Reactive/IObserver.Result.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IGroupedObservable.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Linq/IGroupedObservable.cs"> <Link>Reactive/Linq/IGroupedObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservable.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Linq/IQbservable.cs"> <Link>Reactive/Linq/IQbservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservableProvider.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Linq/IQbservableProvider.cs"> <Link>Reactive/Linq/IQbservableProvider.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Subjects/IConnectableObservable.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Subjects/IConnectableObservable.cs"> <Link>Reactive/Subjects/IConnectableObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Subjects/ISubject.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Subjects/ISubject.cs"> <Link>Reactive/Subjects/ISubject.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Subjects/ISubject.Multi.cs'> + <Compile Include="../../../../System.Reactive.Interfaces/Reactive/Subjects/ISubject.Multi.cs"> <Link>Reactive/Subjects/ISubject.Multi.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Linq/ios_System.Reactive.Linq.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Linq/ios_System.Reactive.Linq.csproj index 121fc9a67b..1673e4abde 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Linq/ios_System.Reactive.Linq.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Linq/ios_System.Reactive.Linq.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{0a977063-0796-4cd4-84b8-aedb2d648b26}</ProjectGuid> + <ProjectGuid>{0A977063-0796-4CD4-84B8-AEDB2D648B26}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,11 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>System.Reactive.Linq</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -27,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> @@ -56,10 +52,10 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj"> <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> <Name>ios_System.Reactive.Core</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> </ProjectReference> @@ -71,529 +67,529 @@ --> </ItemGroup> <ItemGroup> - <EmbeddedResource Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Strings_Linq.resx'> - <Link>Strings_Linq.resx</Link> - </EmbeddedResource> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/GlobalSuppressions.cs'> + <Compile Include="../../../../System.Reactive.Linq/GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/NamespaceDocs.cs'> + <Compile Include="../../../../System.Reactive.Linq/NamespaceDocs.cs"> <Link>NamespaceDocs.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Concurrency/VirtualTimeScheduler.Extensions.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Concurrency/VirtualTimeScheduler.Extensions.cs"> <Link>Reactive/Concurrency/VirtualTimeScheduler.Extensions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/ConcatSink.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/ConcatSink.cs"> <Link>Reactive/Internal/ConcatSink.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/Constants.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/Constants.cs"> <Link>Reactive/Internal/Constants.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/Helpers.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/Helpers.cs"> <Link>Reactive/Internal/Helpers.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/IConcatenatable.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/IConcatenatable.cs"> <Link>Reactive/Internal/IConcatenatable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/IEvaluatableObservable.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/IEvaluatableObservable.cs"> <Link>Reactive/Internal/IEvaluatableObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/QueryServices.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/QueryServices.cs"> <Link>Reactive/Internal/QueryServices.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/ReflectionUtils.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/ReflectionUtils.cs"> <Link>Reactive/Internal/ReflectionUtils.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/HashSet.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/HashSet.cs"> <Link>Reactive/Internal/HashSet.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/Lookup.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/Lookup.cs"> <Link>Reactive/Internal/Lookup.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/LocalQueryMethodImplementationTypeAttribute.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/LocalQueryMethodImplementationTypeAttribute.cs"> <Link>Reactive/Linq/LocalQueryMethodImplementationTypeAttribute.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Case.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Case.cs"> <Link>Reactive/Linq/Observable/Case.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Collect.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Collect.cs"> <Link>Reactive/Linq/Observable/Collect.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/If.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/If.cs"> <Link>Reactive/Linq/Observable/If.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/For.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/For.cs"> <Link>Reactive/Linq/Observable/For.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/DoWhile.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/DoWhile.cs"> <Link>Reactive/Linq/Observable/DoWhile.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/While.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/While.cs"> <Link>Reactive/Linq/Observable/While.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/TakeLastBuffer.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/TakeLastBuffer.cs"> <Link>Reactive/Linq/Observable/TakeLastBuffer.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Next.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Next.cs"> <Link>Reactive/Linq/Observable/Next.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/MostRecent.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/MostRecent.cs"> <Link>Reactive/Linq/Observable/MostRecent.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Latest.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Latest.cs"> <Link>Reactive/Linq/Observable/Latest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/PushToPullAdapter.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/PushToPullAdapter.cs"> <Link>Reactive/Linq/Observable/PushToPullAdapter.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/RefCount.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/RefCount.cs"> <Link>Reactive/Linq/Observable/RefCount.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Multicast.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Multicast.cs"> <Link>Reactive/Linq/Observable/Multicast.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/GroupBy.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/GroupBy.cs"> <Link>Reactive/Linq/Observable/GroupBy.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable_.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable_.cs"> <Link>Reactive/Linq/Observable_.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage_.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage_.cs"> <Link>Reactive/Linq/QueryLanguage_.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Joins.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Joins.cs"> <Link>Reactive/Linq/QueryLanguage.Joins.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Multiple.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Multiple.cs"> <Link>Reactive/Linq/QueryLanguage.Multiple.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Single.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Single.cs"> <Link>Reactive/Linq/QueryLanguage.Single.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.StandardSequenceOperators.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.StandardSequenceOperators.cs"> <Link>Reactive/Linq/QueryLanguage.StandardSequenceOperators.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Time.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Time.cs"> <Link>Reactive/Linq/QueryLanguage.Time.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Async.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Async.cs"> <Link>Reactive/Linq/QueryLanguage.Async.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Awaiter.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Awaiter.cs"> <Link>Reactive/Linq/QueryLanguage.Awaiter.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Binding.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Binding.cs"> <Link>Reactive/Linq/QueryLanguage.Binding.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Blocking.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Blocking.cs"> <Link>Reactive/Linq/QueryLanguage.Blocking.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Concurrency.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Concurrency.cs"> <Link>Reactive/Linq/QueryLanguage.Concurrency.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Conversions.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Conversions.cs"> <Link>Reactive/Linq/QueryLanguage.Conversions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Creation.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Creation.cs"> <Link>Reactive/Linq/QueryLanguage.Creation.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Events.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Events.cs"> <Link>Reactive/Linq/QueryLanguage.Events.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Aggregates.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Aggregates.cs"> <Link>Reactive/Linq/QueryLanguage.Aggregates.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/QueryLanguage.Imperative.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/QueryLanguage.Imperative.cs"> <Link>Reactive/Linq/QueryLanguage.Imperative.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/IQueryLanguage.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/IQueryLanguage.cs"> <Link>Reactive/Linq/IQueryLanguage.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Imperative.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Imperative.cs"> <Link>Reactive/Linq/Observable.Imperative.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/EventPatternSourceBase.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/EventPatternSourceBase.cs"> <Link>Reactive/EventPatternSourceBase.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/EventPattern.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/EventPattern.cs"> <Link>Reactive/EventPattern.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/EventPatternSource.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/EventPatternSource.cs"> <Link>Reactive/EventPatternSource.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/EventSource.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/EventSource.cs"> <Link>Reactive/EventSource.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/InternalsVisibleTo.cs'> + <Compile Include="../../../../System.Reactive.Linq/InternalsVisibleTo.cs"> <Link>InternalsVisibleTo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Async.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Async.cs"> <Link>Reactive/Linq/Observable.Async.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Events.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Events.cs"> <Link>Reactive/Linq/Observable.Events.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../System.Reactive.Linq/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Concurrency/HistoricalScheduler.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Concurrency/HistoricalScheduler.cs"> <Link>Reactive/Concurrency/HistoricalScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Concurrency/VirtualTimeScheduler.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Concurrency/VirtualTimeScheduler.cs"> <Link>Reactive/Concurrency/VirtualTimeScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/AnonymousEnumerable.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/AnonymousEnumerable.cs"> <Link>Reactive/Internal/AnonymousEnumerable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/BinaryObserver.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/BinaryObserver.cs"> <Link>Reactive/Internal/BinaryObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/AddRef.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/AddRef.cs"> <Link>Reactive/Linq/Observable/AddRef.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Aggregate.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Aggregate.cs"> <Link>Reactive/Linq/Observable/Aggregate.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/All.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/All.cs"> <Link>Reactive/Linq/Observable/All.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Amb.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Amb.cs"> <Link>Reactive/Linq/Observable/Amb.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Any.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Any.cs"> <Link>Reactive/Linq/Observable/Any.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/AsObservable.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/AsObservable.cs"> <Link>Reactive/Linq/Observable/AsObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Average.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Average.cs"> <Link>Reactive/Linq/Observable/Average.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Buffer.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Buffer.cs"> <Link>Reactive/Linq/Observable/Buffer.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Catch.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Catch.cs"> <Link>Reactive/Linq/Observable/Catch.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Concat.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Concat.cs"> <Link>Reactive/Linq/Observable/Concat.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Contains.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Contains.cs"> <Link>Reactive/Linq/Observable/Contains.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Cast.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Cast.cs"> <Link>Reactive/Linq/Observable/Cast.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/CombineLatest.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/CombineLatest.cs"> <Link>Reactive/Linq/Observable/CombineLatest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/GetEnumerator.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/GetEnumerator.cs"> <Link>Reactive/Linq/Observable/GetEnumerator.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/GroupJoin.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/GroupJoin.cs"> <Link>Reactive/Linq/Observable/GroupJoin.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Join.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Join.cs"> <Link>Reactive/Linq/Observable/Join.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/SelectMany.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/SelectMany.cs"> <Link>Reactive/Linq/Observable/SelectMany.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Zip.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Zip.cs"> <Link>Reactive/Linq/Observable/Zip.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/OfType.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/OfType.cs"> <Link>Reactive/Linq/Observable/OfType.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Count.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Count.cs"> <Link>Reactive/Linq/Observable/Count.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/DefaultIfEmpty.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/DefaultIfEmpty.cs"> <Link>Reactive/Linq/Observable/DefaultIfEmpty.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Defer.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Defer.cs"> <Link>Reactive/Linq/Observable/Defer.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Delay.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Delay.cs"> <Link>Reactive/Linq/Observable/Delay.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/DelaySubscription.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/DelaySubscription.cs"> <Link>Reactive/Linq/Observable/DelaySubscription.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Dematerialize.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Dematerialize.cs"> <Link>Reactive/Linq/Observable/Dematerialize.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Distinct.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Distinct.cs"> <Link>Reactive/Linq/Observable/Distinct.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/DistinctUntilChanged.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/DistinctUntilChanged.cs"> <Link>Reactive/Linq/Observable/DistinctUntilChanged.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Do.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Do.cs"> <Link>Reactive/Linq/Observable/Do.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/ElementAt.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/ElementAt.cs"> <Link>Reactive/Linq/Observable/ElementAt.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Empty.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Empty.cs"> <Link>Reactive/Linq/Observable/Empty.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Finally.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Finally.cs"> <Link>Reactive/Linq/Observable/Finally.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/FirstAsync.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/FirstAsync.cs"> <Link>Reactive/Linq/Observable/FirstAsync.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/ForEach.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/ForEach.cs"> <Link>Reactive/Linq/Observable/ForEach.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/FromEvent.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/FromEvent.cs"> <Link>Reactive/Linq/Observable/FromEvent.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/FromEventPattern.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/FromEventPattern.cs"> <Link>Reactive/Linq/Observable/FromEventPattern.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Generate.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Generate.cs"> <Link>Reactive/Linq/Observable/Generate.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/GroupByUntil.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/GroupByUntil.cs"> <Link>Reactive/Linq/Observable/GroupByUntil.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/IgnoreElements.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/IgnoreElements.cs"> <Link>Reactive/Linq/Observable/IgnoreElements.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/IsEmpty.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/IsEmpty.cs"> <Link>Reactive/Linq/Observable/IsEmpty.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/LastAsync.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/LastAsync.cs"> <Link>Reactive/Linq/Observable/LastAsync.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/LongCount.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/LongCount.cs"> <Link>Reactive/Linq/Observable/LongCount.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Materialize.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Materialize.cs"> <Link>Reactive/Linq/Observable/Materialize.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Max.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Max.cs"> <Link>Reactive/Linq/Observable/Max.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/MaxBy.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/MaxBy.cs"> <Link>Reactive/Linq/Observable/MaxBy.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Merge.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Merge.cs"> <Link>Reactive/Linq/Observable/Merge.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Min.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Min.cs"> <Link>Reactive/Linq/Observable/Min.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/MinBy.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/MinBy.cs"> <Link>Reactive/Linq/Observable/MinBy.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Never.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Never.cs"> <Link>Reactive/Linq/Observable/Never.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/OnErrorResumeNext.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/OnErrorResumeNext.cs"> <Link>Reactive/Linq/Observable/OnErrorResumeNext.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Range.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Range.cs"> <Link>Reactive/Linq/Observable/Range.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Repeat.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Repeat.cs"> <Link>Reactive/Linq/Observable/Repeat.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Return.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Return.cs"> <Link>Reactive/Linq/Observable/Return.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Sample.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Sample.cs"> <Link>Reactive/Linq/Observable/Sample.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Scan.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Scan.cs"> <Link>Reactive/Linq/Observable/Scan.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Select.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Select.cs"> <Link>Reactive/Linq/Observable/Select.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/SequenceEqual.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/SequenceEqual.cs"> <Link>Reactive/Linq/Observable/SequenceEqual.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/SingleAsync.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/SingleAsync.cs"> <Link>Reactive/Linq/Observable/SingleAsync.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Skip.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Skip.cs"> <Link>Reactive/Linq/Observable/Skip.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/SkipLast.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/SkipLast.cs"> <Link>Reactive/Linq/Observable/SkipLast.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/SkipUntil.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/SkipUntil.cs"> <Link>Reactive/Linq/Observable/SkipUntil.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/SkipWhile.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/SkipWhile.cs"> <Link>Reactive/Linq/Observable/SkipWhile.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Sum.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Sum.cs"> <Link>Reactive/Linq/Observable/Sum.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Switch.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Switch.cs"> <Link>Reactive/Linq/Observable/Switch.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/TailRecursiveSink.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/TailRecursiveSink.cs"> <Link>Reactive/Internal/TailRecursiveSink.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Take.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Take.cs"> <Link>Reactive/Linq/Observable/Take.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/TakeLast.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/TakeLast.cs"> <Link>Reactive/Linq/Observable/TakeLast.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/TakeUntil.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/TakeUntil.cs"> <Link>Reactive/Linq/Observable/TakeUntil.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/TakeWhile.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/TakeWhile.cs"> <Link>Reactive/Linq/Observable/TakeWhile.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Throttle.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Throttle.cs"> <Link>Reactive/Linq/Observable/Throttle.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Throw.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Throw.cs"> <Link>Reactive/Linq/Observable/Throw.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/TimeInterval.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/TimeInterval.cs"> <Link>Reactive/Linq/Observable/TimeInterval.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Timeout.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Timeout.cs"> <Link>Reactive/Linq/Observable/Timeout.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Timer.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Timer.cs"> <Link>Reactive/Linq/Observable/Timer.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Timestamp.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Timestamp.cs"> <Link>Reactive/Linq/Observable/Timestamp.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/ToArray.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/ToArray.cs"> <Link>Reactive/Linq/Observable/ToArray.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/ToDictionary.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/ToDictionary.cs"> <Link>Reactive/Linq/Observable/ToDictionary.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/ToList.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/ToList.cs"> <Link>Reactive/Linq/Observable/ToList.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/ToLookup.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/ToLookup.cs"> <Link>Reactive/Linq/Observable/ToLookup.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/ToObservable.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/ToObservable.cs"> <Link>Reactive/Linq/Observable/ToObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Using.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Using.cs"> <Link>Reactive/Linq/Observable/Using.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Where.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Where.cs"> <Link>Reactive/Linq/Observable/Where.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/Window.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/Window.cs"> <Link>Reactive/Linq/Observable/Window.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable/_.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable/_.cs"> <Link>Reactive/Linq/Observable/_.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Subjects/ConnectableObservable.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Subjects/ConnectableObservable.cs"> <Link>Reactive/Subjects/ConnectableObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Subjects/Subject.Extensions.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Subjects/Subject.Extensions.cs"> <Link>Reactive/Subjects/Subject.Extensions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/Either.Generic.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/Either.Generic.cs"> <Link>Reactive/Internal/Either.Generic.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Subjects/AsyncSubject.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Subjects/AsyncSubject.cs"> <Link>Reactive/Subjects/AsyncSubject.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Subjects/BehaviorSubject.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Subjects/BehaviorSubject.cs"> <Link>Reactive/Subjects/BehaviorSubject.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Subjects/Subject.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Subjects/Subject.cs"> <Link>Reactive/Subjects/Subject.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/GroupedObservable.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/GroupedObservable.cs"> <Link>Reactive/Linq/GroupedObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Joins/ActivePlan.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Joins/ActivePlan.cs"> <Link>Reactive/Joins/ActivePlan.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Joins/JoinObserver.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Joins/JoinObserver.cs"> <Link>Reactive/Joins/JoinObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Joins/Pattern.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Joins/Pattern.cs"> <Link>Reactive/Joins/Pattern.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Joins/Plan.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Joins/Plan.cs"> <Link>Reactive/Joins/Plan.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Aggregates.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Aggregates.cs"> <Link>Reactive/Linq/Observable.Aggregates.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Awaiter.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Awaiter.cs"> <Link>Reactive/Linq/Observable.Awaiter.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Binding.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Binding.cs"> <Link>Reactive/Linq/Observable.Binding.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Blocking.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Blocking.cs"> <Link>Reactive/Linq/Observable.Blocking.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Concurrency.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Concurrency.cs"> <Link>Reactive/Linq/Observable.Concurrency.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Conversions.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Conversions.cs"> <Link>Reactive/Linq/Observable.Conversions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Creation.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Creation.cs"> <Link>Reactive/Linq/Observable.Creation.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Joins.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Joins.cs"> <Link>Reactive/Linq/Observable.Joins.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Multiple.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Multiple.cs"> <Link>Reactive/Linq/Observable.Multiple.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Single.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Single.cs"> <Link>Reactive/Linq/Observable.Single.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.StandardSequenceOperators.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.StandardSequenceOperators.cs"> <Link>Reactive/Linq/Observable.StandardSequenceOperators.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Linq/Observable.Time.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Linq/Observable.Time.cs"> <Link>Reactive/Linq/Observable.Time.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Internal/PushPullAdapter.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Internal/PushPullAdapter.cs"> <Link>Reactive/Internal/PushPullAdapter.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Subjects/ReplaySubject.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Subjects/ReplaySubject.cs"> <Link>Reactive/Subjects/ReplaySubject.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Threading/Tasks/NamespaceDoc.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Threading/Tasks/NamespaceDoc.cs"> <Link>Reactive/Threading/Tasks/NamespaceDoc.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Threading/Tasks/TaskObservableExtensions.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Threading/Tasks/TaskObservableExtensions.cs"> <Link>Reactive/Threading/Tasks/TaskObservableExtensions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/TimeInterval.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/TimeInterval.cs"> <Link>Reactive/TimeInterval.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Reactive/Timestamped.cs'> + <Compile Include="../../../../System.Reactive.Linq/Reactive/Timestamped.cs"> <Link>Reactive/Timestamped.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Strings_Linq.Generated.cs'> + <Compile Include="../../../../System.Reactive.Linq/Strings_Linq.Generated.cs"> <Link>Strings_Linq.Generated.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + <EmbeddedResource Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Linq/Strings_Linq.resx'> + <Link>Strings_Linq.resx</Link> + </EmbeddedResource> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.PlatformServices/ios_System.Reactive.PlatformServices.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.PlatformServices/ios_System.Reactive.PlatformServices.csproj index cbe36198fa..8502a7d282 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.PlatformServices/ios_System.Reactive.PlatformServices.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.PlatformServices/ios_System.Reactive.PlatformServices.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{79a43ceb-1a18-49ea-aac4-b72b9c90bf5a}</ProjectGuid> + <ProjectGuid>{79A43CEB-1A18-49EA-AAC4-B72B9C90BF5A}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,11 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>System.Reactive.PlatformServices</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -27,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> @@ -56,13 +52,13 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj"> <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> <Name>ios_System.Reactive.Core</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj"> <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> <Name>ios_System.Reactive.Linq</Name> </ProjectReference> @@ -74,73 +70,73 @@ --> </ItemGroup> <ItemGroup> - <EmbeddedResource Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Strings_PlatformServices.resx'> - <Link>Strings_PlatformServices.resx</Link> - </EmbeddedResource> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/GlobalSuppressions.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.Windows.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.Windows.cs"> <Link>Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.Windows.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Concurrency/EventLoopScheduler.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Concurrency/EventLoopScheduler.cs"> <Link>Reactive/Concurrency/EventLoopScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Concurrency/NewThreadScheduler.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Concurrency/NewThreadScheduler.cs"> <Link>Reactive/Concurrency/NewThreadScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.cs"> <Link>Reactive/Concurrency/ConcurrencyAbstractionLayerImpl.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Concurrency/Thread.Stub.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Concurrency/Thread.Stub.cs"> <Link>Reactive/Concurrency/Thread.Stub.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Concurrency/ThreadPoolScheduler.Windows.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Concurrency/ThreadPoolScheduler.Windows.cs"> <Link>Reactive/Concurrency/ThreadPoolScheduler.Windows.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/EnlightenmentProvider.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/EnlightenmentProvider.cs"> <Link>Reactive/EnlightenmentProvider.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Internal/HostLifecycleNotifications.WindowsPhone.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Internal/HostLifecycleNotifications.WindowsPhone.cs"> <Link>Reactive/Internal/HostLifecycleNotifications.WindowsPhone.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Internal/HostLifecycleNotifications.Windows.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Internal/HostLifecycleNotifications.Windows.cs"> <Link>Reactive/Internal/HostLifecycleNotifications.Windows.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Internal/PhoneShellThunks.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Internal/PhoneShellThunks.cs"> <Link>Reactive/Internal/PhoneShellThunks.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Internal/StopwatchImpl.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Internal/StopwatchImpl.cs"> <Link>Reactive/Internal/StopwatchImpl.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Concurrency/TaskPoolScheduler.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Concurrency/TaskPoolScheduler.cs"> <Link>Reactive/Concurrency/TaskPoolScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Concurrency/ThreadPoolScheduler.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Concurrency/ThreadPoolScheduler.cs"> <Link>Reactive/Concurrency/ThreadPoolScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Internal/ExceptionServicesImpl.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Internal/ExceptionServicesImpl.cs"> <Link>Reactive/Internal/ExceptionServicesImpl.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Internal/PlatformEnlightenmentProvider.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Internal/PlatformEnlightenmentProvider.cs"> <Link>Reactive/Internal/PlatformEnlightenmentProvider.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Reactive/Internal/Stubs.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Reactive/Internal/Stubs.cs"> <Link>Reactive/Internal/Stubs.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Strings_PlatformServices.Generated.cs'> + <Compile Include="../../../../System.Reactive.PlatformServices/Strings_PlatformServices.Generated.cs"> <Link>Strings_PlatformServices.Generated.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + <EmbeddedResource Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.PlatformServices/Strings_PlatformServices.resx'> + <Link>Strings_PlatformServices.resx</Link> + </EmbeddedResource> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Providers/ios_System.Reactive.Providers.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Providers/ios_System.Reactive.Providers.csproj index 853f896c8e..6cb0652b94 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Providers/ios_System.Reactive.Providers.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Providers/ios_System.Reactive.Providers.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{894021ec-14fb-430a-8572-bea9569ae435}</ProjectGuid> + <ProjectGuid>{894021EC-14FB-430A-8572-BEA9569AE435}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,11 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>System.Reactive.Providers</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -27,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> @@ -56,13 +52,13 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj"> <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> <Name>ios_System.Reactive.Core</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj"> <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> <Name>ios_System.Reactive.Linq</Name> </ProjectReference> @@ -74,52 +70,52 @@ --> </ItemGroup> <ItemGroup> - <EmbeddedResource Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Strings_Providers.resx'> - <Link>Strings_Providers.resx</Link> - </EmbeddedResource> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/GlobalSuppressions.cs'> + <Compile Include="../../../../System.Reactive.Providers/GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../System.Reactive.Providers/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Reactive/Internal/Constants.cs'> + <Compile Include="../../../../System.Reactive.Providers/Reactive/Internal/Constants.cs"> <Link>Reactive/Internal/Constants.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Reactive/Joins/QueryablePattern.cs'> + <Compile Include="../../../../System.Reactive.Providers/Reactive/Joins/QueryablePattern.cs"> <Link>Reactive/Joins/QueryablePattern.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Reactive/Joins/QueryablePlan.cs'> + <Compile Include="../../../../System.Reactive.Providers/Reactive/Joins/QueryablePlan.cs"> <Link>Reactive/Joins/QueryablePlan.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Reactive/Linq/ExpressionVisitor.cs'> + <Compile Include="../../../../System.Reactive.Providers/Reactive/Linq/ExpressionVisitor.cs"> <Link>Reactive/Linq/ExpressionVisitor.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Reactive/Linq/Observable.Queryable.cs'> + <Compile Include="../../../../System.Reactive.Providers/Reactive/Linq/Observable.Queryable.cs"> <Link>Reactive/Linq/Observable.Queryable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Reactive/Linq/Qbservable.cs'> + <Compile Include="../../../../System.Reactive.Providers/Reactive/Linq/Qbservable.cs"> <Link>Reactive/Linq/Qbservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Reactive/Linq/Qbservable.Generated.cs'> + <Compile Include="../../../../System.Reactive.Providers/Reactive/Linq/Qbservable.Generated.cs"> <Link>Reactive/Linq/Qbservable.Generated.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Reactive/Linq/Qbservable.Joins.cs'> + <Compile Include="../../../../System.Reactive.Providers/Reactive/Linq/Qbservable.Joins.cs"> <Link>Reactive/Linq/Qbservable.Joins.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Reactive/ObservableQuery.cs'> + <Compile Include="../../../../System.Reactive.Providers/Reactive/ObservableQuery.cs"> <Link>Reactive/ObservableQuery.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Strings_Providers.Generated.cs'> + <Compile Include="../../../../System.Reactive.Providers/Strings_Providers.Generated.cs"> <Link>Strings_Providers.Generated.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + <EmbeddedResource Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Providers/Strings_Providers.resx'> + <Link>Strings_Providers.resx</Link> + </EmbeddedResource> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Runtime.Remoting/ios_System.Reactive.Runtime.Remoting.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Runtime.Remoting/ios_System.Reactive.Runtime.Remoting.csproj index 88815c04ff..9007d07309 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Runtime.Remoting/ios_System.Reactive.Runtime.Remoting.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Runtime.Remoting/ios_System.Reactive.Runtime.Remoting.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{92857c8e-0e83-4d02-a831-8af3fed43336}</ProjectGuid> + <ProjectGuid>{92857C8E-0E83-4D02-A831-8AF3FED43336}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,11 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>System.Reactive.Runtime.Remoting</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -27,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> @@ -56,10 +52,10 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj"> <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> <Name>ios_System.Reactive.Core</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> </ProjectReference> @@ -71,25 +67,25 @@ --> </ItemGroup> <ItemGroup> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/GlobalSuppressions.cs'> + <Compile Include="../../../../System.Reactive.Runtime.Remoting/GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../System.Reactive.Runtime.Remoting/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/Reactive/Linq/Observable.Remoting.cs'> + <Compile Include="../../../../System.Reactive.Runtime.Remoting/Reactive/Linq/Observable.Remoting.cs"> <Link>Reactive/Linq/Observable.Remoting.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Runtime.Remoting/Reactive/Linq/QueryLanguage.Remoting.cs'> + <Compile Include="../../../../System.Reactive.Runtime.Remoting/Reactive/Linq/QueryLanguage.Remoting.cs"> <Link>Reactive/Linq/QueryLanguage.Remoting.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Windows.Forms/ios_System.Reactive.Windows.Forms.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Windows.Forms/ios_System.Reactive.Windows.Forms.csproj index d9c5295a04..50e6fdd850 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Windows.Forms/ios_System.Reactive.Windows.Forms.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Windows.Forms/ios_System.Reactive.Windows.Forms.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{912e14a2-7bdf-4600-8d55-e8c4f33a2063}</ProjectGuid> + <ProjectGuid>{912E14A2-7BDF-4600-8D55-E8C4F33A2063}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,11 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>System.Reactive.Windows.Forms</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -27,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> @@ -56,10 +52,10 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj"> <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> <Name>ios_System.Reactive.Core</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> </ProjectReference> @@ -71,25 +67,25 @@ --> </ItemGroup> <ItemGroup> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Forms/GlobalSuppressions.cs'> + <Compile Include="../../../../System.Reactive.Windows.Forms/GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Forms/Reactive/Linq/ControlObservable.cs'> + <Compile Include="../../../../System.Reactive.Windows.Forms/Reactive/Linq/ControlObservable.cs"> <Link>Reactive/Linq/ControlObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Forms/Reactive/Concurrency/ControlScheduler.cs'> + <Compile Include="../../../../System.Reactive.Windows.Forms/Reactive/Concurrency/ControlScheduler.cs"> <Link>Reactive/Concurrency/ControlScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Forms/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../System.Reactive.Windows.Forms/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Windows.Threading/ios_System.Reactive.Windows.Threading.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Windows.Threading/ios_System.Reactive.Windows.Threading.csproj index 20c789b330..476ecc49da 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Windows.Threading/ios_System.Reactive.Windows.Threading.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/System.Reactive.Windows.Threading/ios_System.Reactive.Windows.Threading.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{0f6c2933-8d0c-41e6-9f77-e8714ab8c4ab}</ProjectGuid> + <ProjectGuid>{0F6C2933-8D0C-41E6-9F77-E8714AB8C4AB}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,11 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>System.Reactive.Windows.Threading</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - <SignAssembly>True</SignAssembly> - <DelaySign>True</DelaySign> - <AssemblyOriginatorKeyFile>../../../reactive.pub</AssemblyOriginatorKeyFile> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -27,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> @@ -56,10 +52,10 @@ </ItemGroup> <ItemGroup> - <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj"> <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> <Name>ios_System.Reactive.Core</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> </ProjectReference> @@ -71,40 +67,40 @@ --> </ItemGroup> <ItemGroup> - <EmbeddedResource Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Strings_WindowsThreading.resx'> - <Link>Strings_WindowsThreading.resx</Link> - </EmbeddedResource> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/GlobalSuppressions.cs'> + <Compile Include="../../../../System.Reactive.Windows.Threading/GlobalSuppressions.cs"> <Link>GlobalSuppressions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Concurrency/CoreDispatcherScheduler.cs'> + <Compile Include="../../../../System.Reactive.Windows.Threading/Reactive/Concurrency/CoreDispatcherScheduler.cs"> <Link>Reactive/Concurrency/CoreDispatcherScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Internal/Constants.cs'> + <Compile Include="../../../../System.Reactive.Windows.Threading/Reactive/Internal/Constants.cs"> <Link>Reactive/Internal/Constants.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Linq/CoreDispatcherObservable.cs'> + <Compile Include="../../../../System.Reactive.Windows.Threading/Reactive/Linq/CoreDispatcherObservable.cs"> <Link>Reactive/Linq/CoreDispatcherObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Linq/DispatcherObservable.cs'> + <Compile Include="../../../../System.Reactive.Windows.Threading/Reactive/Linq/DispatcherObservable.cs"> <Link>Reactive/Linq/DispatcherObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Reactive/Concurrency/DispatcherScheduler.cs'> + <Compile Include="../../../../System.Reactive.Windows.Threading/Reactive/Concurrency/DispatcherScheduler.cs"> <Link>Reactive/Concurrency/DispatcherScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../System.Reactive.Windows.Threading/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Strings_WindowsThreading.Generated.cs'> + <Compile Include="../../../../System.Reactive.Windows.Threading/Strings_WindowsThreading.Generated.cs"> <Link>Strings_WindowsThreading.Generated.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + <EmbeddedResource Include='../../../../../../../../../external/rx/Rx/NET/Source/System.Reactive.Windows.Threading/Strings_WindowsThreading.resx'> + <Link>Strings_WindowsThreading.resx</Link> + </EmbeddedResource> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> diff --git a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/Tests.System.Reactive/ios_Tests.System.Reactive.csproj b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/Tests.System.Reactive/ios_Tests.System.Reactive.csproj index ad3418c6a9..8af048ea36 100644 --- a/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/Tests.System.Reactive/ios_Tests.System.Reactive.csproj +++ b/external/rx/Rx/NET/Source/Rx_Xamarin/iOS/rx/Tests.System.Reactive/ios_Tests.System.Reactive.csproj @@ -5,7 +5,7 @@ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <ProductVersion>10.0.0</ProductVersion> <SchemaVersion>2.0</SchemaVersion> - <ProjectGuid>{45377009-1425-47fc-985e-05f98022f9e3}</ProjectGuid> + <ProjectGuid>{45377009-1425-47FC-985E-05F98022F9E3}</ProjectGuid> <ProjectTypeGuids>{6BC8ED88-2882-458C-8E55-DFD12B67127B};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> @@ -13,8 +13,7 @@ <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix> <AssemblyName>Tests.System.Reactive</AssemblyName> <ProductSignAssembly>true</ProductSignAssembly> - <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;NUNIT;SIGNED</DefineConstants> - + <DefineConstants>NO_TASK_DELAY;NO_WINDOWS_THREADING;NO_REMOTING;NO_REFLECTION_EMIT;HAS_AWAIT;NUNIT;$(SignAssemblySpec)</DefineConstants> <additionalargs>-delaySign</additionalargs> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -24,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> @@ -53,34 +52,37 @@ <Reference Include='MonoTouch.NUnitLite' /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\Mono.Reactive.Testing\ios_Mono.Reactive.Testing.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <ProjectReference Include="..\Mono.Reactive.Testing\ios_Mono.Reactive.Testing.csproj"> <Project>{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}</Project> <Name>ios_Mono.Reactive.Testing</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Core\ios_System.Reactive.Core.csproj"> <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project> <Name>ios_System.Reactive.Core</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\ios_System.Reactive.Experimental.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Experimental\ios_System.Reactive.Experimental.csproj"> <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project> <Name>ios_System.Reactive.Experimental</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Interfaces\ios_System.Reactive.Interfaces.csproj"> <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project> <Name>ios_System.Reactive.Interfaces</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\ios_System.Reactive.PlatformServices.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Observable.Aliases\ios_System.Reactive.Observable.Aliases.csproj"> + <Project>{9ffac385-10a4-4ddd-b800-de67e8469cc0}</Project> + <Name>ios_System.Reactive.Observable.Aliases</Name> +</ProjectReference><ProjectReference Include="..\System.Reactive.PlatformServices\ios_System.Reactive.PlatformServices.csproj"> <Project>{0CCCF009-763F-40D2-8655-7A94828023BF}</Project> <Name>ios_System.Reactive.PlatformServices</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Providers\ios_System.Reactive.Providers.csproj" Condition=" '$(BuildFlavor)' != 'SILVERLIGHTM7' And '$(BuildPlatform)' != 'XNA' " xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Providers\ios_System.Reactive.Providers.csproj" Condition=" '$(BuildFlavor)' != 'SILVERLIGHTM7' And '$(BuildPlatform)' != 'XNA' "> <Project>{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}</Project> <Name>ios_System.Reactive.Providers</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Linq\ios_System.Reactive.Linq.csproj"> <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project> <Name>ios_System.Reactive.Linq</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Runtime.Remoting\ios_System.Reactive.Runtime.Remoting.csproj" Condition=" '$(BuildPlatform)' != 'WINDOWS_PHONE' And '$(BuildTarget)' != 'WP7' " xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Runtime.Remoting\ios_System.Reactive.Runtime.Remoting.csproj" Condition=" '$(BuildPlatform)' != 'WINDOWS_PHONE' And '$(BuildTarget)' != 'WP7' "> <Project>{7A6EF49E-7946-4101-9C89-407B9C53A173}</Project> <Name>ios_System.Reactive.Runtime.Remoting</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Windows.Forms\ios_System.Reactive.Windows.Forms.csproj" Condition=" '$(BuildPlatform)' == 'DESKTOPCLR' " xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Windows.Forms\ios_System.Reactive.Windows.Forms.csproj" Condition=" '$(BuildPlatform)' == 'DESKTOPCLR' "> <Project>{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}</Project> <Name>ios_System.Reactive.Windows.Forms</Name> -</ProjectReference><ProjectReference Include="..\System.Reactive.Windows.Threading\ios_System.Reactive.Windows.Threading.csproj" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +</ProjectReference><ProjectReference Include="..\System.Reactive.Windows.Threading\ios_System.Reactive.Windows.Threading.csproj"> <Project>{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}</Project> <Name>ios_System.Reactive.Windows.Threading</Name> </ProjectReference> @@ -92,262 +94,271 @@ --> </ItemGroup> <ItemGroup> - - <!-- - <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> - <Link>ColdObservable.cs</Link> - </Compile> - --> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/App.cs'> + <Compile Include="../../../../Tests.System.Reactive/App.cs"> <Link>App.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/DispatcherHelpers.cs'> + <Compile Include="../../../../Tests.System.Reactive/DispatcherHelpers.cs"> <Link>DispatcherHelpers.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Semaphore.cs'> + <Compile Include="../../../../Tests.System.Reactive/Semaphore.cs"> <Link>Semaphore.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Disposables/Composite.cs'> + <Compile Include="../../../../Tests.System.Reactive/Stress/Core/Disposables/Composite.cs"> <Link>Stress/Core/Disposables/Composite.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Disposables/Serial.cs'> + <Compile Include="../../../../Tests.System.Reactive/Stress/Core/Disposables/Serial.cs"> <Link>Stress/Core/Disposables/Serial.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Disposables/SingleAssignment.cs'> + <Compile Include="../../../../Tests.System.Reactive/Stress/Core/Schedulers/EventLoop.cs"> + <Link>Stress/Core/Schedulers/EventLoop.cs</Link> + </Compile> + <Compile Include="../../../../Tests.System.Reactive/Stress/Core/Disposables/SingleAssignment.cs"> <Link>Stress/Core/Disposables/SingleAssignment.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Core/Disposables/RefCount.cs'> + <Compile Include="../../../../Tests.System.Reactive/Stress/Core/Disposables/RefCount.cs"> <Link>Stress/Core/Disposables/RefCount.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Linq/Delay.cs'> + <Compile Include="../../../../Tests.System.Reactive/Stress/Linq/Delay.cs"> <Link>Stress/Linq/Delay.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Linq/FromEvent.cs'> + <Compile Include="../../../../Tests.System.Reactive/Stress/Linq/FromEvent.cs"> <Link>Stress/Linq/FromEvent.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Helpers.cs'> + <Compile Include="../../../../Tests.System.Reactive/Stress/Helpers.cs"> <Link>Stress/Helpers.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Stress/Linq/Replay.cs'> + <Compile Include="../../../../Tests.System.Reactive/Stress/Linq/Replay.cs"> <Link>Stress/Linq/Replay.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/TestBase.cs'> + <Compile Include="../../../../Tests.System.Reactive/TestBase.cs"> <Link>TestBase.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/TestLongRunningScheduler.cs'> + <Compile Include="../../../../Tests.System.Reactive/TestLongRunningScheduler.cs"> <Link>TestLongRunningScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/AnonymousTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Aliases.cs"> + <Link>Tests/Aliases.cs</Link> + </Compile> + <Compile Include="../../../../Tests.System.Reactive/Tests/AnonymousTest.cs"> <Link>Tests/AnonymousTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ConcurrencyTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/ConcurrencyTest.cs"> <Link>Tests/Concurrency/ConcurrencyTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ScheduledItemTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/ScheduledItemTest.cs"> <Link>Tests/Concurrency/ScheduledItemTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/StopwatchTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/StopwatchTest.cs"> <Link>Tests/Concurrency/StopwatchTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/SynchronizationTest.cs"> <Link>Tests/Concurrency/SynchronizationTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/ConnectableObservable.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/ConnectableObservable.cs"> <Link>Tests/ConnectableObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/ConnectableObservableTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/ConnectableObservableTest.cs"> <Link>Tests/ConnectableObservableTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/AsyncLockTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/AsyncLockTest.cs"> <Link>Tests/Concurrency/AsyncLockTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ControlSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/ControlSchedulerTest.cs"> <Link>Tests/Concurrency/ControlSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/CurrentThreadSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/CurrentThreadSchedulerTest.cs"> <Link>Tests/Concurrency/CurrentThreadSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/DefaultSchedulerTest.cs"> <Link>Tests/Concurrency/DefaultSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/EventLoopSchedulerTest.cs"> <Link>Tests/Concurrency/EventLoopSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/HistoricalSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/HistoricalSchedulerTest.cs"> <Link>Tests/Concurrency/HistoricalSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/ImmediateSchedulerTest.cs"> <Link>Tests/Concurrency/ImmediateSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/NewThreadSchedulerTest.cs"> <Link>Tests/Concurrency/NewThreadSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/SchedulerTest.cs"> <Link>Tests/Concurrency/SchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/SynchronizationContextSchedulerTest.cs"> <Link>Tests/Concurrency/SynchronizationContextSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/TaskPoolSchedulerTest.cs"> <Link>Tests/Concurrency/TaskPoolSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/ThreadPoolSchedulerTest.cs"> <Link>Tests/Concurrency/ThreadPoolSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Concurrency/VirtualSchedulerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Concurrency/VirtualSchedulerTest.cs"> <Link>Tests/Concurrency/VirtualSchedulerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Disposables/DisposableTests.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Disposables/DisposableTests.cs"> <Link>Tests/Disposables/DisposableTests.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAggregateTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableAggregateTest.cs"> <Link>Tests/Linq/ObservableAggregateTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAsyncTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableAsyncTest.cs"> <Link>Tests/Linq/ObservableAsyncTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableAwaiterTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableAwaiterTest.cs"> <Link>Tests/Linq/ObservableAwaiterTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBindingTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableBindingTest.cs"> <Link>Tests/Linq/ObservableBindingTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableBlockingTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableBlockingTest.cs"> <Link>Tests/Linq/ObservableBlockingTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableConversionTests.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableConversionTests.cs"> <Link>Tests/Linq/ObservableConversionTests.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableCreationTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableCreationTest.cs"> <Link>Tests/Linq/ObservableCreationTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableEventsTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableEventsTest.cs"> <Link>Tests/Linq/ObservableEventsTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableExtensionsTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableExtensionsTest.cs"> <Link>Tests/Linq/ObservableExtensionsTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableImperativeTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableExTest.cs"> + <Link>Tests/Linq/ObservableExTest.cs</Link> + </Compile> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableImperativeTest.cs"> <Link>Tests/Linq/ObservableImperativeTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableJoinsTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableJoinsTest.cs"> <Link>Tests/Linq/ObservableJoinsTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableMultipleTest.cs"> <Link>Tests/Linq/ObservableMultipleTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableRemotingTest.cs"> <Link>Tests/Linq/ObservableRemotingTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableSafetyTest.cs"> <Link>Tests/Linq/ObservableSafetyTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableSingleTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableSingleTest.cs"> <Link>Tests/Linq/ObservableSingleTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableStandardQueryOperatorTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableStandardQueryOperatorTest.cs"> <Link>Tests/Linq/ObservableStandardQueryOperatorTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/ObservableTimeTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/ObservableTimeTest.cs"> <Link>Tests/Linq/ObservableTimeTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableExTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/QbservableExTest.cs"> <Link>Tests/Linq/QbservableExTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/QbservableTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/QbservableTest.cs"> <Link>Tests/Linq/QbservableTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/Subjects/AsyncSubjectTest.cs"> <Link>Tests/Linq/Subjects/AsyncSubjectTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/BehaviorSubjectTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/Subjects/BehaviorSubjectTest.cs"> <Link>Tests/Linq/Subjects/BehaviorSubjectTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/Subjects/ReplaySubjectTest.cs"> <Link>Tests/Linq/Subjects/ReplaySubjectTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/Linq/Subjects/SubjectTest.cs"> <Link>Tests/Linq/Subjects/SubjectTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/MySubject.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/MySubject.cs"> <Link>Tests/MySubject.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/RogueEnumerable.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/RogueEnumerable.cs"> <Link>Tests/RogueEnumerable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/SystemClockTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/SystemClockTest.cs"> <Link>Tests/SystemClockTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/DefaultConcurrencyAbstractionLayerTest.cs"> <Link>Tests/DefaultConcurrencyAbstractionLayerTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/EventPatternSourceBaseTest.cs"> <Link>Tests/EventPatternSourceBaseTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/NotificationTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/NotificationTest.cs"> <Link>Tests/NotificationTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/TaskObservableExtensionsTest.cs"> <Link>Tests/TaskObservableExtensionsTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/TimeTests.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/TimeTests.cs"> <Link>Tests/TimeTests.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/UnitTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/UnitTest.cs"> <Link>Tests/UnitTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyDisposable.cs'> + <Compile Include="../../../../Tests.System.Reactive/Dummies/DummyDisposable.cs"> <Link>Dummies/DummyDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyEnumerable.cs'> + <Compile Include="../../../../Tests.System.Reactive/Dummies/DummyEnumerable.cs"> <Link>Dummies/DummyEnumerable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyFunc.cs'> + <Compile Include="../../../../Tests.System.Reactive/Dummies/DummyFunc.cs"> <Link>Dummies/DummyFunc.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyObservable.cs'> + <Compile Include="../../../../Tests.System.Reactive/Dummies/DummyObservable.cs"> <Link>Dummies/DummyObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyObserver.cs'> + <Compile Include="../../../../Tests.System.Reactive/Dummies/DummyObserver.cs"> <Link>Dummies/DummyObserver.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Dummies/DummyScheduler.cs'> + <Compile Include="../../../../Tests.System.Reactive/Dummies/DummyScheduler.cs"> <Link>Dummies/DummyScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Extensions.cs'> + <Compile Include="../../../../Tests.System.Reactive/Extensions.cs"> <Link>Extensions.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/MockDisposable.cs'> + <Compile Include="../../../../Tests.System.Reactive/MockDisposable.cs"> <Link>MockDisposable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/MockEnumerable.cs'> + <Compile Include="../../../../Tests.System.Reactive/MockEnumerable.cs"> <Link>MockEnumerable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/NullErrorObservable.cs'> + <Compile Include="../../../../Tests.System.Reactive/NullErrorObservable.cs"> <Link>NullErrorObservable.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Properties/AssemblyInfo.cs'> + <Compile Include="../../../../Tests.System.Reactive/Properties/AssemblyInfo.cs"> <Link>Properties/AssemblyInfo.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/ListObservableTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/ListObservableTest.cs"> <Link>Tests/ListObservableTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/ObserverTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/ObserverTest.cs"> <Link>Tests/ObserverTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/PrivateTypesTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/PrivateTypesTest.cs"> <Link>Tests/PrivateTypesTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Tests/RegressionTest.cs'> + <Compile Include="../../../../Tests.System.Reactive/Tests/RegressionTest.cs"> <Link>Tests/RegressionTest.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/TestTaskScheduler.cs'> + <Compile Include="../../../../Tests.System.Reactive/TestTaskScheduler.cs"> <Link>TestTaskScheduler.cs</Link> </Compile> - <Compile Include='../../../../../../../../../external/rx/Rx/NET/Source/Tests.System.Reactive/Utils.cs'> + <Compile Include="../../../../Tests.System.Reactive/Utils.cs"> <Link>Utils.cs</Link> </Compile> + <!-- + <Compile Include="..\..\..\Microsoft.Reactive.Testing\ColdObservable.cs"> + <Link>ColdObservable.cs</Link> + </Compile> + --> + </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> |
