From acdaba5d479e9619850cb18b57418eb1c84e257f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 19 Jan 2021 19:16:42 +1100
Subject: [PATCH] more cleanup

---
 .../UmbracoAssemblyLoadContext.cs             | 26 ++++++-------------
 .../Umbraco.Web.UI.NetCore.csproj             |  3 ---
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.ModelsBuilder.Embedded/UmbracoAssemblyLoadContext.cs b/src/Umbraco.ModelsBuilder.Embedded/UmbracoAssemblyLoadContext.cs
index 5064095cdd..d89714adbe 100644
--- a/src/Umbraco.ModelsBuilder.Embedded/UmbracoAssemblyLoadContext.cs
+++ b/src/Umbraco.ModelsBuilder.Embedded/UmbracoAssemblyLoadContext.cs
@@ -1,33 +1,23 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.Loader;
-using System.Text;
 
 namespace Umbraco.ModelsBuilder.Embedded
 {
     internal class UmbracoAssemblyLoadContext : AssemblyLoadContext
     {
-        private AssemblyDependencyResolver _resolver;
-
         /// <summary>
+        /// Initializes a new instance of the <see cref="UmbracoAssemblyLoadContext"/> class.
+        /// </summary>
+        /// <remarks>
         /// Collectible AssemblyLoadContext used to load in the compiled generated models.
         /// Must be a collectible assembly in order to be able to be unloaded.
-        /// </summary>
-        public UmbracoAssemblyLoadContext() : base(isCollectible: true)
+        /// </remarks>
+        public UmbracoAssemblyLoadContext()
+            : base(isCollectible: true)
         {
-            //_resolver = new AssemblyDependencyResolver(pluginPath);
         }
 
-        protected override Assembly Load(AssemblyName assemblyName)
-        {
-            //string assemblyPath = _resolver.ResolveAssemblyToPath(assemblyName);
-            //if (assemblyPath != null)
-            //{
-            //    return LoadFromAssemblyPath(assemblyPath);
-            //}
-
-            return null;
-        }
+        // we never load anything directly by assembly name. This method will never be called
+        protected override Assembly Load(AssemblyName assemblyName) => null;
     }
 }
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index ca303314b1..40870b28cb 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -24,9 +24,6 @@
   <ItemGroup>
     <Folder Include="App_Plugins" />
     <Folder Include="scripts" />
-    <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" />