Skip to content

housekeeping: Update dependencies to latest versions. XamForms, Android, DynamicData, Splat #1839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 16, 2018
Merged

housekeeping: Update dependencies to latest versions. XamForms, Android, DynamicData, Splat #1839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33e5397
housekeeping: Update to use latest splat and dynamicdata.
glennawatson Nov 16, 2018
0d39a5f
Update dependencies to latest versions
Nov 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Directory.build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="2.2.33" PrivateAssets="all" />
</ItemGroup>

<ItemGroup Condition="$(IsTestProject)">
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.console" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="Xunit.StaFact" Version="0.2.17" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="Xunit.StaFact" Version="0.3.5" />
</ItemGroup>

<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false'">
Expand Down
7 changes: 6 additions & 1 deletion src/EventBuilder/Cecil/PathSearchAssemblyResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace EventBuilder.Cecil
/// Assembly resolver.
/// </summary>
/// <seealso cref="Mono.Cecil.IAssemblyResolver" />
public class PathSearchAssemblyResolver : IAssemblyResolver
public sealed class PathSearchAssemblyResolver : IAssemblyResolver
{
private readonly string[] _targetAssemblyDirs;

Expand All @@ -27,6 +27,11 @@ public PathSearchAssemblyResolver(string[] targetAssemblyDirs)
_targetAssemblyDirs = targetAssemblyDirs;
}

/// <inheritdoc />
public void Dispose()
{
}

/// <summary>
/// Resolves the specified full assembly name.
/// </summary>
Expand Down
11 changes: 6 additions & 5 deletions src/EventBuilder/EventBuilder.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@

<ItemGroup>
<PackageReference Include="CommandLineParser" Version="1.9.71" />
<PackageReference Include="Microsoft.Web.Xdt" Version="2.1.1" />
<PackageReference Include="Mono.Cecil" Version="0.9.6.1" />
<PackageReference Include="Nustache" Version="1.15.3.7" />
<PackageReference Include="Polly" Version="3.0.0" />
<PackageReference Include="Serilog" Version="1.5.14" />
<PackageReference Include="Microsoft.Web.Xdt" Version="2.1.2" />
<PackageReference Include="Mono.Cecil" Version="0.10.1" />
<PackageReference Include="Nustache" Version="1.16.0.8" />
<PackageReference Include="Polly" Version="6.1.1" />
<PackageReference Include="Serilog" Version="2.7.1" />
<PackageReference Include="Serilog.Settings.AppSettings" Version="2.2.2" />
<PackageReference Include="NuGet.Core" Version="2.14.0" />
</ItemGroup>
</Project>
13 changes: 5 additions & 8 deletions src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="DynamicData" Version="6.4.0.2419" />
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="26.1.0.1" />
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="26.1.*" />
<PackageReference Include="Xamarin.Android.Support.v4" Version="26.1.*" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="26.1.*" />
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="26.1.*" />
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="26.1.*" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
<PackageReference Include="Splat" Version="4.0.2" />
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>

Expand Down
2 changes: 0 additions & 2 deletions src/ReactiveUI.Blend/ReactiveUI.Blend.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<ItemGroup>
<Compile Remove="Platforms\**\*.cs" />
<None Include="Platforms\**\*.cs" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
<PackageReference Include="Splat" Version="4.0.2" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Events.XamForms/ReactiveUI.Events.XamForms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
<PackageReference Include="Xamarin.Forms" Version="3.3.*" />
<Compile Include="Events_XAMFORMS.cs" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Fody" Version="3.0.3" PrivateAssets="None" />
<PackageReference Include="FodyPackaging" Version="3.0.3" PrivateAssets="All" />
<PackageReference Include="Fody" Version="3.2.17" PrivateAssets="None" />
<PackageReference Include="FodyPackaging" Version="3.2.17" PrivateAssets="All" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Fody/ReactiveUI.Fody.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FodyHelpers" Version="3.0.3" />
<PackageReference Include="FodyHelpers" Version="3.2.17" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
<PackageReference Include="Xamarin.Forms" Version="3.3.*" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI/ReactiveUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<None Include="Platforms\**\*.cs" />
<PackageReference Include="System.Reactive" Version="4.0.0" />
<PackageReference Include="System.Reactive.Compatibility" Version="4.0.0" />
<PackageReference Include="Splat" Version="4.0.2" />
<PackageReference Include="DynamicData" Version="6.4.0.2419" />
<PackageReference Include="Splat" Version="5.0.2" />
<PackageReference Include="DynamicData" Version="6.7.0.2529" />
</ItemGroup>

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