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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/core-cannot-use-system-web

Browse Source
This commit is contained in:
Bjarke Berg
2019-11-26 08:26:16 +01:00
parent 323a60fa76 719c23c7a2
commit 969832310e
94 changed files with 629 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Composing/Current.cs
View File

@@ -226,9 +226,9 @@ namespace Umbraco.Web.Composing
public static IVariationContextAccessor VariationContextAccessor => CoreCurrent.VariationContextAccessor;
public static IIOHelper IOHelper => CoreCurrent.IOHelper;
public static IUmbracoVersion UmbracoVersion => CoreCurrent.UmbracoVersion;
public static IHostingEnvironment HostingEnvironment => CoreCurrent.HostingEnvironment;
public static IIpResolver IpResolver => Factory.GetInstance<IIpResolver>();
public static IUmbracoVersion UmbracoVersion => Factory.GetInstance<IUmbracoVersion>();
#endregion
}