From 42fe20a11ebf7cd0fe93089ad3cf293ef7db9a25 Mon Sep 17 00:00:00 2001
From: jmcaveney <jmcaveney@scyllagroup.com>
Date: Wed, 29 Jan 2020 07:16:17 -0500
Subject: [PATCH] Uses AppSettings.Path constant for SystemDirectories.Umbraco
 (#7440)

---
 src/Umbraco.Core/Constants-AppSettings.cs | 15 +++++++++++++++
 src/Umbraco.Core/IO/SystemDirectories.cs  |  8 ++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs
index 85d6b24ae0..704617d90c 100644
--- a/src/Umbraco.Core/Constants-AppSettings.cs
+++ b/src/Umbraco.Core/Constants-AppSettings.cs
@@ -43,6 +43,21 @@ namespace Umbraco.Core
             /// </summary>
             public const string Path = "Umbraco.Core.Path";
 
+            /// <summary>
+            /// Gets the path to the css directory (/css by default).
+            /// </summary>
+            public const string CssPath = "umbracoCssPath";
+
+            /// <summary>
+            /// Gets the path to the scripts directory (/scripts by default).
+            /// </summary>
+            public const string ScriptsPath = "umbracoScriptsPath";
+
+            /// <summary>
+            /// Gets the path to  media directory (/media by default).
+            /// </summary>
+            public const string MediaPath = "umbracoMediaPath";
+
             /// <summary>
             /// The reserved urls from web.config.
             /// </summary>
diff --git a/src/Umbraco.Core/IO/SystemDirectories.cs b/src/Umbraco.Core/IO/SystemDirectories.cs
index d6fb63b0a1..b4688d2e9f 100644
--- a/src/Umbraco.Core/IO/SystemDirectories.cs
+++ b/src/Umbraco.Core/IO/SystemDirectories.cs
@@ -29,13 +29,13 @@ namespace Umbraco.Core.IO
 
         public static string MacroPartials => MvcViews + "/MacroPartials/";
 
-        public static string Media => IOHelper.ReturnPath("umbracoMediaPath", "~/media");
+        public static string Media => IOHelper.ReturnPath(Constants.AppSettings.MediaPath, "~/media");
 
-        public static string Scripts => IOHelper.ReturnPath("umbracoScriptsPath", "~/scripts");
+        public static string Scripts => IOHelper.ReturnPath(Constants.AppSettings.ScriptsPath, "~/scripts");
 
-        public static string Css => IOHelper.ReturnPath("umbracoCssPath", "~/css");
+        public static string Css => IOHelper.ReturnPath(Constants.AppSettings.CssPath, "~/css");
 
-        public static string Umbraco => IOHelper.ReturnPath("umbracoPath", "~/umbraco");
+        public static string Umbraco => IOHelper.ReturnPath(Constants.AppSettings.Path, "~/umbraco");
 
         public static string Packages => Data + "/packages";