Skip to content

Commit 169d95f

Browse files
dougbudougbu
authored
Bump test project dependencies (#383)
Bump test project dependencies - Castle.Core, Moq, and xUnit versions were all out of date - hold xunit.runner.visualstudio version back in .NET SDK test projects - can be moved to latest version after we stop testing on netcoreapp2.1 - add missing xunit.analyzers reference to System.Web.Razor.Test project - move all test projects to .NET v4.6.2 (a supported framework) - remove `netstandard` reference in System.Net.Http.Formatting.Test; not needed w/ new TFM & updated references - further separate build of Microsoft.TestCommon project when invoked from NetCore.Test project - special case `RestorePackages` for this case - add System.Net.Http references to avoid conflicting versions e.g. src/ and test/ TFMs differ React to changed xUnit APIs - adjust Microsoft.TestCommon code - nit: use `Array.Empty<byte>()` in `TranscodingStreamTests` - `TranscodingStream` `internal`s can be `private` instead Resolve xUnit issues new analyzers find - address xUnit2000 warnings - pass expected values to `Assert.Equal(...)` as correct (left) argument - make generic method types explicit to avoid `error CS0121: The call is ambiguous between the following methods or properties: ...` - note: cannot remove unnecessary xUnit1013 suppression - related bug (xunit/xunit#1466) apparently not fixed in 1.0.0 analyzers package - was xunit/xunit.analyzers#82 fix (in 2017) insufficient? React to new Moq changes - avoid `ProtectedMock\`1.ThrowIfPublicMethod(...)` `throw`ing - use new overloads introduced in the Moq 4.11.0 release - adjust to Moq hiding the `ObjectProxy` type better - update `ControllerContext` mocking to avoid NREs - setting `HttpContext.User` on the `Object` left `get` value `null` (did nothing) - nit: use `SetupGet(...)` for another property
1 parent 2ed73bc commit 169d95f

File tree

75 files changed

+808
-776
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+808
-776
lines changed

Diff for: ‎.nuget/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<package id="Microsoft.Web.SkipStrongNames" version="1.0.0" />
44
<package id="Microsoft.Web.StyleCop" version="1.0.0" />
55
<package id="StyleCop" version="5.0.0" />
6-
<package id="xunit.runner.msbuild" version="2.3.1" targetFramework="net452" />
6+
<package id="xunit.runner.msbuild" version="2.4.2" targetFramework="net452" />
77
</packages>

Diff for: ‎Runtime.msbuild

+7-1
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,14 @@
6565
</Target>
6666

6767
<Target Name="RestorePackages" DependsOnTargets="DownloadNuGet">
68+
<ItemGroup>
69+
<_ToRestore Include="@(SolutionsToBuild)" />
70+
<_ToRestore Include="test\Microsoft.TestCommon\Microsoft.TestCommon.csproj"
71+
AdditionalProperties="NetFX_Core=true"
72+
Condition=" '$(BuildPortable)' == 'true' " />
73+
</ItemGroup>
6874
<Message Text="%0ARestoring NuGet packages..." Importance="High" />
69-
<MSBuild Projects="@(SolutionsToBuild)" Targets="Restore"
75+
<MSBuild Projects="@(_ToRestore)" Targets="Restore"
7076
BuildInParallel="$(RestoreInParallel)"
7177
Properties="Configuration=$(Configuration);CodeAnalysis=$(CodeAnalysis);StyleCopEnabled=$(StyleCopEnabled);
7278
RestorePackagesConfig=true;VisualStudioVersion=$(VisualStudioVersion)" />

Diff for: ‎src/System.Net.Http.Formatting/Internal/TranscodingStream.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ internal sealed class TranscodingStream : Stream
3131
private const int MinWriteRentedArraySize = 4 * 1024;
3232
private const int MaxWriteRentedArraySize = 1024 * 1024;
3333

34-
internal static readonly byte[] EmptyByteBuffer = new byte[0];
35-
internal static readonly char[] EmptyCharBuffer = new char[0];
34+
private static readonly byte[] EmptyByteBuffer = new byte[0];
35+
private static readonly char[] EmptyCharBuffer = new char[0];
3636

3737
private readonly Encoding _innerEncoding;
3838
private readonly Encoding _thisEncoding;

Diff for: ‎test/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<TargetFrameworkVersion
88
Condition=" '$(MSBuildProjectName)' != 'Microsoft.TestCommon' AND
99
'$(MSBuildProjectName)' != 'System.Net.Http.Formatting.NetCore.Test' AND
10-
'$(MSBuildProjectName)' != 'System.Net.Http.Formatting.NetStandard.Test' ">v4.5.2</TargetFrameworkVersion>
10+
'$(MSBuildProjectName)' != 'System.Net.Http.Formatting.NetStandard.Test' ">v4.6.2</TargetFrameworkVersion>
1111
</PropertyGroup>
1212
</Project>

Diff for: ‎test/Directory.Build.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<Import Project="..\Directory.Build.targets" />
3-
<Import Project="..\packages\xunit.runner.msbuild.2.3.1\**\xunit.runner.msbuild.props"
3+
<Import Project="..\packages\xunit.runner.msbuild.2.4.2\**\xunit.runner.msbuild.props"
44
Condition="$(IsTestProject) and '$(MSBuildRuntimeType)' != 'Core' and '$(TargetFrameworkIdentifier)' == '.NETFramework'" />
55

66
<Target Name="Test" DependsOnTargets="_TestWithVSTest;_TestWithDotnetTest;_TestWithRunner" />

Diff for: ‎test/Microsoft.AspNet.Facebook.Test/Microsoft.AspNet.Facebook.Test.csproj

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" />
3+
<Import Project="..\..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" />
4+
<Import Project="..\..\packages\xunit.core.2.4.2\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.4.2\build\xunit.core.props')" />
55
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Runtime.sln))\tools\WebStack.settings.targets" />
66
<PropertyGroup>
77
<ProjectGuid>{C3BEF382-C7C4-454D-B017-1EAC03E9A82C}</ProjectGuid>
@@ -14,16 +14,16 @@
1414
</NuGetPackageImportStamp>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
18-
<HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
17+
<Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
18+
<HintPath>..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
1919
<Private>True</Private>
2020
</Reference>
2121
<Reference Include="Facebook, Version=6.0.10.0, Culture=neutral, PublicKeyToken=58cb4f2111d1e6de, processorArchitecture=MSIL">
2222
<HintPath>..\..\packages\Facebook.6.4.2\lib\net45\Facebook.dll</HintPath>
2323
</Reference>
2424
<Reference Include="Microsoft.CSharp" />
25-
<Reference Include="Moq, Version=4.7.142.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
26-
<HintPath>..\..\packages\Moq.4.7.142\lib\net45\Moq.dll</HintPath>
25+
<Reference Include="Moq, Version=4.18.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
26+
<HintPath>..\..\packages\Moq.4.18.4\lib\net462\Moq.dll</HintPath>
2727
<Private>True</Private>
2828
</Reference>
2929
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -36,19 +36,19 @@
3636
<Reference Include="System.Web" />
3737
<Reference Include="System.Xml" />
3838
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
39+
<HintPath>..\..\packages\xunit.abstractions.2.0.3\lib\net35\xunit.abstractions.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
42-
<Reference Include="xunit.assert, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\xunit.assert.2.3.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
42+
<Reference Include="xunit.assert, Version=2.4.2.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46-
<Reference Include="xunit.core, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\xunit.extensibility.core.2.3.0\lib\netstandard1.1\xunit.core.dll</HintPath>
46+
<Reference Include="xunit.core, Version=2.4.2.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
47+
<HintPath>..\..\packages\xunit.extensibility.core.2.4.2\lib\net452\xunit.core.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
50-
<Reference Include="xunit.execution.desktop, Version=2.3.0.3820, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\xunit.extensibility.execution.2.3.0\lib\net452\xunit.execution.desktop.dll</HintPath>
50+
<Reference Include="xunit.execution.desktop, Version=2.4.2.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
51+
<HintPath>..\..\packages\xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
5454
</ItemGroup>
@@ -129,18 +129,18 @@
129129
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
130130
</ItemGroup>
131131
<ItemGroup>
132-
<Analyzer Include="..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
132+
<Analyzer Include="..\..\packages\xunit.analyzers.1.1.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
133133
</ItemGroup>
134134
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
135135
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
136136
<PropertyGroup>
137137
<ErrorText>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}.</ErrorText>
138138
</PropertyGroup>
139-
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.props'))" />
140-
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.0\build\xunit.core.targets'))" />
141-
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
139+
<Error Condition="!Exists('..\..\packages\xunit.core.2.4.2\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.2\build\xunit.core.props'))" />
140+
<Error Condition="!Exists('..\..\packages\xunit.core.2.4.2\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.4.2\build\xunit.core.targets'))" />
141+
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.4.5\build\net462\xunit.runner.visualstudio.props'))" />
142142
</Target>
143-
<Import Project="..\..\packages\xunit.core.2.3.0\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.0\build\xunit.core.targets')" />
143+
<Import Project="..\..\packages\xunit.core.2.4.2\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.4.2\build\xunit.core.targets')" />
144144
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
145145
Other similar extension points exist, see Microsoft.Common.targets.
146146
<Target Name="BeforeBuild">

Diff for: ‎test/Microsoft.AspNet.Facebook.Test/packages.config

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="4.2.1" targetFramework="net452" />
4-
<package id="Facebook" version="6.4.2" targetFramework="net452" />
5-
<package id="Moq" version="4.7.142" targetFramework="net452" />
6-
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
7-
<package id="xunit" version="2.3.0" targetFramework="net452" />
8-
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
9-
<package id="xunit.analyzers" version="0.7.0" targetFramework="net452" />
10-
<package id="xunit.assert" version="2.3.0" targetFramework="net452" />
11-
<package id="xunit.core" version="2.3.0" targetFramework="net452" />
12-
<package id="xunit.extensibility.core" version="2.3.0" targetFramework="net452" />
13-
<package id="xunit.extensibility.execution" version="2.3.0" targetFramework="net452" />
14-
<package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net452" developmentDependency="true" />
3+
<package id="Castle.Core" version="5.1.1" targetFramework="net462" />
4+
<package id="Facebook" version="6.4.2" targetFramework="net462" />
5+
<package id="Moq" version="4.18.4" targetFramework="net462" />
6+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
7+
<package id="xunit" version="2.4.2" targetFramework="net462" />
8+
<package id="xunit.abstractions" version="2.0.3" targetFramework="net462" />
9+
<package id="xunit.analyzers" version="1.1.0" targetFramework="net462" />
10+
<package id="xunit.assert" version="2.4.2" targetFramework="net462" />
11+
<package id="xunit.core" version="2.4.2" targetFramework="net462" />
12+
<package id="xunit.extensibility.core" version="2.4.2" targetFramework="net462" />
13+
<package id="xunit.extensibility.execution" version="2.4.2" targetFramework="net462" />
14+
<package id="xunit.runner.visualstudio" version="2.4.5" targetFramework="net462" developmentDependency="true" />
1515
</packages>

Diff for: ‎test/Microsoft.TestCommon/Directory.Build.props

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<Import Project="..\Directory.Build.props" />
3+
4+
<PropertyGroup>
5+
<!-- Set base intermediate output path early for NETFX_Core but still exclude everything under the obj\ folder. -->
6+
<BaseIntermediateOutputPath Condition=" '$(NetFX_Core)' == 'true' ">obj\NetCore\</BaseIntermediateOutputPath>
7+
<DefaultItemExcludes>$(DefaultItemExcludes);obj\**</DefaultItemExcludes>
8+
</PropertyGroup>
9+
</Project>

Diff for: ‎test/Microsoft.TestCommon/FactDiscoverer.cs

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public override IEnumerable<IXunitTestCase> Discover(
7676
var testCase = new SkippedXunitTestCase(
7777
_diagnosticMessageSink,
7878
discoveryOptions.MethodDisplayOrDefault(),
79+
TestMethodDisplayOptions.None,
7980
skipReason,
8081
baseCase.TestMethod,
8182
baseCase.TestMethodArguments);

Diff for: ‎test/Microsoft.TestCommon/Microsoft.TestCommon.csproj

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Runtime.sln))\tools\WebStack.settings.targets" />
33
<PropertyGroup>
4-
<TargetFrameworks>net452;net462;netcoreapp2.1</TargetFrameworks>
4+
<TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
55
<Configurations>$(Configurations);CodeAnalysis</Configurations>
66
<DefineConstants
77
Condition=" '$(NetFX_Core)' == 'true' ">$(DefineConstants);NETFX_CORE</DefineConstants>
@@ -14,15 +14,20 @@
1414
<ItemGroup>
1515
<None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
1616

17-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
17+
<!-- NetCore project brings in System.Net.Http from .NET Standard but doesn't expose that to us here. -->
18+
<PackageReference Include="System.Net.Http" Version="4.3.4"
19+
Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(NetFX_Core)' == 'true' " />
20+
<Reference Include="System.Net.Http"
21+
Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' AND '$(NetFX_Core)' != 'true' " />
22+
1823
<Reference Include="System.Web"
1924
Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' " />
2025

21-
<PackageReference Include="Moq" Version="4.7.142.0" />
22-
<PackageReference Include="xunit.abstractions" Version="2.0.1" />
23-
<PackageReference Include="xunit.assert" Version="2.3.0" />
24-
<PackageReference Include="xunit.extensibility.core" Version="2.3.0" />
25-
<PackageReference Include="xunit.extensibility.execution" Version="2.3.0" />
26+
<PackageReference Include="Moq" Version="4.18.4" />
27+
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
28+
<PackageReference Include="xunit.assert" Version="2.4.2" />
29+
<PackageReference Include="xunit.extensibility.core" Version="2.4.2" />
30+
<PackageReference Include="xunit.extensibility.execution" Version="2.4.2" />
2631

2732
<Compile Remove="AppDomainUtils.cs;Microsoft\TestCommon\RuntimeEnvironment.cs;WebUtils.cs"
2833
Condition=" '$(TargetFrameworkIdentifier)' != '.NETFramework' " />

Diff for: ‎test/Microsoft.TestCommon/SkippedXunitTestCase.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ public class SkippedXunitTestCase : XunitTestCase
2929
public SkippedXunitTestCase(
3030
IMessageSink diagnosticMessageSink,
3131
TestMethodDisplay defaultMethodDisplay,
32+
TestMethodDisplayOptions defaultMethodDisplayOptions,
3233
String skipReason,
3334
ITestMethod testMethod,
3435
object[] testMethodArguments = null)
35-
: base(diagnosticMessageSink, defaultMethodDisplay, testMethod, testMethodArguments)
36+
: base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod, testMethodArguments)
3637
{
3738
_skipReason = skipReason;
3839
}

Diff for: ‎test/Microsoft.TestCommon/TheoryDiscoverer.cs

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public override IEnumerable<IXunitTestCase> Discover(
7777
var testCase = new SkippedXunitTestCase(
7878
_diagnosticMessageSink,
7979
discoveryOptions.MethodDisplayOrDefault(),
80+
TestMethodDisplayOptions.None,
8081
skipReason,
8182
baseCase.TestMethod,
8283
baseCase.TestMethodArguments);

0 commit comments

Comments
 (0)