Permalink
Browse files

Update to Rx 2.0 RC

  • Loading branch information...
1 parent 0446e04 commit 3442c4658ced7ef1ed078f324a58c37dcc6f04ba @panesofglass committed Jun 27, 2012
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <legacyUnhandledExceptionPolicy enabled="true" />
+ </runtime>
+</configuration>
@@ -0,0 +1,231 @@
+<!--
+***********************************************************************************************
+Microsoft.FSharp.targets
+
+WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+ created a backup copy. Incorrect changes to this file will make it
+ impossible to load or build your projects from the command-line or the IDE.
+
+This file defines the steps in the standard build process specific for F# .NET projects.
+For example, it contains the step that actually calls the F# compiler. The remainder
+of the build process is defined in Microsoft.Common.targets, which is imported by
+this file.
+
+Copyright (C) Microsoft Corporation. All rights reserved.
+***********************************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <UsingTask TaskName="Fsc" AssemblyFile="FSharp.Build.dll"/>
+ <UsingTask TaskName="CreateFSharpManifestResourceName" AssemblyFile="FSharp.Build.dll"/>
+
+ <PropertyGroup>
+ <ImportByWildcardBeforeMicrosoftFSharpTargets Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == ''">true</ImportByWildcardBeforeMicrosoftFSharpTargets>
+ <ImportByWildcardAfterMicrosoftFSharpTargets Condition="'$(ImportByWildcardAfterMicrosoftFSharpTargets)' == ''">true</ImportByWildcardAfterMicrosoftFSharpTargets>
+ </PropertyGroup>
+
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportBefore\*" Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportBefore')"/>
+
+ <PropertyGroup>
+ <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+ <DefaultLanguageSourceExtension>.fs</DefaultLanguageSourceExtension>
+ <Language>F#</Language>
+ <Tailcalls Condition="'$(Tailcalls)'==''">$(Optimize)</Tailcalls>
+ </PropertyGroup>
+
+ <!--
+ The CreateManifestResourceNames target create the manifest resource names from the .RESX
+ files.
+
+ [IN]
+ @(EmbeddedResource) - The list of EmbeddedResource items that have been pre-processed to add metadata about resource type
+ Expected Metadata "Type" can either be "Resx" or "Non-Resx"
+
+ [OUT]
+ @(EmbeddedResource) - EmbeddedResource items with metadata
+
+ For F# applications the transformation is like:
+
+ Resources1.resx => Resources1 => Build into main assembly
+ SubFolder\Resources1.resx => SubFolder.Resources1 => Build into main assembly
+ Resources1.fr.resx => Resources1.fr => Build into satellite assembly
+ Resources1.notaculture.resx => Resources1.notaculture => Build into main assembly
+
+ For other project systems, this transformation may be different.
+ -->
+ <PropertyGroup>
+ <CreateManifestResourceNamesDependsOn></CreateManifestResourceNamesDependsOn>
+ </PropertyGroup>
+ <Target
+ Name="CreateManifestResourceNames"
+ Condition="'@(EmbeddedResource)' != ''"
+ DependsOnTargets="$(CreateManifestResourceNamesDependsOn)"
+ >
+
+ <ItemGroup>
+ <_Temporary Remove="@(_Temporary)" />
+ </ItemGroup>
+
+ <!-- Create manifest names for culture and non-culture Resx files, and for non-culture Non-Resx resources -->
+ <CreateFSharpManifestResourceName
+ ResourceFiles="@(EmbeddedResource)"
+ RootNamespace="$(RootNamespace)"
+ Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and ('%(EmbeddedResource.WithCulture)' == 'false' or '%(EmbeddedResource.Type)' == 'Resx')">
+
+ <Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_Temporary" />
+
+ </CreateFSharpManifestResourceName>
+
+ <!-- Create manifest names for all culture non-resx resources -->
+ <CreateFSharpManifestResourceName
+ ResourceFiles="@(EmbeddedResource)"
+ RootNamespace="$(RootNamespace)"
+ PrependCultureAsDirectory="false"
+ Condition="'%(EmbeddedResource.ManifestResourceName)' == '' and '%(EmbeddedResource.WithCulture)' == 'true' and '%(EmbeddedResource.Type)' == 'Non-Resx'">
+
+ <Output TaskParameter="ResourceFilesWithManifestResourceNames" ItemName="_Temporary" />
+
+ </CreateFSharpManifestResourceName>
+
+ <ItemGroup>
+ <EmbeddedResource Remove="@(EmbeddedResource)" Condition="'%(EmbeddedResource.ManifestResourceName)' == ''"/>
+ <EmbeddedResource Include="@(_Temporary)" />
+ <_Temporary Remove="@(_Temporary)" />
+ </ItemGroup>
+ </Target>
+
+ <ItemGroup>
+ <DocFileItem Include="$(DocumentationFile)" Condition="'$(DocumentationFile)'!=''"/>
+ </ItemGroup>
+
+ <ItemGroup Condition="'$(_DebugSymbolsProduced)' == 'true' and '$(PdbFile)' != ''">
+ <_DebugSymbolsIntermediatePathTemporary Include="$(PdbFile)"/>
+ <!-- Add any missing .pdb extension, as the compiler does -->
+ <_DebugSymbolsIntermediatePath Include="@(_DebugSymbolsIntermediatePathTemporary->'%(RootDir)%(Directory)%(Filename).pdb')"/>
+ </ItemGroup>
+
+ <PropertyGroup>
+ <CoreCompileDependsOn>_ComputeNonExistentFileProperty</CoreCompileDependsOn>
+ </PropertyGroup>
+
+ <Target
+ Name="CoreCompile"
+ Inputs="$(MSBuildAllProjects);
+ @(CompileBefore);
+ @(Compile);
+ @(CompileAfter);
+ @(_CoreCompileResourceInputs);
+ $(ApplicationIcon);
+ $(AssemblyOriginatorKeyFile);
+ @(ReferencePath);
+ @(CompiledLicenseFile);
+ @(EmbeddedDocumentation);
+ $(Win32Resource);
+ $(Win32Manifest);
+ @(CustomAdditionalCompileInputs);
+ $(VersionFile);
+ $(KeyOriginatorFile)"
+ Outputs="@(DocFileItem);
+ @(IntermediateAssembly);
+ @(_DebugSymbolsIntermediatePath);
+ $(NonExistentFile);
+ @(CustomAdditionalCompileOutputs)"
+ Returns=""
+ DependsOnTargets="$(CoreCompileDependsOn)"
+ >
+
+ <Error
+ Condition="'$(SilverlightVersion)' != '' and !(Exists('$(ProgramFiles)\Microsoft F#\Silverlight\Libraries\Client\$(SilverlightVersion)\FSharp.Core.dll'))"
+ Text="F# runtime for Silverlight version $(SilverlightVersion) is not installed. Please go to http://go.microsoft.com/fwlink/?LinkId=177463 to download and install matching F# runtime"
+ />
+
+ <Warning
+ Condition="'$(Win32ResourceFile)' != '' "
+ Text="The property &lt;Win32ResourceFile> has been renamed to &lt;Win32Resource>. Update your project file to ensure that the correct value is passed via the --win32res option to the F# compiler."
+ />
+
+ <!-- Condition is to filter out the _CoreCompileResourceInputs so that it doesn't pass in culture resources to the compiler -->
+ <Fsc Condition=" '%(_CoreCompileResourceInputs.WithCulture)' != 'true' "
+ BaseAddress="$(BaseAddress)"
+ CodePage="$(CodePage)"
+ DebugSymbols="$(DebugSymbols)"
+ DebugType="$(DebugType)"
+ DefineConstants="$(DefineConstants)"
+ DisabledWarnings="$(NoWarn)"
+ DocumentationFile="$(DocumentationFile)"
+ GenerateInterfaceFile="$(GenerateInterfaceFile)"
+ KeyFile="$(KeyOriginatorFile)"
+ LCID="$(LCID)"
+ NoFramework="true"
+ Optimize="$(Optimize)"
+ OtherFlags="$(OtherFlags)"
+ OutputAssembly="@(IntermediateAssembly)"
+ PdbFile="$(PdbFile)"
+ Platform="$(PlatformTarget)"
+ References="@(ReferencePath)"
+ ReferencePath="$(ReferencePath)"
+ Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile);@(AdditionalEmbeddedResource)"
+ Sources="@(CompileBefore);@(Compile);@(CompileAfter)"
+ Tailcalls="$(Tailcalls)"
+ TargetType="$(OutputType)"
+ ToolExe="$(FscToolExe)"
+ ToolPath="$(FscToolPath)"
+ TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
+ Utf8Output="$(Utf8Output)"
+ VersionFile="$(VersionFile)"
+ VisualStudioStyleErrors="$(VisualStudioStyleErrors)"
+ WarningLevel="$(WarningLevel)"
+ WarningsAsErrors="$(WarningsAsErrors)"
+ Win32ManifestFile="$(Win32Manifest)"
+ Win32ResourceFile="$(Win32Resource)"
+ />
+
+ <ItemGroup>
+ <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
+ </ItemGroup>
+
+ </Target>
+
+
+ <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets"/>
+
+ <!--
+ ============================================================
+ GenerateTargetFrameworkMonikerAttribute
+
+ Emit the target framework moniker attribute as a code fragment into a temporary source file for the compiler.
+
+ ============================================================
+ -->
+
+ <Target Name="GenerateTargetFrameworkMonikerAttribute" BeforeTargets="BeforeCompile" DependsOnTargets="PrepareForBuild;GetReferenceAssemblyPaths" Inputs="$(MSBuildThisFileFullPath)" Outputs="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(GenerateTargetFrameworkAttribute)' == 'true'">
+
+ <PropertyGroup>
+ <!-- This attribute is only available in mscorlib v4 and later -->
+ <AdditionalSourcesText Condition="'$(TargetFrameworkMoniker)' != '' and '$(TargetingClr2Framework)' != 'true'">
+ $(AdditionalSourcesText)
+ namespace Microsoft.BuildSettings
+ [&lt;System.Runtime.Versioning.TargetFrameworkAttribute(&quot;$(TargetFrameworkMoniker)&quot;, FrameworkDisplayName=&quot;$(TargetFrameworkMonikerDisplayName)&quot;)&gt;]
+ do ()
+ </AdditionalSourcesText>
+ </PropertyGroup>
+
+ <!-- This is a file shared between projects so we have to take care to handle simultaneous writes (by ContinueOnError)
+ and a race between clean from one project and build from another (by not adding to FilesWritten so it doesn't clean) -->
+ <WriteLinesToFile
+ File="$(TargetFrameworkMonikerAssemblyAttributesPath)"
+ Lines="$(AdditionalSourcesText)"
+ Condition="'$(AdditionalSourcesText)' != ''"
+ ContinueOnError="true"
+ Overwrite="true"/>
+
+ <ItemGroup>
+ <CompileBefore Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" Condition="'$(AdditionalSourcesText)' != ''"/>
+ </ItemGroup>
+
+ </Target>
+
+ <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportAfter\*" Condition="'$(ImportByWildcardAfterMicrosoftFSharpTargets)' == 'true' and exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\$(MSBuildThisFile)\ImportAfter')"/>
+
+</Project>
@@ -9,9 +9,9 @@
<OutputType>Library</OutputType>
<RootNamespace>FSharp.Reactive</RootNamespace>
<AssemblyName>FSharp.Reactive</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<Name>FSharp.Reactive</Name>
- <FscToolPath>..\lib\FSharp\Net45</FscToolPath>
+ <FscToolPath>..\lib\FSharp</FscToolPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<TargetFrameworkProfile />
@@ -34,7 +34,7 @@
<WarningLevel>3</WarningLevel>
<DocumentationFile>bin\Release\FSharp.Reactive.XML</DocumentationFile>
</PropertyGroup>
- <Import Project="..\lib\FSharp\Net45\Microsoft.FSharp.Targets" />
+ <Import Project="..\lib\FSharp\Microsoft.FSharp.Targets" />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<ItemGroup>
<Compile Include="Observable.fs" />
@@ -46,22 +46,22 @@
<Reference Include="System.Core" />
<Reference Include="System.Numerics" />
<Reference Include="FSharp.Core">
- <HintPath>..\lib\FSharp\Net45\FSharp.Core.dll</HintPath>
+ <HintPath>..\lib\FSharp\FSharp.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Core">
- <HintPath>..\packages\Rx-Core.2.0.20304-beta\lib\Net45\System.Reactive.Core.dll</HintPath>
+ <HintPath>..\packages\Rx-Core.2.0.20622-rc\lib\Net40\System.Reactive.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Interfaces">
- <HintPath>..\packages\Rx-Interfaces.2.0.20304-beta\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
+ <HintPath>..\packages\Rx-Interfaces.2.0.20622-rc\lib\Net40\System.Reactive.Interfaces.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.Linq">
- <HintPath>..\packages\Rx-Linq.2.0.20304-beta\lib\Net45\System.Reactive.Linq.dll</HintPath>
+ <HintPath>..\packages\Rx-Linq.2.0.20622-rc\lib\Net40\System.Reactive.Linq.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Reactive.PlatformServices">
- <HintPath>..\packages\Rx-PlatformServices.2.0.20304-beta\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
+ <HintPath>..\packages\Rx-PlatformServices.2.0.20622-rc\lib\Net40\System.Reactive.PlatformServices.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
View
@@ -99,7 +99,7 @@ module Observable =
Observable.Where(source, Func<_,_> f)
/// Skips n elements
- let skip n source = Observable.Skip(source, n)
+ let skip (n: int) source = Observable.Skip(source, n)
/// Skips elements while the predicate is satisfied
let skipWhile f source = Observable.SkipWhile(source, Func<_,_> f)
@@ -108,7 +108,7 @@ module Observable =
let count source = Observable.Count(source)
/// Takes n elements
- let take n source = Observable.Take(source, n)
+ let take (n: int) source = Observable.Take(source, n)
/// Determines whether the given observable is empty
let isEmpty source = source = Observable.Empty()
View
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Rx-Core" version="2.0.20304-beta" />
- <package id="Rx-Interfaces" version="2.0.20304-beta" />
- <package id="Rx-Linq" version="2.0.20304-beta" />
- <package id="Rx-Main" version="2.0.20304-beta" />
- <package id="Rx-PlatformServices" version="2.0.20304-beta" />
+ <package id="Rx-Core" version="2.0.20622-rc" />
+ <package id="Rx-Interfaces" version="2.0.20622-rc" />
+ <package id="Rx-Linq" version="2.0.20622-rc" />
+ <package id="Rx-Main" version="2.0.20622-rc" />
+ <package id="Rx-PlatformServices" version="2.0.20622-rc" />
</packages>
@@ -9,10 +9,10 @@
<OutputType>Library</OutputType>
<RootNamespace>FSharp.Reactive.Tests</RootNamespace>
<AssemblyName>FSharp.Reactive.Tests</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<Name>FSharp.Reactive.Tests</Name>
<TargetFrameworkProfile />
- <FscToolPath>..\lib\FSharp\Net45</FscToolPath>
+ <FscToolPath>..\lib\FSharp</FscToolPath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
@@ -40,40 +40,36 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <Reference Include="Microsoft.Reactive.Testing, Version=1.0.10621.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
- <Private>True</Private>
+ <Reference Include="FSharp.Core">
+ <HintPath>..\lib\FSharp\FSharp.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Reactive.Testing">
+ <HintPath>..\packages\Rx-Testing.2.0.20622-rc\lib\Net40-Full\Microsoft.Reactive.Testing.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
+ <HintPath>c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\ReferenceAssemblies\v2.0\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<Reference Include="mscorlib" />
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Numerics" />
<Reference Include="NaturalSpec">
<HintPath>..\packages\NaturalSpec.1.4.2.1\lib\NaturalSpec.dll</HintPath>
- <Private>True</Private>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="FSharp.Core">
- <HintPath>..\lib\FSharp\Net45\FSharp.Core.dll</HintPath>
</Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Numerics" />
<Reference Include="System.Reactive.Core">
- <HintPath>..\packages\Rx-Core.2.0.20304-beta\lib\Net45\System.Reactive.Core.dll</HintPath>
- <Private>True</Private>
+ <HintPath>..\packages\Rx-Core.2.0.20622-rc\lib\Net40\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces">
- <HintPath>..\packages\Rx-Interfaces.2.0.20304-beta\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
- <Private>True</Private>
+ <HintPath>..\packages\Rx-Interfaces.2.0.20622-rc\lib\Net40\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq">
- <HintPath>..\packages\Rx-Linq.2.0.20304-beta\lib\Net45\System.Reactive.Linq.dll</HintPath>
- <Private>True</Private>
+ <HintPath>..\packages\Rx-Linq.2.0.20622-rc\lib\Net40\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.PlatformServices">
- <HintPath>..\packages\Rx-PlatformServices.2.0.20304-beta\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
- <Private>True</Private>
+ <HintPath>..\packages\Rx-PlatformServices.2.0.20622-rc\lib\Net40\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Oops, something went wrong.

0 comments on commit 3442c46

Please sign in to comment.