Skip to content
Permalink
Browse files

Housekeeping: Update System.Reactive from 4.1.6 to 4.2.0 (#2204)

  • Loading branch information...
glennawatson committed Oct 11, 2019
1 parent e3ef2a8 commit c661691c875070552dc9281c36bb2c3fabb54d4d
@@ -48,7 +48,7 @@
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Xunit.StaFact" Version="0.3.18" />
<PackageReference Include="Shouldly" Version="4.0.0-beta0002" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.6" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.2.0" />
<PackageReference Include="PublicApiGenerator" Version="9.3.0" />
</ItemGroup>

@@ -15,18 +15,9 @@
<PackageReference Include="Pharmacist.Common" Version="1.*" />
</ItemGroup>

<Choose>
<When Condition=" $(TargetFramework.StartsWith('netcoreapp3.0')) ">
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.2.0-preview.625" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.1.6" />
</ItemGroup>
</Otherwise>
</Choose>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.2.0" />
</ItemGroup>

<ItemGroup>
<Compile Include="Events_WPF.cs" />
@@ -15,18 +15,9 @@
<PackageReference Include="Pharmacist.Common" Version="1.*" />
</ItemGroup>

<Choose>
<When Condition=" $(TargetFramework.StartsWith('netcoreapp3.0')) ">
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.2.0-preview.625" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.1.6" />
</ItemGroup>
</Otherwise>
</Choose>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.2.0" />
</ItemGroup>

<ItemGroup>
<Compile Include="Events_Winforms.cs" />
@@ -13,7 +13,7 @@
<Compile Remove="*.cs" />
<None Include="*.cs" />
<PackageReference Include="Pharmacist.Common" Version="1.*" />
<PackageReference Include="System.Reactive" Version="4.1.6" />
<PackageReference Include="System.Reactive" Version="4.2.0" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('uap')) ">
@@ -18,7 +18,7 @@
<ItemGroup>
<PackageReference Include="Fody" Version="6.0.0" PrivateAssets="None" />
<PackageReference Include="FodyPackaging" Version="6.0.0" PrivateAssets="All" />
<PackageReference Include="System.Reactive" Version="4.1.6" />
<PackageReference Include="System.Reactive" Version="4.2.0" />
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
@@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.6" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.2.0" />
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
</ItemGroup>

@@ -8,6 +8,7 @@

<ItemGroup>
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.2.0" />
</ItemGroup>

<ItemGroup>
@@ -27,7 +28,6 @@
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.2.0-preview.625" />
<ProjectReference Include="..\ReactiveUI.Winforms\ReactiveUI.Winforms.csproj" />
<ProjectReference Include="..\ReactiveUI.Wpf\ReactiveUI.Wpf.csproj" />
<Compile Include="Platforms\common-gui\**\*.cs" />
@@ -39,8 +39,6 @@
</When>
<When Condition=" $(TargetFramework.StartsWith('net4'))">
<ItemGroup>
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.6" />

<ProjectReference Include="..\ReactiveUI.Winforms\ReactiveUI.Winforms.csproj" />
<ProjectReference Include="..\ReactiveUI.Wpf\ReactiveUI.Wpf.csproj" />
<ProjectReference Include="..\ReactiveUI.Blend\ReactiveUI.Blend.csproj" />
@@ -59,10 +57,5 @@
<Compile Include="Platforms\windows-xaml\**\*.cs" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="Microsoft.Reactive.Testing" Version="4.1.6" />
</ItemGroup>
</Otherwise>
</Choose>
</Project>
@@ -19,18 +19,9 @@
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<Choose>
<When Condition=" $(TargetFramework.StartsWith('netcoreapp3.0')) ">
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.2.0-preview.625" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.1.6" />
</ItemGroup>
</Otherwise>
</Choose>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.2.0" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
<Reference Include="System.Windows.Forms" />
</ItemGroup>
@@ -17,18 +17,9 @@
<PackageReference Include="Splat.Drawing" Version="9.*" />
</ItemGroup>

<Choose>
<When Condition=" $(TargetFramework.StartsWith('netcoreapp3.0')) ">
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.2.0-preview.625" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.1.6" />
</ItemGroup>
</Otherwise>
</Choose>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="4.2.0" />
</ItemGroup>
<ItemGroup>
<Compile Remove="..\ReactiveUI\Platforms\windows-common\BindingTypeConverters.cs" />
</ItemGroup>
@@ -14,7 +14,7 @@
<None Include="Platforms\**\*.cs" />
<PackageReference Include="Splat" Version="9.*" />
<PackageReference Include="DynamicData" Version="6.*" />
<PackageReference Include="System.Reactive" Version="4.1.6" />
<PackageReference Include="System.Reactive" Version="4.2.0" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">

0 comments on commit c661691

Please sign in to comment.
You can’t perform that action at this time.