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

Merge branch 'netcore/bug/minify-plugins' of https://github.com/kjac/Umbraco-CMS into kjac-netcore/bug/minify-plugins

Browse Source 
# Conflicts:
#	src/Umbraco.Web.BackOffice/DependencyInjection/UmbracoBuilderExtensions.cs
This commit is contained in:
Shannon
2021-03-16 17:22:25 +11:00
parent ed5fffac0c 8dddf0c987
commit e993410d2c
5 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Tests.Integration/TestServerTest/UmbracoTestServerTestBase.cs
View File

@@ -135,9 +135,10 @@ namespace Umbraco.Cms.Tests.Integration.TestServerTest
public override void ConfigureServices(IServiceCollection services)
{
services.AddTransient<TestUmbracoDatabaseFactoryProvider>();
IWebHostEnvironment webHostEnvironment = TestHelper.GetWebHostEnvironment();
TypeLoader typeLoader = services.AddTypeLoader(
GetType().Assembly,
TestHelper.GetWebHostEnvironment(),
webHostEnvironment,
TestHelper.GetHostingEnvironment(),
TestHelper.ConsoleLoggerFactory,
AppCaches.NoCache,
@@ -150,7 +151,7 @@ namespace Umbraco.Cms.Tests.Integration.TestServerTest
.AddConfiguration()
.AddUmbracoCore()
.AddWebComponents()
.AddRuntimeMinifier()
.AddRuntimeMinifier(webHostEnvironment)
.AddBackOfficeCore()
.AddBackOfficeAuthentication()
.AddBackOfficeIdentity()