From 33e539786d25b8fe301a7242415b7b5afa2b3e4d Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Thu, 15 Nov 2018 16:59:03 -0800 Subject: [PATCH 1/2] housekeeping: Update to use latest splat and dynamicdata. --- src/ReactiveUI/ReactiveUI.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ReactiveUI/ReactiveUI.csproj b/src/ReactiveUI/ReactiveUI.csproj index 0fd49e37b8..3969a75dea 100644 --- a/src/ReactiveUI/ReactiveUI.csproj +++ b/src/ReactiveUI/ReactiveUI.csproj @@ -12,8 +12,8 @@ - - + + From 0d39a5f302f056b720d3648f5204b30664255652 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Thu, 15 Nov 2018 17:51:53 -0800 Subject: [PATCH 2/2] Update dependencies to latest versions --- src/Directory.build.props | 10 +++++----- .../Cecil/PathSearchAssemblyResolver.cs | 7 ++++++- src/EventBuilder/EventBuilder.csproj | 11 ++++++----- .../ReactiveUI.AndroidSupport.csproj | 13 +++++-------- src/ReactiveUI.Blend/ReactiveUI.Blend.csproj | 2 -- .../ReactiveUI.Events.XamForms.csproj | 2 +- .../ReactiveUI.Fody.Helpers.csproj | 4 ++-- src/ReactiveUI.Fody/ReactiveUI.Fody.csproj | 2 +- src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj | 2 +- 9 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/Directory.build.props b/src/Directory.build.props index 042df33c11..254d3a1fca 100644 --- a/src/Directory.build.props +++ b/src/Directory.build.props @@ -26,14 +26,14 @@ - + - - - - + + + + diff --git a/src/EventBuilder/Cecil/PathSearchAssemblyResolver.cs b/src/EventBuilder/Cecil/PathSearchAssemblyResolver.cs index 9a18680e73..9e07987558 100644 --- a/src/EventBuilder/Cecil/PathSearchAssemblyResolver.cs +++ b/src/EventBuilder/Cecil/PathSearchAssemblyResolver.cs @@ -14,7 +14,7 @@ namespace EventBuilder.Cecil /// Assembly resolver. /// /// - public class PathSearchAssemblyResolver : IAssemblyResolver + public sealed class PathSearchAssemblyResolver : IAssemblyResolver { private readonly string[] _targetAssemblyDirs; @@ -27,6 +27,11 @@ public PathSearchAssemblyResolver(string[] targetAssemblyDirs) _targetAssemblyDirs = targetAssemblyDirs; } + /// + public void Dispose() + { + } + /// /// Resolves the specified full assembly name. /// diff --git a/src/EventBuilder/EventBuilder.csproj b/src/EventBuilder/EventBuilder.csproj index 7ec1ffa494..40f7ed2ac5 100644 --- a/src/EventBuilder/EventBuilder.csproj +++ b/src/EventBuilder/EventBuilder.csproj @@ -18,11 +18,12 @@ - - - - - + + + + + + \ No newline at end of file diff --git a/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj b/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj index 301cd15058..0c1512b080 100644 --- a/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj +++ b/src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj @@ -9,15 +9,12 @@ - - - - - - + + + + + - - diff --git a/src/ReactiveUI.Blend/ReactiveUI.Blend.csproj b/src/ReactiveUI.Blend/ReactiveUI.Blend.csproj index b5d1a2f327..d38e95f7c2 100644 --- a/src/ReactiveUI.Blend/ReactiveUI.Blend.csproj +++ b/src/ReactiveUI.Blend/ReactiveUI.Blend.csproj @@ -11,8 +11,6 @@ - - diff --git a/src/ReactiveUI.Events.XamForms/ReactiveUI.Events.XamForms.csproj b/src/ReactiveUI.Events.XamForms/ReactiveUI.Events.XamForms.csproj index 97609dd8c6..d1d2dc8bbb 100644 --- a/src/ReactiveUI.Events.XamForms/ReactiveUI.Events.XamForms.csproj +++ b/src/ReactiveUI.Events.XamForms/ReactiveUI.Events.XamForms.csproj @@ -15,7 +15,7 @@ - + \ No newline at end of file diff --git a/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj b/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj index 18f6e32a8a..6c10c17709 100644 --- a/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj +++ b/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/ReactiveUI.Fody/ReactiveUI.Fody.csproj b/src/ReactiveUI.Fody/ReactiveUI.Fody.csproj index 816b50063f..4e16fba561 100644 --- a/src/ReactiveUI.Fody/ReactiveUI.Fody.csproj +++ b/src/ReactiveUI.Fody/ReactiveUI.Fody.csproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj b/src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj index 2d07d13731..03d045c8fa 100644 --- a/src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj +++ b/src/ReactiveUI.XamForms/ReactiveUI.XamForms.csproj @@ -6,7 +6,7 @@ - +