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/AB5822-smidge-implementation

Browse Source 
# Conflicts:
#	.gitignore
#	src/Umbraco.Core/IO/IIOHelper.cs
This commit is contained in:
Shannon
2020-04-02 22:32:02 +11:00
parent 4fddb94462 f9ce924e85
commit f0579714e9
29 changed files with 187 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Configuration/XmlConfigManipulator.cs
View File

@@ -23,7 +23,7 @@ namespace Umbraco.Core.Configuration
public void RemoveConnectionString()
{
var key = Constants.System.UmbracoConnectionName;
var fileName = _ioHelper.MapPath(string.Format("{0}/web.config", _ioHelper.Root));
var fileName = _ioHelper.MapPath("~/web.config");
var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
var appSettings = xml.Root.DescendantsAndSelf("appSettings").Single();
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Configuration
var fileSource = "web.config";
var fileName = _ioHelper.MapPath(_ioHelper.Root + "/" + fileSource);
var fileName = _ioHelper.MapPath("~/" + fileSource);
var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
if (xml.Root == null) throw new Exception($"Invalid {fileSource} file (no root).");
@@ -71,7 +71,7 @@ namespace Umbraco.Core.Configuration
if (configSourceAttribute != null)
{
fileSource = configSourceAttribute.Value;
fileName = _ioHelper.MapPath(_ioHelper.Root + "/" + fileSource);
fileName = _ioHelper.MapPath("~/" + fileSource);
if (!File.Exists(fileName))
throw new Exception($"Invalid configSource \"{fileSource}\" (no such file).");