diff --git a/eng/Versions.props b/eng/Versions.props
index 0dc354210d65..c33d84408a46 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -138,7 +138,7 @@
1.11.4
0.9.9
0.13.0
- 4.2.1
+ 5.2.1
2.3.0
6.0.0
2.15.0
@@ -159,7 +159,7 @@
$(MessagePackVersion)
1.2.0
$(ModelContextProtocolVersion)
- 4.10.0
+ 4.20.72
0.11.2
2.2.1
1.0.2
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
index f9cc5ea0e7ab..2bf92b4fb7c2 100644
--- a/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
+++ b/src/Mvc/Mvc.Core/test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
@@ -591,19 +591,10 @@ public void Validate_ComplexType_IValidatableObject_CanUseRequestServices()
var validator = CreateValidator();
- var model = new Mock();
- model
- .Setup(x => x.Validate(It.IsAny()))
- .Callback((ValidationContext context) =>
- {
- var receivedService = context.GetService();
- Assert.Equal(service.Object, receivedService);
- receivedService.DoSomething();
- })
- .Returns(new List());
+ var model = new MockedValidatableObject(service.Object);
// Act
- validator.Validate(actionContext, validationState, prefix: null, model: model.Object);
+ validator.Validate(actionContext, validationState, prefix: null, model: model);
// Assert
service.Verify();
@@ -1687,4 +1678,20 @@ public DepthObject Instance
}
}
}
+
+ private sealed class MockedValidatableObject : IValidatableObject
+ {
+ private readonly IExampleService _exampleService;
+
+ public MockedValidatableObject(IExampleService exampleService)
+ => _exampleService = exampleService;
+
+ public IEnumerable Validate(ValidationContext validationContext)
+ {
+ var receivedService = validationContext.GetService();
+ Assert.Equal(_exampleService, receivedService);
+ receivedService.DoSomething();
+ return new List();
+ }
+ }
}