diff --git a/.nuget/packages.config b/.nuget/packages.config
index ed6c18bcb..a8fe9612a 100644
--- a/.nuget/packages.config
+++ b/.nuget/packages.config
@@ -3,5 +3,5 @@
-
+
\ No newline at end of file
diff --git a/Runtime.msbuild b/Runtime.msbuild
index d53e2e46d..ac847731a 100644
--- a/Runtime.msbuild
+++ b/Runtime.msbuild
@@ -65,8 +65,14 @@
+
+ <_ToRestore Include="@(SolutionsToBuild)" />
+ <_ToRestore Include="test\Microsoft.TestCommon\Microsoft.TestCommon.csproj"
+ AdditionalProperties="NetFX_Core=true"
+ Condition=" '$(BuildPortable)' == 'true' " />
+
-
diff --git a/src/System.Net.Http.Formatting/Internal/TranscodingStream.cs b/src/System.Net.Http.Formatting/Internal/TranscodingStream.cs
index 9f89eeee8..9d392d469 100644
--- a/src/System.Net.Http.Formatting/Internal/TranscodingStream.cs
+++ b/src/System.Net.Http.Formatting/Internal/TranscodingStream.cs
@@ -31,8 +31,8 @@ internal sealed class TranscodingStream : Stream
private const int MinWriteRentedArraySize = 4 * 1024;
private const int MaxWriteRentedArraySize = 1024 * 1024;
- internal static readonly byte[] EmptyByteBuffer = new byte[0];
- internal static readonly char[] EmptyCharBuffer = new char[0];
+ private static readonly byte[] EmptyByteBuffer = new byte[0];
+ private static readonly char[] EmptyCharBuffer = new char[0];
private readonly Encoding _innerEncoding;
private readonly Encoding _thisEncoding;
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 64681b2ef..23c8b064c 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -7,6 +7,6 @@
v4.5.2
+ '$(MSBuildProjectName)' != 'System.Net.Http.Formatting.NetStandard.Test' ">v4.6.2
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
index b1167ac05..99772c023 100644
--- a/test/Directory.Build.targets
+++ b/test/Directory.Build.targets
@@ -1,6 +1,6 @@
-
diff --git a/test/Microsoft.AspNet.Facebook.Test/Microsoft.AspNet.Facebook.Test.csproj b/test/Microsoft.AspNet.Facebook.Test/Microsoft.AspNet.Facebook.Test.csproj
index f9003b7dd..bedf43f90 100644
--- a/test/Microsoft.AspNet.Facebook.Test/Microsoft.AspNet.Facebook.Test.csproj
+++ b/test/Microsoft.AspNet.Facebook.Test/Microsoft.AspNet.Facebook.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{C3BEF382-C7C4-454D-B017-1EAC03E9A82C}
@@ -14,16 +14,16 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
..\..\packages\Facebook.6.4.2\lib\net45\Facebook.dll
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
@@ -36,19 +36,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -129,18 +129,18 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
+ obj\NetCore\
+ $(DefaultItemExcludes);obj\**
+
+
diff --git a/test/Microsoft.TestCommon/FactDiscoverer.cs b/test/Microsoft.TestCommon/FactDiscoverer.cs
index db913e188..4be650293 100644
--- a/test/Microsoft.TestCommon/FactDiscoverer.cs
+++ b/test/Microsoft.TestCommon/FactDiscoverer.cs
@@ -76,6 +76,7 @@ public override IEnumerable Discover(
var testCase = new SkippedXunitTestCase(
_diagnosticMessageSink,
discoveryOptions.MethodDisplayOrDefault(),
+ TestMethodDisplayOptions.None,
skipReason,
baseCase.TestMethod,
baseCase.TestMethodArguments);
diff --git a/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj b/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj
index 4def411d9..65c984aff 100644
--- a/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj
+++ b/test/Microsoft.TestCommon/Microsoft.TestCommon.csproj
@@ -1,7 +1,7 @@
- net452;net462;netcoreapp2.1
+ net462;netcoreapp2.1
$(Configurations);CodeAnalysis
$(DefineConstants);NETFX_CORE
@@ -14,15 +14,20 @@
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/test/Microsoft.TestCommon/SkippedXunitTestCase.cs b/test/Microsoft.TestCommon/SkippedXunitTestCase.cs
index e055b1e67..b5d536d3a 100644
--- a/test/Microsoft.TestCommon/SkippedXunitTestCase.cs
+++ b/test/Microsoft.TestCommon/SkippedXunitTestCase.cs
@@ -29,10 +29,11 @@ public class SkippedXunitTestCase : XunitTestCase
public SkippedXunitTestCase(
IMessageSink diagnosticMessageSink,
TestMethodDisplay defaultMethodDisplay,
+ TestMethodDisplayOptions defaultMethodDisplayOptions,
String skipReason,
ITestMethod testMethod,
object[] testMethodArguments = null)
- : base(diagnosticMessageSink, defaultMethodDisplay, testMethod, testMethodArguments)
+ : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod, testMethodArguments)
{
_skipReason = skipReason;
}
diff --git a/test/Microsoft.TestCommon/TheoryDiscoverer.cs b/test/Microsoft.TestCommon/TheoryDiscoverer.cs
index 8ca4c834e..cf62536fe 100644
--- a/test/Microsoft.TestCommon/TheoryDiscoverer.cs
+++ b/test/Microsoft.TestCommon/TheoryDiscoverer.cs
@@ -77,6 +77,7 @@ public override IEnumerable Discover(
var testCase = new SkippedXunitTestCase(
_diagnosticMessageSink,
discoveryOptions.MethodDisplayOrDefault(),
+ TestMethodDisplayOptions.None,
skipReason,
baseCase.TestMethod,
baseCase.TestMethodArguments);
diff --git a/test/Microsoft.Web.Helpers.Test/Microsoft.Web.Helpers.Test.csproj b/test/Microsoft.Web.Helpers.Test/Microsoft.Web.Helpers.Test.csproj
index ca98914c7..1fdbb5fc0 100644
--- a/test/Microsoft.Web.Helpers.Test/Microsoft.Web.Helpers.Test.csproj
+++ b/test/Microsoft.Web.Helpers.Test/Microsoft.Web.Helpers.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{2C653A66-8159-4A41-954F-A67915DFDA87}
@@ -14,31 +14,31 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -93,16 +93,16 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/Microsoft.Web.Helpers.Test/packages.config b/test/Microsoft.Web.Helpers.Test/packages.config
index b06fb5e7a..cafc6212c 100644
--- a/test/Microsoft.Web.Helpers.Test/packages.config
+++ b/test/Microsoft.Web.Helpers.Test/packages.config
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/Microsoft.Web.Mvc.Test/Microsoft.Web.Mvc.Test.csproj b/test/Microsoft.Web.Mvc.Test/Microsoft.Web.Mvc.Test.csproj
index 52fd9cf7a..23b4b28f3 100644
--- a/test/Microsoft.Web.Mvc.Test/Microsoft.Web.Mvc.Test.csproj
+++ b/test/Microsoft.Web.Mvc.Test/Microsoft.Web.Mvc.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{6C28DA70-60F1-4442-967F-591BF3962EC5}
@@ -16,13 +16,13 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
@@ -37,19 +37,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -159,16 +159,16 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/Microsoft.Web.Mvc.Test/packages.config b/test/Microsoft.Web.Mvc.Test/packages.config
index 6e4cf51b5..72e333be0 100644
--- a/test/Microsoft.Web.Mvc.Test/packages.config
+++ b/test/Microsoft.Web.Mvc.Test/packages.config
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/Microsoft.Web.WebPages.OAuth.Test/Microsoft.Web.WebPages.OAuth.Test.csproj b/test/Microsoft.Web.WebPages.OAuth.Test/Microsoft.Web.WebPages.OAuth.Test.csproj
index 3d56fbe66..5985200ea 100644
--- a/test/Microsoft.Web.WebPages.OAuth.Test/Microsoft.Web.WebPages.OAuth.Test.csproj
+++ b/test/Microsoft.Web.WebPages.OAuth.Test/Microsoft.Web.WebPages.OAuth.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{694C6EDF-EA52-438F-B745-82B025ECC0E7}
@@ -14,8 +14,8 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
@@ -42,8 +42,8 @@
False
..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.3.12153\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
@@ -51,19 +51,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -90,19 +90,19 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
-
+ <_VSRunnerVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">2.4.3
+ <_VSRunnerVersion Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">2.4.5
-
-
-
-
-
+
+
+
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/test/System.Net.Http.Formatting.NetStandard.Test/System.Net.Http.Formatting.NetStandard.Test.csproj b/test/System.Net.Http.Formatting.NetStandard.Test/System.Net.Http.Formatting.NetStandard.Test.csproj
index 6d6405cb6..bdcc1288d 100644
--- a/test/System.Net.Http.Formatting.NetStandard.Test/System.Net.Http.Formatting.NetStandard.Test.csproj
+++ b/test/System.Net.Http.Formatting.NetStandard.Test/System.Net.Http.Formatting.NetStandard.Test.csproj
@@ -9,16 +9,20 @@
$(DefineConstants);Testing_NetStandard2_0
true
true
+
+
+ <_VSRunnerVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">2.4.3
+ <_VSRunnerVersion Condition=" '$(TargetFramework)' != 'netcoreapp2.1' ">2.4.5
-
-
-
-
+
+
+
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/test/System.Net.Http.Formatting.Test/Internal/DelegatingStreamTest.cs b/test/System.Net.Http.Formatting.Test/Internal/DelegatingStreamTest.cs
index 70d419804..8f24a05d3 100644
--- a/test/System.Net.Http.Formatting.Test/Internal/DelegatingStreamTest.cs
+++ b/test/System.Net.Http.Formatting.Test/Internal/DelegatingStreamTest.cs
@@ -141,7 +141,7 @@ public void DelegatingStream_Dispose()
mockStream.Dispose();
// Assert
- mockInnerStream.Protected().Verify("Dispose", Times.Once(), true);
+ mockInnerStream.Protected().Verify("Dispose", Times.Once(), exactParameterMatch: true, args: true);
mockInnerStream.Verify(s => s.Close(), Times.Once());
}
@@ -156,7 +156,7 @@ public void DelegatingStream_Close()
mockStream.Close();
// Assert
- mockInnerStream.Protected().Verify("Dispose", Times.Once(), true);
+ mockInnerStream.Protected().Verify("Dispose", Times.Once(), exactParameterMatch: true, args: true);
mockInnerStream.Verify(s => s.Close(), Times.Once());
}
diff --git a/test/System.Net.Http.Formatting.Test/Internal/NonClosingDelegatingStreamTest.cs b/test/System.Net.Http.Formatting.Test/Internal/NonClosingDelegatingStreamTest.cs
index fa73637b9..838dc8634 100644
--- a/test/System.Net.Http.Formatting.Test/Internal/NonClosingDelegatingStreamTest.cs
+++ b/test/System.Net.Http.Formatting.Test/Internal/NonClosingDelegatingStreamTest.cs
@@ -22,7 +22,7 @@ public void NonClosingDelegatingStream_Dispose()
mockStream.Dispose();
// Assert
- mockInnerStream.Protected().Verify("Dispose", Times.Never(), true);
+ mockInnerStream.Protected().Verify("Dispose", Times.Never(), exactParameterMatch: true, args: true);
mockInnerStream.Verify(s => s.Close(), Times.Never());
}
@@ -37,7 +37,7 @@ public void NonClosingDelegatingStream_Close()
mockStream.Close();
// Assert
- mockInnerStream.Protected().Verify("Dispose", Times.Never(), true);
+ mockInnerStream.Protected().Verify("Dispose", Times.Never(), exactParameterMatch: true, args: true);
mockInnerStream.Verify(s => s.Close(), Times.Never());
}
}
diff --git a/test/System.Net.Http.Formatting.Test/Internal/TranscodingStreamTests.cs b/test/System.Net.Http.Formatting.Test/Internal/TranscodingStreamTests.cs
index 8f9a43b88..7d6e0a506 100644
--- a/test/System.Net.Http.Formatting.Test/Internal/TranscodingStreamTests.cs
+++ b/test/System.Net.Http.Formatting.Test/Internal/TranscodingStreamTests.cs
@@ -170,7 +170,7 @@ public void Dispose_WithLeaveOpenFalse_DisposesInnerStream()
Stream transcodingStream = new TranscodingStream(innerStream, Encoding.UTF8, Encoding.UTF8, leaveOpen: false);
transcodingStream.Dispose();
transcodingStream.Dispose(); // calling it a second time should no-op
- Assert.Throws(() => innerStream.Read(TranscodingStream.EmptyByteBuffer, 0, 0));
+ Assert.Throws(() => innerStream.Read(Array.Empty(), 0, 0));
// Async
@@ -192,7 +192,7 @@ public void Dispose_WithLeaveOpenTrue_DoesNotDisposeInnerStream()
Stream transcodingStream = new TranscodingStream(innerStream, Encoding.UTF8, Encoding.UTF8, leaveOpen: true);
transcodingStream.Dispose();
transcodingStream.Dispose(); // calling it a second time should no-op
- innerStream.Read(TranscodingStream.EmptyByteBuffer, 0, 0); // shouldn't throw
+ innerStream.Read(Array.Empty(), 0, 0); // shouldn't throw
// Async
@@ -1095,7 +1095,7 @@ public override int GetChars(byte[] bytes, int byteIndex, int byteCount, char[]
public override int GetMaxCharCount(int byteCount) => byteCount;
- public override byte[] GetPreamble() => TranscodingStream.EmptyByteBuffer;
+ public override byte[] GetPreamble() => Array.Empty();
}
// A helper type that allows synchronously writing to a stream while asynchronously
diff --git a/test/System.Net.Http.Formatting.Test/PushStreamContentTest.cs b/test/System.Net.Http.Formatting.Test/PushStreamContentTest.cs
index 3edd521b2..a3414019d 100644
--- a/test/System.Net.Http.Formatting.Test/PushStreamContentTest.cs
+++ b/test/System.Net.Http.Formatting.Test/PushStreamContentTest.cs
@@ -92,7 +92,7 @@ public async Task CompleteTaskOnCloseStream_Dispose_CompletesTaskButDoNotDispose
mockStream.Dispose();
// Assert
- mockInnerStream.Protected().Verify("Dispose", Times.Never(), true);
+ mockInnerStream.Protected().Verify("Dispose", Times.Never(), exactParameterMatch: true, args: true);
Assert.Equal(TaskStatus.RanToCompletion, serializeToStreamTask.Task.Status);
Assert.True(await serializeToStreamTask.Task);
}
@@ -109,7 +109,7 @@ public async Task CompleteTaskOnCloseStream_Dispose_CompletesTaskButDoNotCloseIn
mockStream.Dispose();
// Assert
- mockInnerStream.Protected().Verify("Dispose", Times.Never(), true);
+ mockInnerStream.Protected().Verify("Dispose", Times.Never(), exactParameterMatch: true, args: true);
mockInnerStream.Verify(s => s.Close(), Times.Never());
Assert.Equal(TaskStatus.RanToCompletion, serializeToStreamTask.Task.Status);
Assert.True(await serializeToStreamTask.Task);
@@ -127,7 +127,7 @@ public async Task NonClosingDelegatingStream_Close_CompletesTaskButDoNotCloseInn
mockStream.Close();
// Assert
- mockInnerStream.Protected().Verify("Dispose", Times.Never(), true);
+ mockInnerStream.Protected().Verify("Dispose", Times.Never(), exactParameterMatch: true, args: true);
mockInnerStream.Verify(s => s.Close(), Times.Never());
Assert.Equal(TaskStatus.RanToCompletion, serializeToStreamTask.Task.Status);
Assert.True(await serializeToStreamTask.Task);
diff --git a/test/System.Net.Http.Formatting.Test/System.Net.Http.Formatting.Test.csproj b/test/System.Net.Http.Formatting.Test/System.Net.Http.Formatting.Test.csproj
index bef6e4406..ab9d953a1 100644
--- a/test/System.Net.Http.Formatting.Test/System.Net.Http.Formatting.Test.csproj
+++ b/test/System.Net.Http.Formatting.Test/System.Net.Http.Formatting.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{7AF77741-9158-4D5F-8782-8F21FADF025F}
@@ -18,50 +18,46 @@
- ..\..\packages\System.Buffers.4.5.1\lib\netstandard2.0\System.Buffers.dll
+ ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll
False
False
- ..\..\packages\System.IO.Pipelines.4.7.5\lib\netstandard2.0\System.IO.Pipelines.dll
+ ..\..\packages\System.IO.Pipelines.4.7.5\lib\net461\System.IO.Pipelines.dll
False
True
- ..\..\packages\System.Memory.4.5.5\lib\netstandard2.0\System.Memory.dll
+ ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll
False
True
- ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll
+ ..\..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
False
True
- ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll
+ ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
False
True
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
-
- False
- False
-
..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll
True
@@ -71,19 +67,19 @@
True
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -108,21 +104,21 @@
-
+
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
\ No newline at end of file
+
diff --git a/test/System.Net.Http.Formatting.Test/packages.config b/test/System.Net.Http.Formatting.Test/packages.config
index 7d7c7a6e3..baf1c70f1 100644
--- a/test/System.Net.Http.Formatting.Test/packages.config
+++ b/test/System.Net.Http.Formatting.Test/packages.config
@@ -1,21 +1,20 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/System.Web.Cors.Test/System.Web.Cors.Test.csproj b/test/System.Web.Cors.Test/System.Web.Cors.Test.csproj
index 62b4ffd51..eea07163a 100644
--- a/test/System.Web.Cors.Test/System.Web.Cors.Test.csproj
+++ b/test/System.Web.Cors.Test/System.Web.Cors.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
Library
@@ -14,31 +14,31 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -68,16 +68,16 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/System.Web.Cors.Test/packages.config b/test/System.Web.Cors.Test/packages.config
index b06fb5e7a..cafc6212c 100644
--- a/test/System.Web.Cors.Test/packages.config
+++ b/test/System.Web.Cors.Test/packages.config
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/System.Web.Helpers.Test/System.Web.Helpers.Test.csproj b/test/System.Web.Helpers.Test/System.Web.Helpers.Test.csproj
index dbb552e83..1b14044ab 100644
--- a/test/System.Web.Helpers.Test/System.Web.Helpers.Test.csproj
+++ b/test/System.Web.Helpers.Test/System.Web.Helpers.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{D3313BDF-8071-4AC8-9D98-ABF7F9E88A57}
@@ -14,12 +14,12 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
@@ -31,19 +31,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -94,16 +94,16 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/System.Web.Helpers.Test/packages.config b/test/System.Web.Helpers.Test/packages.config
index b06fb5e7a..cafc6212c 100644
--- a/test/System.Web.Helpers.Test/packages.config
+++ b/test/System.Web.Helpers.Test/packages.config
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/System.Web.Http.Cors.Test/System.Web.Http.Cors.Test.csproj b/test/System.Web.Http.Cors.Test/System.Web.Http.Cors.Test.csproj
index db4049525..b270959ce 100644
--- a/test/System.Web.Http.Cors.Test/System.Web.Http.Cors.Test.csproj
+++ b/test/System.Web.Http.Cors.Test/System.Web.Http.Cors.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{1E89A3E9-0A7F-418F-B4BE-6E38A6315373}
@@ -14,12 +14,12 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
@@ -31,19 +31,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -97,16 +97,16 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/System.Web.Http.Cors.Test/packages.config b/test/System.Web.Http.Cors.Test/packages.config
index 6e4cf51b5..72e333be0 100644
--- a/test/System.Web.Http.Cors.Test/packages.config
+++ b/test/System.Web.Http.Cors.Test/packages.config
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/System.Web.Http.Integration.Test/System.Web.Http.Integration.Test.csproj b/test/System.Web.Http.Integration.Test/System.Web.Http.Integration.Test.csproj
index 22df805eb..6edd73613 100644
--- a/test/System.Web.Http.Integration.Test/System.Web.Http.Integration.Test.csproj
+++ b/test/System.Web.Http.Integration.Test/System.Web.Http.Integration.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{3267DFC6-B34D-4011-BC0F-D3B56AF6F608}
@@ -14,12 +14,12 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
@@ -39,19 +39,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -150,16 +150,16 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/System.Web.Http.Integration.Test/packages.config b/test/System.Web.Http.Integration.Test/packages.config
index 6e4cf51b5..72e333be0 100644
--- a/test/System.Web.Http.Integration.Test/packages.config
+++ b/test/System.Web.Http.Integration.Test/packages.config
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/System.Web.Http.Owin.Test/NonOwnedStreamTests.cs b/test/System.Web.Http.Owin.Test/NonOwnedStreamTests.cs
index 4591e067a..c21948fb5 100644
--- a/test/System.Web.Http.Owin.Test/NonOwnedStreamTests.cs
+++ b/test/System.Web.Http.Owin.Test/NonOwnedStreamTests.cs
@@ -121,7 +121,7 @@ public void Dispose_DoesNotDisposeInnerStream()
Mock mock = new Mock(MockBehavior.Strict);
mock.Setup(s => s.Close()).Callback(() => innerStreamDisposed = true);
mock.As().Setup(s => s.Dispose());
- mock.Protected().Setup("Dispose", true).Callback(() => innerStreamDisposed = true);
+ mock.Protected().Setup("Dispose", exactParameterMatch: true, args: true).Callback(() => innerStreamDisposed = true);
using (Stream innerStream = mock.Object)
using (Stream product = CreateProductUnderTest(innerStream))
@@ -159,7 +159,7 @@ public void Close_DoesNotDisposeInnerStream()
Mock mock = new Mock(MockBehavior.Strict);
mock.Setup(s => s.Close()).Callback(() => innerStreamDisposed = true);
mock.As().Setup(s => s.Dispose());
- mock.Protected().Setup("Dispose", true).Callback(() => innerStreamDisposed = true);
+ mock.Protected().Setup("Dispose", exactParameterMatch: true, args: true).Callback(() => innerStreamDisposed = true);
using (Stream innerStream = mock.Object)
using (Stream product = CreateProductUnderTest(innerStream))
diff --git a/test/System.Web.Http.Owin.Test/System.Web.Http.Owin.Test.csproj b/test/System.Web.Http.Owin.Test/System.Web.Http.Owin.Test.csproj
index 6e89f0a11..7cf636838 100644
--- a/test/System.Web.Http.Owin.Test/System.Web.Http.Owin.Test.csproj
+++ b/test/System.Web.Http.Owin.Test/System.Web.Http.Owin.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{C19267DD-3984-430C-AE18-4034F85DE4E5}
@@ -14,8 +14,8 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
@@ -29,8 +29,8 @@
False
..\..\packages\Microsoft.Owin.Hosting.4.2.2\lib\net45\Microsoft.Owin.Hosting.dll
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
@@ -45,19 +45,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -106,16 +106,16 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/System.Web.Http.Owin.Test/packages.config b/test/System.Web.Http.Owin.Test/packages.config
index 1c3c24447..f789b6961 100644
--- a/test/System.Web.Http.Owin.Test/packages.config
+++ b/test/System.Web.Http.Owin.Test/packages.config
@@ -1,18 +1,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/System.Web.Http.SelfHost.Test/System.Web.Http.SelfHost.Test.csproj b/test/System.Web.Http.SelfHost.Test/System.Web.Http.SelfHost.Test.csproj
index bf99a8ccc..c16be2756 100644
--- a/test/System.Web.Http.SelfHost.Test/System.Web.Http.SelfHost.Test.csproj
+++ b/test/System.Web.Http.SelfHost.Test/System.Web.Http.SelfHost.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{7F29EE87-6A63-43C6-B7FF-74DD06815830}
@@ -14,12 +14,12 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
@@ -37,19 +37,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -101,16 +101,16 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/System.Web.Http.SelfHost.Test/packages.config b/test/System.Web.Http.SelfHost.Test/packages.config
index 6e4cf51b5..72e333be0 100644
--- a/test/System.Web.Http.SelfHost.Test/packages.config
+++ b/test/System.Web.Http.SelfHost.Test/packages.config
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/System.Web.Http.SignalR.Test/System.Web.Http.SignalR.Test.csproj b/test/System.Web.Http.SignalR.Test/System.Web.Http.SignalR.Test.csproj
index a7a6ce203..bea9c73c3 100644
--- a/test/System.Web.Http.SignalR.Test/System.Web.Http.SignalR.Test.csproj
+++ b/test/System.Web.Http.SignalR.Test/System.Web.Http.SignalR.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{E22245AF-D5E1-46F6-B443-C886983EC50C}
@@ -13,15 +13,15 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
..\..\packages\Microsoft.AspNet.SignalR.Core.1.0.0\lib\net40\Microsoft.AspNet.SignalR.Core.dll
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
@@ -35,19 +35,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -81,16 +81,16 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/System.Web.Http.SignalR.Test/packages.config b/test/System.Web.Http.SignalR.Test/packages.config
index 420ed134e..76583074d 100644
--- a/test/System.Web.Http.SignalR.Test/packages.config
+++ b/test/System.Web.Http.SignalR.Test/packages.config
@@ -1,15 +1,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerActivatorTest.cs b/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerActivatorTest.cs
index 7db1b5780..191397e83 100644
--- a/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerActivatorTest.cs
+++ b/test/System.Web.Http.Test/Dispatcher/DefaultHttpControllerActivatorTest.cs
@@ -153,7 +153,7 @@ public void Create_ThrowsForNullDependencyScope()
exception.Message);
Assert.NotNull(exception.InnerException);
Assert.Matches(
- "A dependency resolver of type 'ObjectProxy(_\\d+)?' returned an invalid value of null from its " +
+ "A dependency resolver of type 'IDependencyResolverProxy' returned an invalid value of null from its " +
"BeginScope method. If the container does not have a concept of scope, consider returning a scope " +
"that resolves in the root of the container instead.",
exception.InnerException.Message);
diff --git a/test/System.Web.Http.Test/Routing/DirectRouteProviderContextTests.cs b/test/System.Web.Http.Test/Routing/DirectRouteProviderContextTests.cs
index bec090eba..891f2ba2a 100644
--- a/test/System.Web.Http.Test/Routing/DirectRouteProviderContextTests.cs
+++ b/test/System.Web.Http.Test/Routing/DirectRouteProviderContextTests.cs
@@ -43,7 +43,7 @@ public void CreateBuilderWithResolverAndBuild_Throws_WhenConstraintResolverRetur
var ex = Assert.Throws(
() => BuildWithResolver(@"hello/{param:constraint}", constraintResolver: constraintResolver.Object));
Assert.Matches(
- "The inline constraint resolver of type 'ObjectProxy(_\\d+)?' was unable to resolve the following inline constraint: 'constraint'.",
+ "The inline constraint resolver of type 'IInlineConstraintResolverProxy' was unable to resolve the following inline constraint: 'constraint'.",
ex.Message);
}
diff --git a/test/System.Web.Http.Test/System.Web.Http.Test.csproj b/test/System.Web.Http.Test/System.Web.Http.Test.csproj
index 5e7fce08b..dbda0c5e4 100644
--- a/test/System.Web.Http.Test/System.Web.Http.Test.csproj
+++ b/test/System.Web.Http.Test/System.Web.Http.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{7F2C796F-43B2-4F8F-ABFF-A154EC8AAFA1}
@@ -15,12 +15,12 @@
-
- ..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
+
+ ..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll
True
-
- ..\..\packages\Moq.4.7.142\lib\net45\Moq.dll
+
+ ..\..\packages\Moq.4.18.4\lib\net462\Moq.dll
True
@@ -40,19 +40,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -405,16 +405,16 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
\ No newline at end of file
diff --git a/test/System.Web.Http.Test/packages.config b/test/System.Web.Http.Test/packages.config
index 6e4cf51b5..72e333be0 100644
--- a/test/System.Web.Http.Test/packages.config
+++ b/test/System.Web.Http.Test/packages.config
@@ -1,14 +1,14 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/System.Web.Http.Tracing.Test/System.Web.Http.Tracing.Test.csproj b/test/System.Web.Http.Tracing.Test/System.Web.Http.Tracing.Test.csproj
index a2461dfe4..ee60b9358 100644
--- a/test/System.Web.Http.Tracing.Test/System.Web.Http.Tracing.Test.csproj
+++ b/test/System.Web.Http.Tracing.Test/System.Web.Http.Tracing.Test.csproj
@@ -1,7 +1,7 @@
-
-
+
+
{F87FD911-4A97-4057-8EAE-1CB96B9A1937}
@@ -24,19 +24,19 @@
- ..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll
+ ..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll
True
-
- ..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll
+
+ ..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll
True
-
- ..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll
+
+ ..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll
True
-
- ..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll
+
+ ..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll
True
@@ -69,18 +69,18 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
+
+
+
-
+
-
+