updated screenshots

Oqtane.Package/Oqtane.Framework.nuspec

@@ -21,5 +21,7 @@
     <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Server.dll" target="lib" /> 
     <file src="..\Oqtane.Shared\bin\Release\netstandard2.1\Oqtane.Shared.dll" target="lib" /> 
     <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Upgrade.dll" target="lib" /> 
+    <file src="..\Oqtane.Server\bin\Release\netcoreapp3.1\Oqtane.Upgrade.dll" target="lib" /> 
+    <file src="..\Oqtane.Server\wwwroot\**\*.*" target="wwwroot" /> 
   </files>
 </package>

Oqtane.Server/Infrastructure/InstallationManager.cs

@@ -52,10 +52,6 @@ namespace Oqtane.Infrastructure
                 // iterate through Nuget packages in source folder
                 foreach (string packagename in Directory.GetFiles(sourceFolder, "*.nupkg"))
                 {
-                    string name = Path.GetFileNameWithoutExtension(packagename);
-                    string[] segments = name?.Split('.');
-                    if (segments != null) name = string.Join('.', segments, 0, segments.Length - 3);
-
                     // iterate through files
                     using (ZipArchive archive = ZipFile.OpenRead(packagename))
                     {
@@ -84,6 +80,15 @@ namespace Oqtane.Infrastructure
                         // if compatible with framework version
                         if (frameworkversion == "" || Version.Parse(Constants.Version).CompareTo(Version.Parse(frameworkversion)) >= 0)
                         {
+                            string name = "";
+                            if (folder != "Framework")
+                            {
+                                // module and theme packages must be in form of name.1.0.0.nupkg
+                                name = Path.GetFileNameWithoutExtension(packagename);
+                                string[] segments = name?.Split('.');
+                                if (segments != null) name = string.Join('.', segments, 0, segments.Length - 3);
+                            }
+
                             // deploy to appropriate locations
                             foreach (ZipArchiveEntry entry in archive.Entries)
                             {

Oqtane.Upgrade/Program.cs

@@ -14,8 +14,9 @@ namespace Oqtane.Upgrade
             if (args.Length == 2)
             {
                 string binfolder = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-                string rootfolder = args[0];
+                string contentrootfolder = args[0];
-                string deployfolder = Path.Combine(args[1], "Framework");
+                string webrootfolder = args[1];
+                string deployfolder = Path.Combine(webrootfolder, "Framework");
 
                 if (Directory.Exists(deployfolder))
                 {
@@ -29,9 +30,9 @@ namespace Oqtane.Upgrade
                     if (packagename != "")
                     {
                         // take the app offline
-                        if (File.Exists(Path.Combine(rootfolder, "app_offline.bak")))
+                        if (File.Exists(Path.Combine(webrootfolder, "app_offline.bak")))
                         {
-                            File.Move(Path.Combine(rootfolder, "app_offline.bak"), Path.Combine(rootfolder, "app_offline.htm"));
+                            File.Move(Path.Combine(webrootfolder, "app_offline.bak"), Path.Combine(contentrootfolder, "app_offline.htm"));
                         }
 
                         // get list of files in package
@@ -116,9 +117,9 @@ namespace Oqtane.Upgrade
                         }
 
                         // bring the app back online
-                        if (File.Exists(Path.Combine(rootfolder, "app_offline.htm")))
+                        if (File.Exists(Path.Combine(contentrootfolder, "app_offline.htm")))
                         {
-                            File.Move(Path.Combine(rootfolder, "app_offline.htm"), Path.Combine(rootfolder, "app_offline.bak"));
+                            File.Delete(Path.Combine(contentrootfolder, "app_offline.htm"));
                         }
                     }
                 }