fixes for framework upgrade, fixes for control panel CSS styles, added AllPages attrubute for Modules, bumped version to 0.9.1 to test upgrades

This commit is contained in:
Shaun Walker
2020-05-07 14:38:24 -04:00
parent c394c6ea7a
commit d7ad175cd7
18 changed files with 95 additions and 47 deletions

View File

@ -4,7 +4,7 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
<LangVersion>7.3</LangVersion>
<OutputType>Exe</OutputType>
<Version>0.9.0</Version>
<Version>0.9.1</Version>
<Product>Oqtane</Product>
<Authors>Shaun Walker</Authors>
<Company>.NET Foundation</Company>

View File

@ -10,14 +10,12 @@ namespace Oqtane.Upgrade
{
static void Main(string[] args)
{
string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
// assumes that the application executable must be deployed to the /bin of the Oqtane.Server project
if (binfolder.Contains(Path.Combine("Oqtane.Server", "bin")))
// requires 2 arguments - the contentrootpath and the webrootpath of the site
if (args.Length == 2)
{
// ie. binfolder = Oqtane.Server\bin\Debug\netcoreapp3.0\
string rootfolder = Directory.GetParent(binfolder).Parent.Parent.FullName;
string deployfolder = Path.Combine(rootfolder, Path.Combine("wwwroot","Framework"));
string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
string rootfolder = args[0];
string deployfolder = Path.Combine(args[1], "Framework");
if (Directory.Exists(deployfolder))
{
@ -87,7 +85,7 @@ namespace Oqtane.Upgrade
success = false;
}
if (success)
if (success)
{
// clean up backup
foreach (string file in files)
@ -99,7 +97,7 @@ namespace Oqtane.Upgrade
}
}
}
else
else
{
// restore on failure
foreach (string file in files)