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/System.Reactive.Interfaces | |
| 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/System.Reactive.Interfaces')
6 files changed, 17 insertions, 12 deletions
diff --git a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/IObservable.cs b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/IObservable.cs index f1b62d278c..ae67bc792e 100644 --- a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/IObservable.cs +++ b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/IObservable.cs @@ -18,4 +18,7 @@ namespace System IDisposable Subscribe(IObserver<T> observer); } } -#endif
\ No newline at end of file +#elif !WINDOWSPHONE7 // TypeForwardedTo is not presen on windows phone 7 so we can't really target +[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IObservable<>))] +#endif + diff --git a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/IObserver.cs b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/IObserver.cs index 6ed6c58d22..e157410c3b 100644 --- a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/IObserver.cs +++ b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/IObserver.cs @@ -30,4 +30,6 @@ namespace System void OnCompleted(); } } +#elif !WINDOWSPHONE7 // TypeForwardedTo is not presen on windows phone 7 so we can't really target +[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.IObserver<>))] #endif
\ No newline at end of file diff --git a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Properties/AssemblyInfo.cs b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Properties/AssemblyInfo.cs index fd916faf19..0cbc40b15b 100644 --- a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Properties/AssemblyInfo.cs +++ b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Properties/AssemblyInfo.cs @@ -27,13 +27,11 @@ using System.Security; [assembly: AllowPartiallyTrustedCallers] #endif -#if XBOX_LAKEVIEW -[assembly: SecurityTransparent] -#endif +// =========================================================================== +// DO NOT EDIT OR REMOVE ANYTHING BELOW THIS COMMENT. +// Version numbers are automatically generated in the msbuild files based on regular expressions +// =========================================================================== -// -// Starting with v2.0 RC, we're bumping this file's version number, -// because MSI wouldn't pick it up as an update otherwise... -// -//[assembly: AssemblyVersion("2.0.0.0")] -//[assembly: AssemblyFileVersion("2.0.0.0")] +[assembly: AssemblyVersion("2.2.0.0")] +[assembly: AssemblyFileVersion("2.2.0.0")] +[assembly: AssemblyInformationalVersion("2.2.0.0")] diff --git a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservable.cs b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservable.cs index 3d0b610073..1244b9fdf7 100644 --- a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservable.cs +++ b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservable.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. #if !NO_EXPRESSIONS using System.Linq.Expressions; diff --git a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservableProvider.cs b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservableProvider.cs index 767a6a452b..2b7d39fa24 100644 --- a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservableProvider.cs +++ b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/Reactive/Linq/IQbservableProvider.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. +// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information. #if !NO_EXPRESSIONS using System.Linq.Expressions; diff --git a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj index 02851a7c55..86efc2fcc7 100644 --- a/external/rx/Rx/NET/Source/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj +++ b/external/rx/Rx/NET/Source/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj @@ -12,6 +12,7 @@ <FileAlignment>512</FileAlignment> <ProductSignAssembly>true</ProductSignAssembly> <CodeAnalysisRuleSet>..\Rx.ruleset</CodeAnalysisRuleSet> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseXBLV|AnyCPU'"> <OutputPath>bin\ReleaseXBLV\</OutputPath> @@ -57,4 +58,5 @@ </ItemGroup> <ItemGroup /> <Import Project="..\Import.targets" /> + <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> </Project>
\ No newline at end of file |