diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
index bded103d..c723d0e6 100644
--- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor
@@ -12,7 +12,7 @@
@if (_upgradeavailable)
{
- @("Framework") @_package.Version
+
}
else
{
diff --git a/Oqtane.Package/release.cmd b/Oqtane.Package/release.cmd
index 5eba1aae..d70e92ff 100644
--- a/Oqtane.Package/release.cmd
+++ b/Oqtane.Package/release.cmd
@@ -1,6 +1,7 @@
-DEL "*.nupkg"
+del "*.nupkg"
dotnet clean -c Release ..\Oqtane.sln
dotnet build -c Release ..\Oqtane.sln
+dotnet publish ..\Oqtane.Server\Oqtane.Server.csproj /p:Configuration=Release
nuget.exe pack Oqtane.Framework.nuspec
nuget.exe pack Oqtane.Client.nuspec
nuget.exe pack Oqtane.Server.nuspec
diff --git a/Oqtane.Server/Infrastructure/InstallationManager.cs b/Oqtane.Server/Infrastructure/InstallationManager.cs
index 74f38f33..c39978b7 100644
--- a/Oqtane.Server/Infrastructure/InstallationManager.cs
+++ b/Oqtane.Server/Infrastructure/InstallationManager.cs
@@ -186,6 +186,7 @@ namespace Oqtane.Infrastructure
packageversion = node.InnerText;
}
reader.Close();
+ break;
}
}
}
@@ -202,28 +203,26 @@ namespace Oqtane.Infrastructure
private void FinishUpgrade()
{
// check if upgrade application exists
+ string Upgrader = "Oqtane.Upgrade.dll";
string folder = Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location);
- if (folder == null || !File.Exists(Path.Combine(folder, "Oqtane.Upgrade.exe"))) return;
+ if (folder == null || !File.Exists(Path.Combine(folder, Upgrader))) return;
// run upgrade application
- var process = new Process
+ using (var process = new Process())
{
- StartInfo =
+ process.StartInfo = new ProcessStartInfo
{
- FileName = Path.Combine(folder, "Oqtane.Upgrade.exe"),
- Arguments = "\"" + _environment.ContentRootPath + "\" \"" + _environment.WebRootPath + "\"",
- ErrorDialog = false,
+ WorkingDirectory = folder,
+ FileName = "dotnet",
+ Arguments = Path.Combine(folder, Upgrader) + " \"" + _environment.ContentRootPath + "\" \"" + _environment.WebRootPath + "\"",
UseShellExecute = false,
+ ErrorDialog = false,
CreateNoWindow = true,
RedirectStandardOutput = false,
RedirectStandardError = false
- }
+ };
+ process.Start();
};
- process.Start();
- process.Dispose();
-
- // stop application so upgrade application can proceed
- RestartApplication();
}
public void RestartApplication()
diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj
index 0e172b84..cfc40988 100644
--- a/Oqtane.Server/Oqtane.Server.csproj
+++ b/Oqtane.Server/Oqtane.Server.csproj
@@ -22,9 +22,6 @@
-
-
-
@@ -53,4 +50,12 @@
-
+
+
+
+
+
+
+
+
+
diff --git a/Oqtane.Server/wwwroot/app_offline.bak b/Oqtane.Server/wwwroot/app_offline.bak
index d26d5e2b..e4ec3791 100644
--- a/Oqtane.Server/wwwroot/app_offline.bak
+++ b/Oqtane.Server/wwwroot/app_offline.bak
@@ -9,8 +9,8 @@
-
Please Wait... Upgrade In Progress....
-

+
+
Please Wait... Upgrade In Progress....