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

New IRuntimeHash to fix type scanning in netcore in order to look at the right runtime bits to creaet a hash for

Browse Source
This commit is contained in:
Shannon
2020-04-03 01:08:52 +11:00
parent f0579714e9
commit 9d320f79da
38 changed files with 322 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web/UmbracoApplicationBase.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.IO;
using System.Reflection;
using System.Threading;
using System.Web;
@@ -80,9 +81,18 @@ namespace Umbraco.Web
/// </summary>
/// <returns></returns>
protected virtual ITypeFinder GetTypeFinder()
{
// TODO: Currently we are not passing in any TypeFinderConfig (with ITypeFinderSettings) which we should do, however
// this is not critical right now and would require loading in some config before boot time so just leaving this as-is for now.
=> new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(
var runtimeHashPaths = new RuntimeHashPaths();
// the bin folder and everything in it
runtimeHashPaths.AddFolder(new DirectoryInfo(Current.IOHelper.MapPath("~/bin")));
// the app code folder and everything in it
runtimeHashPaths.AddFile(new FileInfo(Current.IOHelper.MapPath("~/App_Code")));
// global.asax (the app domain also monitors this, if it changes will do a full restart)
runtimeHashPaths.AddFile(new FileInfo(Current.IOHelper.MapPath("~/global.asax")));
var runtimeHash = new RuntimeHash(new ProfilingLogger(Current.Logger, Current.Profiler), runtimeHashPaths);
return new TypeFinder(Logger, new DefaultUmbracoAssemblyProvider(
// GetEntryAssembly was actually an exposed API by request of the aspnetcore team which works in aspnet core because a website
// in that case is essentially an exe. However in netframework there is no entry assembly, things don't really work that way since
// the process that is running the site is iisexpress, so this returns null. The best we can do is fallback to GetExecutingAssembly()
@@ -94,7 +104,8 @@ namespace Umbraco.Web
// assembly we can get and we can only get that if we put this code into the WebRuntime since the executing assembly is the 'current' one.
// For this purpose, it doesn't matter if it's Umbraco.Web or Umbraco.Infrastructure since all assemblies are in that same path and we are
// getting rid of netframework.
Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()));
Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()), runtimeHash);
}
/// <summary>
/// Gets a runtime.