From 25d9b9efd1702fbcbc6d44abc7bf98724bdde9ef Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 23 Oct 2019 13:53:06 +0200
Subject: [PATCH] AB3267 - Made Umbraco core internals visible for
 Umbraco.ModelsBuilder and uses PanicException instead of just Exception

---
 src/Umbraco.Core/Properties/AssemblyInfo.cs                  | 1 +
 .../Umbraco/ModelsBuilderBackOfficeController.cs             | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Core/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs
index afd602cfc9..139af8725d 100644
--- a/src/Umbraco.Core/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Core/Properties/AssemblyInfo.cs
@@ -14,6 +14,7 @@ using System.Runtime.InteropServices;
 [assembly: InternalsVisibleTo("Umbraco.Web")]
 [assembly: InternalsVisibleTo("Umbraco.Web.UI")]
 [assembly: InternalsVisibleTo("Umbraco.Examine")]
+[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder")]
 
 [assembly: InternalsVisibleTo("Umbraco.Tests")]
 [assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")]
diff --git a/src/Umbraco.ModelsBuilder/Umbraco/ModelsBuilderBackOfficeController.cs b/src/Umbraco.ModelsBuilder/Umbraco/ModelsBuilderBackOfficeController.cs
index b1e6fbb1fb..a3ff89595c 100644
--- a/src/Umbraco.ModelsBuilder/Umbraco/ModelsBuilderBackOfficeController.cs
+++ b/src/Umbraco.ModelsBuilder/Umbraco/ModelsBuilderBackOfficeController.cs
@@ -6,6 +6,7 @@ using System.Net.Http;
 using System.Runtime.Serialization;
 using System.Text;
 using System.Web.Hosting;
+using Umbraco.Core.Exceptions;
 using Umbraco.ModelsBuilder.Building;
 using Umbraco.ModelsBuilder.Configuration;
 using Umbraco.ModelsBuilder.Dashboard;
@@ -30,7 +31,7 @@ namespace Umbraco.ModelsBuilder.Umbraco
 
         public ModelsBuilderBackOfficeController(UmbracoServices umbracoServices, Config config)
         {
-            _umbracoServices = umbracoServices;
+            //_umbracoServices = umbracoServices;
             _config = config;
         }
 
@@ -54,7 +55,7 @@ namespace Umbraco.ModelsBuilder.Umbraco
 
                 var bin = HostingEnvironment.MapPath("~/bin");
                 if (bin == null)
-                    throw new Exception("Panic: bin is null.");
+                    throw new PanicException("bin is null.");
 
                 // EnableDllModels will recycle the app domain - but this request will end properly
                 GenerateModels(modelsDirectory);