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

Post merge - Fix build

Browse Source
This commit is contained in:
Bjarke Berg
2020-12-01 11:37:48 +01:00
parent 85c01d9905
commit a1df7c159a
8 changed files with 13 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Tests/Routing/GetContentUrlsTests.cs
View File

@@ -92,7 +92,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(_requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(_globalSettings),
new SiteDomainHelper(),
umbracoContextAccessor, UriUtility);
var publishedUrlProvider = new UrlProvider(
@@ -139,7 +138,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(_requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(_globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = new UrlProvider(
umbracoContextAccessor,

1
src/Umbraco.Tests/Routing/UrlProviderWithHideTopLevelNodeFromPathTests.cs
View File

@@ -48,7 +48,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(_globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);

7
src/Umbraco.Tests/Routing/UrlProviderWithoutHideTopLevelNodeFromPathTests.cs
View File

@@ -51,7 +51,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(_globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -112,7 +111,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(_globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -153,7 +151,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(_globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -208,7 +205,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(_globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -263,7 +259,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(_globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
@@ -284,7 +279,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(_globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -301,7 +295,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(_globalSettings),
new SiteDomainHelper(), UmbracoContextAccessor, UriUtility);
var umbracoContext = GetUmbracoContext("http://example.com/test", 1111, globalSettings: _globalSettings);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);

7
src/Umbraco.Tests/Routing/UrlsProviderWithDomainsTests.cs
View File

@@ -186,7 +186,6 @@ namespace Umbraco.Tests.Routing
var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
var urlProvider = new DefaultUrlProvider(Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -220,7 +219,6 @@ namespace Umbraco.Tests.Routing
var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
var urlProvider = new DefaultUrlProvider(Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -246,7 +244,6 @@ namespace Umbraco.Tests.Routing
var umbracoContextAccessor = new TestUmbracoContextAccessor(umbracoContext);
var urlProvider = new DefaultUrlProvider(Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -279,7 +276,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -302,7 +298,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -367,7 +362,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);
@@ -393,7 +387,6 @@ namespace Umbraco.Tests.Routing
var urlProvider = new DefaultUrlProvider(
Microsoft.Extensions.Options.Options.Create(requestHandlerSettings),
LoggerFactory.CreateLogger<DefaultUrlProvider>(),
Microsoft.Extensions.Options.Options.Create(globalSettings),
new SiteDomainHelper(), umbracoContextAccessor, UriUtility);
var publishedUrlProvider = GetPublishedUrlProvider(umbracoContext, urlProvider);

6
src/Umbraco.Tests/Services/RedirectUrlServiceTests.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Threading;
using Microsoft.Extensions.Logging;
using Moq;
using NUnit.Framework;
using Umbraco.Core.Cache;
@@ -28,10 +29,9 @@ namespace Umbraco.Tests.Services
{
base.CreateTestData();
var provider = TestObjects.GetScopeProvider(Logger);
using (var scope = provider.CreateScope())
using (var scope = ScopeProvider.CreateScope())
{
var repository = new RedirectUrlRepository((IScopeAccessor)provider, AppCaches.Disabled, Mock.Of<ILogger>());
var repository = new RedirectUrlRepository((IScopeAccessor)ScopeProvider, AppCaches.Disabled, Mock.Of<ILogger<RedirectUrlRepository>>());
var rootContent = ServiceContext.ContentService.GetRootContent().FirstOrDefault();
var subPages = ServiceContext.ContentService.GetPagedChildren(rootContent.Id, 0, 2, out _).ToList();
_testPage = subPages[0];

10
src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
View File

@@ -1,15 +1,14 @@
using System;
using System.Globalization;
using System.Linq;
using System.Web;
using System.Web.Security;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
using Moq;
using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Composing;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.Models;
using Umbraco.Core.Dictionary;
@@ -23,7 +22,6 @@ using Umbraco.Core.Security;
using Umbraco.Core.Services;
using Umbraco.Tests.Common;
using Umbraco.Tests.TestHelpers;
using Umbraco.Tests.TestHelpers.Stubs;
using Umbraco.Web;
using Umbraco.Web.PublishedCache;
using Umbraco.Web.Routing;
@@ -31,7 +29,7 @@ using Umbraco.Web.Security;
using Umbraco.Web.Security.Providers;
using Umbraco.Web.WebApi;
using Current = Umbraco.Web.Composing.Current;
using Umbraco.Tests.Common.Builders;
namespace Umbraco.Tests.Testing.TestingTests
{
@@ -70,11 +68,11 @@ namespace Umbraco.Tests.Testing.TestingTests
Builder.Services.AddTransient(_ => AppCaches.Disabled);
Builder.Services.AddTransient<ServiceContext>();
var logger = Mock.Of<IProfilingLogger>();
var loggerFactory = Mock.Of<ILoggerFactory>();
var memberService = Mock.Of<IMemberService>();
var memberTypeService = Mock.Of<IMemberTypeService>();
var membershipProvider = new MembersMembershipProvider(memberService, memberTypeService, Mock.Of<IUmbracoVersion>(), TestHelper.GetHostingEnvironment(), TestHelper.GetIpResolver());
var membershipHelper = new MembershipHelper(Mock.Of<IHttpContextAccessor>(), Mock.Of<IPublishedMemberCache>(), membershipProvider, Mock.Of<RoleProvider>(), memberService, memberTypeService, Mock.Of<IPublicAccessService>(), AppCaches.Disabled, logger, ShortStringHelper, Mock.Of<IEntityService>());
var membershipHelper = new MembershipHelper(Mock.Of<IHttpContextAccessor>(), Mock.Of<IPublishedMemberCache>(), membershipProvider, Mock.Of<RoleProvider>(), memberService, memberTypeService, Mock.Of<IPublicAccessService>(), AppCaches.Disabled, loggerFactory, ShortStringHelper, Mock.Of<IEntityService>());
// ReSharper disable once UnusedVariable
var helper = new UmbracoHelper(Mock.Of<IPublishedContent>(),

13
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -161,20 +161,7 @@
<Compile Include="Routing\MediaUrlProviderTests.cs" />
<Compile Include="Routing\RoutableDocumentFilterTests.cs" />
<Compile Include="Routing\GetContentUrlsTests.cs" />
<Compile Include="Security\PasswordSecurityTests.cs" />
<Compile Include="Services\AmbiguousEventTests.cs" />
<Compile Include="Services\ContentServiceEventTests.cs" />
<Compile Include="Services\ContentServicePublishBranchTests.cs" />
<Compile Include="Services\ContentServiceTagsTests.cs" />
<Compile Include="Services\ContentTypeServiceVariantsTests.cs" />
<Compile Include="Services\EntityXmlSerializerTests.cs" />
<Compile Include="Packaging\CreatedPackagesRepositoryTests.cs" />
<Compile Include="Services\ExternalLoginServiceTests.cs" />
<Compile Include="Services\MemberGroupServiceTests.cs" />
<Compile Include="Services\MediaTypeServiceTests.cs" />
<Compile Include="Services\PropertyValidationServiceTests.cs" />
<Compile Include="Services\RedirectUrlServiceTests.cs" />
<Compile Include="Templates\HtmlLocalLinkParserTests.cs" />
<Compile Include="TestHelpers\RandomIdRamDirectory.cs" />
<Compile Include="TestHelpers\Stubs\TestUserPasswordConfig.cs" />
<Compile Include="Testing\Objects\TestDataSource.cs" />

6
src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
View File

@@ -22,6 +22,10 @@
</ItemGroup>
<ItemGroup>
<Folder Include="scripts\aaa" />
<Folder Include="umbraco\MediaCache\2\c\6\9\3\a\6\5" />
<Folder Include="umbraco\MediaCache\a\e\e\1\9\e\4\b" />
<Folder Include="umbraco\MediaCache\c\3\b\5\0\9\f\9" />
<Folder Include="Views" />
<Folder Include="wwwroot\Media" />
<Folder Include="Views" />
@@ -39,6 +43,7 @@
<ItemGroup>
<Content Remove="App_Data\**" />
<Content Remove="wwwroot\Web.config" />
</ItemGroup>
@@ -55,6 +60,7 @@
</None>
<None Remove="App_Data\**" />
<None Include="umbraco\UmbracoWebsite\NoNodes.cshtml" />
<None Remove="scripts\aaa\fc75309db05f41609a9e1adb8cf0998c.tmp" />
</ItemGroup>
<!-- We don't want to include the generated files, they will throw a lot of errors -->