yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'Umbraco/netcore/netcore' into netcore/feature/aspnetcoreidentity

Browse Source
This commit is contained in:
Scott Brady
2020-05-18 12:52:03 +01:00
parent 6f75fe6cc4 287f379c1b
commit 091712e5de
115 changed files with 3285 additions and 16511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests.Integration/Implementations/TestHelper.cs
View File

@@ -37,7 +37,7 @@ namespace Umbraco.Tests.Integration.Implementations
var httpContext = new DefaultHttpContext();
httpContext.Connection.RemoteIpAddress = IPAddress.Parse("127.0.0.1");
_httpContextAccessor = Mock.Of<IHttpContextAccessor>(x => x.HttpContext == httpContext);
_ipResolver = new AspNetIpResolver(_httpContextAccessor);
_ipResolver = new AspNetCoreIpResolver(_httpContextAccessor);
var hostEnvironment = new Mock<IWebHostEnvironment>();
hostEnvironment.Setup(x => x.ApplicationName).Returns("UmbracoIntegrationTests");