Skip to content

Commit 62cc8b3

Browse files
dougbudougbu
committed
Upgrade to Moq v4.7.142 and Castle.Core v4.2.1
- part of aspnet#65 - NuGet added System.Configuration references - add `[InternalsVisibleTo("DynamicProxyGenAssembly2, ...)]` attribute in MVC to fix more than 70 failures - mainly impacted mocks of `internal` interface implementations e.g. `ActionDescriptor` & `IUniquelyIdentifiable` - split some `Setup(...)` and `SetupGet(...)` lambda expressions in two - mainly impacted mocks of types with `protected` constructors e.g. `HttpResponseBase` - typo in `HttpRouteCollectionTest` should have always broken the test - not sure why tests using `PortReserver` weren't failing before; tests shouldn't be opening UDP ports
1 parent 80eeedf commit 62cc8b3

File tree

55 files changed

+207
-166
lines changed

Some content is hidden

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

55 files changed

+207
-166
lines changed

‎src/System.Web.Mvc/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
using System.Reflection;
55
using System.Runtime.CompilerServices;
66
using System.Runtime.InteropServices;
7-
using System.Security;
87
using System.Web;
98
using System.Web.Mvc;
109

1110
[assembly: AssemblyTitle("System.Web.Mvc.dll")]
1211
[assembly: AssemblyDescription("System.Web.Mvc.dll")]
1312
[assembly: Guid("4b5f4208-c6b0-4c37-9a41-63325ffa52ad")]
1413

14+
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
1515
[assembly: InternalsVisibleTo("System.Web.Mvc.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
1616
[assembly: PreApplicationStartMethod(typeof(PreApplicationStartCode), "Start")]
1717
[assembly: TypeForwardedTo(typeof(TagBuilder))]

‎test/Microsoft.AspNet.Facebook.Test/Microsoft.AspNet.Facebook.Test.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,24 @@
1313
</NuGetPackageImportStamp>
1414
</PropertyGroup>
1515
<ItemGroup>
16-
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
17-
<HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
16+
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
17+
<HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
1818
<Private>True</Private>
1919
</Reference>
2020
<Reference Include="Facebook, Version=6.0.10.0, Culture=neutral, PublicKeyToken=58cb4f2111d1e6de, processorArchitecture=MSIL">
2121
<HintPath>..\..\packages\Facebook.6.4.2\lib\net45\Facebook.dll</HintPath>
2222
</Reference>
2323
<Reference Include="Microsoft.CSharp" />
24-
<Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
25-
<HintPath>..\..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
24+
<Reference Include="Moq, Version=4.7.142.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
25+
<HintPath>..\..\packages\Moq.4.7.142\lib\net45\Moq.dll</HintPath>
2626
<Private>True</Private>
2727
</Reference>
2828
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
2929
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
3030
<Private>True</Private>
3131
</Reference>
3232
<Reference Include="System" />
33+
<Reference Include="System.Configuration" />
3334
<Reference Include="System.Net.Http" />
3435
<Reference Include="System.Web" />
3536
<Reference Include="System.Xml" />

‎test/Microsoft.AspNet.Facebook.Test/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
3+
<package id="Castle.Core" version="4.2.1" targetFramework="net452" />
44
<package id="Facebook" version="6.4.2" targetFramework="net452" />
5-
<package id="Moq" version="4.5.21" targetFramework="net452" />
5+
<package id="Moq" version="4.7.142" targetFramework="net452" />
66
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
77
<package id="xunit" version="2.1.0" targetFramework="net452" />
88
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />

‎test/Microsoft.TestCommon/PortReserver.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.Collections.Generic;
66
using System.Diagnostics;
77
using System.Globalization;
8+
using System.Linq;
89
using System.Net;
910
using System.Net.NetworkInformation;
1011
using System.Threading;
@@ -154,7 +155,9 @@ private static IPEndPoint[] ListUsedTCPPort()
154155
{
155156
IPGlobalProperties ipGlobalProperties = IPGlobalProperties.GetIPGlobalProperties();
156157

157-
return ipGlobalProperties.GetActiveTcpListeners();
158+
return ipGlobalProperties.GetActiveTcpListeners()
159+
.Concat(ipGlobalProperties.GetActiveUdpListeners())
160+
.ToArray();
158161
}
159162
}
160163
}

‎test/Microsoft.Web.Helpers.Test/Microsoft.Web.Helpers.Test.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
</NuGetPackageImportStamp>
1414
</PropertyGroup>
1515
<ItemGroup>
16-
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
17-
<HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
18-
<Private>True</Private>
16+
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
17+
<HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
1918
</Reference>
2019
<Reference Include="Microsoft.CSharp" />
21-
<Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
22-
<HintPath>..\..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
20+
<Reference Include="Moq, Version=4.7.142.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
21+
<HintPath>..\..\packages\Moq.4.7.142\lib\net45\Moq.dll</HintPath>
2322
<Private>True</Private>
2423
</Reference>
2524
<Reference Include="System" />
25+
<Reference Include="System.Configuration" />
2626
<Reference Include="System.Web" />
2727
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
2828
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>

‎test/Microsoft.Web.Helpers.Test/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
4-
<package id="Moq" version="4.5.21" targetFramework="net452" />
3+
<package id="Castle.Core" version="4.2.1" targetFramework="net452" />
4+
<package id="Moq" version="4.7.142" targetFramework="net452" />
55
<package id="xunit" version="2.1.0" targetFramework="net452" />
66
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
77
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />

‎test/Microsoft.Web.Mvc.Test/Microsoft.Web.Mvc.Test.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@
1515
</NuGetPackageImportStamp>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
19-
<HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
18+
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
19+
<HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
2020
<Private>True</Private>
2121
</Reference>
2222
<Reference Include="Microsoft.CSharp" />
23-
<Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
24-
<HintPath>..\..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
23+
<Reference Include="Moq, Version=4.7.142.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
24+
<HintPath>..\..\packages\Moq.4.7.142\lib\net45\Moq.dll</HintPath>
2525
<Private>True</Private>
2626
</Reference>
2727
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
2828
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
2929
</Reference>
3030
<Reference Include="System" />
3131
<Reference Include="System.ComponentModel.DataAnnotations" />
32+
<Reference Include="System.Configuration" />
3233
<Reference Include="System.Core" />
3334
<Reference Include="System.Data.Linq" />
3435
<Reference Include="System.Web" />

‎test/Microsoft.Web.Mvc.Test/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
4-
<package id="Moq" version="4.5.21" targetFramework="net452" />
3+
<package id="Castle.Core" version="4.2.1" targetFramework="net452" />
4+
<package id="Moq" version="4.7.142" targetFramework="net452" />
55
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
66
<package id="xunit" version="2.1.0" targetFramework="net452" />
77
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />

‎test/Microsoft.Web.WebPages.OAuth.Test/Microsoft.Web.WebPages.OAuth.Test.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
</NuGetPackageImportStamp>
1414
</PropertyGroup>
1515
<ItemGroup>
16-
<Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
17-
<HintPath>..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll</HintPath>
16+
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
17+
<HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
1818
<Private>True</Private>
1919
</Reference>
2020
<Reference Include="DotNetOpenAuth.AspNet, Version=4.0.0.0, Culture=neutral, PublicKeyToken=2780ccd10d57b246, processorArchitecture=MSIL">
@@ -41,8 +41,8 @@
4141
<SpecificVersion>False</SpecificVersion>
4242
<HintPath>..\..\packages\DotNetOpenAuth.OpenId.RelyingParty.4.0.3.12153\lib\net40-full\DotNetOpenAuth.OpenId.RelyingParty.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Moq, Version=4.5.21.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\Moq.4.5.21\lib\net45\Moq.dll</HintPath>
44+
<Reference Include="Moq, Version=4.7.142.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
45+
<HintPath>..\..\packages\Moq.4.7.142\lib\net45\Moq.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="System" />

‎test/Microsoft.Web.WebPages.OAuth.Test/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Castle.Core" version="3.3.3" targetFramework="net452" />
3+
<package id="Castle.Core" version="4.2.1" targetFramework="net452" />
44
<package id="DotNetOpenAuth.AspNet" version="4.0.3.12153" targetFramework="net452" />
55
<package id="DotNetOpenAuth.Core" version="4.0.3.12153" targetFramework="net452" />
66
<package id="DotNetOpenAuth.OAuth.Consumer" version="4.0.3.12153" targetFramework="net452" />
77
<package id="DotNetOpenAuth.OAuth.Core" version="4.0.3.12153" targetFramework="net452" />
88
<package id="DotNetOpenAuth.OpenId.Core" version="4.0.3.12153" targetFramework="net452" />
99
<package id="DotNetOpenAuth.OpenId.RelyingParty" version="4.0.3.12153" targetFramework="net452" />
10-
<package id="Moq" version="4.5.21" targetFramework="net452" />
10+
<package id="Moq" version="4.7.142" targetFramework="net452" />
1111
<package id="xunit" version="2.1.0" targetFramework="net452" />
1212
<package id="xunit.abstractions" version="2.0.0" targetFramework="net452" />
1313
<package id="xunit.assert" version="2.1.0" targetFramework="net452" />

0 commit comments

Comments
 (0)