From afd660d2aa2b17f26557fdc5d426c7ec89fd99e6 Mon Sep 17 00:00:00 2001 From: stakx Date: Fri, 23 Feb 2018 18:07:54 +0100 Subject: [PATCH 1/2] Upgrade System.ValueTuple package to 4.4.0 Version 4.3.0 doesn't properly support .NET Framework 4.7+, which already include the `ValueTuple` types and don't play well with a package that tries to re-define the same types. I've run some tests for the following target frameworks, and it seems that upgrading this package won't cause the kind of assembly version conflicts we had when upgrading System.Threading.Tasks.Extensions to 4.4.0: * netcoreapp1.0 * netcoreapp2.0 * net45 * net451 * net452 * net46 * net461 * net47 * net471 If versioning conflicts will pop up despite these tests, we'll have to multi-target Moq to `net47` as well and thereby blow up NuGet package size even more. Hopefully that won't be necessary. --- Moq.nuspec | 4 ++-- Source/Moq.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Moq.nuspec b/Moq.nuspec index 060cef205..c16cfaae7 100644 --- a/Moq.nuspec +++ b/Moq.nuspec @@ -16,7 +16,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/Source/Moq.csproj b/Source/Moq.csproj index adf17da18..b7910bca5 100644 --- a/Source/Moq.csproj +++ b/Source/Moq.csproj @@ -32,7 +32,7 @@ - + From f9b3d47dfd5c19dd84e2f4df15375f501b11c006 Mon Sep 17 00:00:00 2001 From: stakx Date: Fri, 23 Feb 2018 18:50:08 +0100 Subject: [PATCH 2/2] Update the changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 386a13044..065a7583a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1 ## Unreleased +#### Changed + +* Upgraded `System.ValueTuple` dependency to version 4.4.0 in order to reestablish Moq compatibility with .NET 4.7 (and later), which already include the `ValueTuple` types (@stakx, #591) + #### Fixed * Wrong parameters count for extension methods in `Callback` and `Returns` (@Caraul, #575)