diff options
Diffstat (limited to 'external/rx/Rx/NET/Source/System.Reactive.Experimental')
4 files changed, 15 insertions, 10 deletions
diff --git a/external/rx/Rx/NET/Source/System.Reactive.Experimental/InternalsVisibleTo.cs b/external/rx/Rx/NET/Source/System.Reactive.Experimental/InternalsVisibleTo.cs index 85f6f9a5a9..2c27e316af 100644 --- a/external/rx/Rx/NET/Source/System.Reactive.Experimental/InternalsVisibleTo.cs +++ b/external/rx/Rx/NET/Source/System.Reactive.Experimental/InternalsVisibleTo.cs @@ -4,7 +4,9 @@ using System; #if SIGNED -#if SIGNENHANCED // Key 272 for .NET 4.5 and beyond +#if MONODROID || MONOTOUCH +[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.Reactive.Debugger, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")] +#elif SIGNENHANCED // Key 272 for .NET 4.5 and beyond [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.Reactive.Debugger, PublicKey=002400000c80000014010000060200000024000052534131000800000100010085aad0bef0688d1b994a0d78e1fd29fc24ac34ed3d3ac3fb9b3d0c48386ba834aa880035060a8848b2d8adf58e670ed20914be3681a891c9c8c01eef2ab22872547c39be00af0e6c72485d7cfd1a51df8947d36ceba9989106b58abe79e6a3e71a01ed6bdc867012883e0b1a4d35b1b5eeed6df21e401bb0c22f2246ccb69979dc9e61eef262832ed0f2064853725a75485fa8a3efb7e027319c86dec03dc3b1bca2b5081bab52a627b9917450dfad534799e1c7af58683bdfa135f1518ff1ea60e90d7b993a6c87fd3dd93408e35d1296f9a7f9a97c5db56c0f3cc25ad11e9777f94d138b3cea53b9a8331c2e6dcb8d2ea94e18bf1163ff112a22dbd92d429a")] #else // Key 35 for older platforms [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("System.Reactive.Debugger, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] diff --git a/external/rx/Rx/NET/Source/System.Reactive.Experimental/Properties/AssemblyInfo.cs b/external/rx/Rx/NET/Source/System.Reactive.Experimental/Properties/AssemblyInfo.cs index 1cd88577fd..c391996126 100644 --- a/external/rx/Rx/NET/Source/System.Reactive.Experimental/Properties/AssemblyInfo.cs +++ b/external/rx/Rx/NET/Source/System.Reactive.Experimental/Properties/AssemblyInfo.cs @@ -28,11 +28,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 +// =========================================================================== -// -// Note: Assembly (file) version numbers get inserted by the build system on the fly. Inspect the Team Build workflows -// and the custom activity in Build/Source/Activities/AppendVersionInfo.cs for more information. -// +[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.Experimental/Reactive/Linq/QbservableEx.Generated.cs b/external/rx/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/QbservableEx.Generated.cs index 4903e30ad8..2bda1671dd 100644 --- a/external/rx/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/QbservableEx.Generated.cs +++ b/external/rx/Rx/NET/Source/System.Reactive.Experimental/Reactive/Linq/QbservableEx.Generated.cs @@ -1,5 +1,6 @@ -/* - * WARNING: Auto-generated file (8/5/2012 1:55:31 PM) +/* + * WARNING: Auto-generated file (11/21/2013 11:07:25 AM) + * Run Rx's auto-homoiconizer tool to generate this file (in the HomoIcon directory). */ #pragma warning disable 1591 diff --git a/external/rx/Rx/NET/Source/System.Reactive.Experimental/System.Reactive.Experimental.csproj b/external/rx/Rx/NET/Source/System.Reactive.Experimental/System.Reactive.Experimental.csproj index b860492c62..2c80a0d33f 100644 --- a/external/rx/Rx/NET/Source/System.Reactive.Experimental/System.Reactive.Experimental.csproj +++ b/external/rx/Rx/NET/Source/System.Reactive.Experimental/System.Reactive.Experimental.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> @@ -56,4 +57,5 @@ </ProjectReference> </ItemGroup> <Import Project="..\Import.targets" /> + <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> </Project>
\ No newline at end of file |