kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #846 from sbwalker/master

Browse Source 
fix folder parsing issue specific to Azure environment where WebRootPath contains 2 wwwroot nested folders
This commit is contained in:
Shaun Walker 2020-10-22 16:31:41 -04:00 committed by GitHub
commit 03926bccb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Server/Infrastructure/InstallationManager.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
@ -103,7 +103,7 @@ namespace Oqtane.Infrastructure
assets.Add(filename); assets.Add(filename);
break; break;
case "wwwroot": case "wwwroot":
filename = Path.Combine(webRootPath.Replace(Path.DirectorySeparatorChar + "wwwroot", ""), Utilities.PathCombine(entry.FullName.Split('/'))); filename = Path.Combine(webRootPath, Utilities.PathCombine(entry.FullName.Replace("wwwroot/", "").Split('/')));
ExtractFile(entry, filename); ExtractFile(entry, filename);
assets.Add(filename); assets.Add(filename);
break; break;

6
Oqtane.Upgrade/Program.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
@ -58,7 +58,7 @@ namespace Oqtane.Upgrade
files.Add(Path.Combine(binfolder, filename)); files.Add(Path.Combine(binfolder, filename));
break; break;
case "wwwroot": case "wwwroot":
files.Add(Path.Combine(webrootfolder.Replace(Path.DirectorySeparatorChar + "wwwroot", ""), entry.FullName.Replace('/', Path.DirectorySeparatorChar))); files.Add(Path.Combine(webrootfolder, entry.FullName.Replace("wwwroot/", "").Replace('/', Path.DirectorySeparatorChar)));
break; break;
} }
} }
@ -102,7 +102,7 @@ namespace Oqtane.Upgrade
filename = Path.Combine(binfolder, filename); filename = Path.Combine(binfolder, filename);
break; break;
case "wwwroot": case "wwwroot":
filename = Path.Combine(webrootfolder.Replace(Path.DirectorySeparatorChar + "wwwroot", ""), entry.FullName.Replace('/', Path.DirectorySeparatorChar)); filename = Path.Combine(webrootfolder, entry.FullName.Replace("wwwroot/", "").Replace('/', Path.DirectorySeparatorChar));
break; break;
} }
if (files.Contains(filename)) if (files.Contains(filename))