Skip to content

Commit

Permalink
Merge pull request #2 from JamesTryand/master
Browse files Browse the repository at this point in the history
updated the Rx packages to use the latest stable version
  • Loading branch information
anaisbetts committed Feb 28, 2015
2 parents 2d760c3 + 52639eb commit f2cf9f4
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
16 changes: 8 additions & 8 deletions LinqToAwait/LinqToAwait.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Reactive.Core, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Core.2.0.20304-beta\lib\Net45\System.Reactive.Core.dll</HintPath>
<Reference Include="System.Reactive.Core">
<HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Interfaces, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Interfaces.2.0.20304-beta\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
<Reference Include="System.Reactive.Interfaces">
<HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.Linq, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-Linq.2.0.20304-beta\lib\Net45\System.Reactive.Linq.dll</HintPath>
<Reference Include="System.Reactive.Linq">
<HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Reactive.PlatformServices, Version=2.0.20304.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Rx-PlatformServices.2.0.20304-beta\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
<Reference Include="System.Reactive.PlatformServices">
<HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
4 changes: 2 additions & 2 deletions LinqToAwait/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.8.0.0")]
[assembly: AssemblyFileVersion("0.8.0.0")]
[assembly: AssemblyVersion("0.9.0.0")]
[assembly: AssemblyFileVersion("0.9.0.0")]
10 changes: 5 additions & 5 deletions LinqToAwait/packages.config
Original file line number Diff line number Diff line change
@@ -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.2.5" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
<package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
<package id="Rx-Main" version="2.2.5" targetFramework="net45" />
<package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions NuGet/LinqToAwait.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>LinqToAwait</id>
<version>0.8.1-beta</version>
<version>0.9.1-beta</version>
<authors>Paul Betts</authors>
<owners>Paul Betts</owners>
<projectUrl>http://xpaulbettsx.github.com/LinqToAwait</projectUrl>
Expand All @@ -12,7 +12,7 @@
<tags>LINQ Rx await async</tags>

<dependencies>
<dependency id="Rx-Main" version="[2.0.20304-beta]" />
<dependency id="Rx-Main" version="[2.2.5]" />
</dependencies>
</metadata>
</package>

0 comments on commit f2cf9f4

Please sign in to comment.