Skip to content

Commit a35e8e7

Browse files
glennawatsonglennawatson
authored
housekeeping: Update dependencies to latest versions. XamForms, Android, DynamicData, Splat (#1839)
* housekeeping: Update to use latest splat and dynamicdata. * Update dependencies to latest versions
1 parent f3e7e95 commit a35e8e7

File tree

10 files changed

+29
-28
lines changed

10 files changed

+29
-28
lines changed

‎src/Directory.build.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
</ItemGroup>
2727

2828
<ItemGroup>
29-
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="all" />
29+
<PackageReference Include="Nerdbank.GitVersioning" Version="2.2.33" PrivateAssets="all" />
3030
</ItemGroup>
3131

3232
<ItemGroup Condition="$(IsTestProject)">
33-
<PackageReference Include="xunit" Version="2.4.0" />
34-
<PackageReference Include="xunit.runner.console" Version="2.4.0" />
35-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
36-
<PackageReference Include="Xunit.StaFact" Version="0.2.17" />
33+
<PackageReference Include="xunit" Version="2.4.1" />
34+
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
35+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
36+
<PackageReference Include="Xunit.StaFact" Version="0.3.5" />
3737
</ItemGroup>
3838

3939
<ItemGroup Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false'">

‎src/EventBuilder/Cecil/PathSearchAssemblyResolver.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace EventBuilder.Cecil
1414
/// Assembly resolver.
1515
/// </summary>
1616
/// <seealso cref="Mono.Cecil.IAssemblyResolver" />
17-
public class PathSearchAssemblyResolver : IAssemblyResolver
17+
public sealed class PathSearchAssemblyResolver : IAssemblyResolver
1818
{
1919
private readonly string[] _targetAssemblyDirs;
2020

@@ -27,6 +27,11 @@ public PathSearchAssemblyResolver(string[] targetAssemblyDirs)
2727
_targetAssemblyDirs = targetAssemblyDirs;
2828
}
2929

30+
/// <inheritdoc />
31+
public void Dispose()
32+
{
33+
}
34+
3035
/// <summary>
3136
/// Resolves the specified full assembly name.
3237
/// </summary>

‎src/EventBuilder/EventBuilder.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="CommandLineParser" Version="1.9.71" />
21-
<PackageReference Include="Microsoft.Web.Xdt" Version="2.1.1" />
22-
<PackageReference Include="Mono.Cecil" Version="0.9.6.1" />
23-
<PackageReference Include="Nustache" Version="1.15.3.7" />
24-
<PackageReference Include="Polly" Version="3.0.0" />
25-
<PackageReference Include="Serilog" Version="1.5.14" />
21+
<PackageReference Include="Microsoft.Web.Xdt" Version="2.1.2" />
22+
<PackageReference Include="Mono.Cecil" Version="0.10.1" />
23+
<PackageReference Include="Nustache" Version="1.16.0.8" />
24+
<PackageReference Include="Polly" Version="6.1.1" />
25+
<PackageReference Include="Serilog" Version="2.7.1" />
26+
<PackageReference Include="Serilog.Settings.AppSettings" Version="2.2.2" />
2627
<PackageReference Include="NuGet.Core" Version="2.14.0" />
2728
</ItemGroup>
2829
</Project>

‎src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="DynamicData" Version="6.4.0.2419" />
13-
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="26.1.0.1" />
14-
<PackageReference Include="Xamarin.Android.Support.v4" Version="26.1.0.1" />
15-
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="26.1.0.1" />
16-
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="26.1.0.1" />
17-
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="26.1.0.1" />
12+
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="26.1.*" />
13+
<PackageReference Include="Xamarin.Android.Support.v4" Version="26.1.*" />
14+
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="26.1.*" />
15+
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="26.1.*" />
16+
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="26.1.*" />
1817
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
19-
<PackageReference Include="System.Reactive" Version="4.0.0" />
20-
<PackageReference Include="Splat" Version="4.0.2" />
2118
<Reference Include="System.Runtime.Serialization" />
2219
</ItemGroup>
2320

‎src/ReactiveUI.Blend/ReactiveUI.Blend.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
<ItemGroup>
1212
<Compile Remove="Platforms\**\*.cs" />
1313
<None Include="Platforms\**\*.cs" />
14-
<PackageReference Include="System.Reactive" Version="4.0.0" />
15-
<PackageReference Include="Splat" Version="4.0.2" />
1614
</ItemGroup>
1715

1816
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎src/ReactiveUI.Events.XamForms/ReactiveUI.Events.XamForms.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
18+
<PackageReference Include="Xamarin.Forms" Version="3.3.*" />
1919
<Compile Include="Events_XAMFORMS.cs" />
2020
</ItemGroup>
2121
</Project>

‎src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Fody" Version="3.0.3" PrivateAssets="None" />
16-
<PackageReference Include="FodyPackaging" Version="3.0.3" PrivateAssets="All" />
15+
<PackageReference Include="Fody" Version="3.2.17" PrivateAssets="None" />
16+
<PackageReference Include="FodyPackaging" Version="3.2.17" PrivateAssets="All" />
1717
<PackageReference Include="System.Reactive" Version="4.0.0" />
1818
</ItemGroup>
1919

‎src/ReactiveUI.Fody/ReactiveUI.Fody.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="FodyHelpers" Version="3.0.3" />
11+
<PackageReference Include="FodyHelpers" Version="3.2.17" />
1212
</ItemGroup>
1313
</Project>

‎src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Xamarin.Forms" Version="3.0.0.561731" />
9+
<PackageReference Include="Xamarin.Forms" Version="3.3.*" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎src/ReactiveUI/ReactiveUI.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
<None Include="Platforms\**\*.cs" />
1313
<PackageReference Include="System.Reactive" Version="4.0.0" />
1414
<PackageReference Include="System.Reactive.Compatibility" Version="4.0.0" />
15-
<PackageReference Include="Splat" Version="4.0.2" />
16-
<PackageReference Include="DynamicData" Version="6.4.0.2419" />
15+
<PackageReference Include="Splat" Version="5.0.2" />
16+
<PackageReference Include="DynamicData" Version="6.7.0.2529" />
1717
</ItemGroup>
1818

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

0 commit comments

Comments
 (0)