jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixup Disco -> Disco ICT

Browse Source
This commit is contained in:
Gary Sharp
2023-07-26 19:01:31 +10:00
parent e204ea4d5f
commit 6fcb1a1eae
68 changed files with 221 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Plugins/Features/UIExtension/UIExtensions.cs
+2 -2
View File
@@ -52,7 +52,7 @@ namespace Disco.Services.Plugins.Features.UIExtension
if (uiExtResults != null && uiExtResults.Count > 0)
{
page.WriteLiteral("<!-- BEGIN: Disco UI Extensions -->");
page.WriteLiteral("<!-- BEGIN: Disco ICT UI Extensions -->");
page.WriteLiteral("\n<div id=\"layout_uiExtensions\">");
foreach (var uiExtResult in uiExtResults)
{
@@ -62,7 +62,7 @@ namespace Disco.Services.Plugins.Features.UIExtension
page.WriteLiteral(string.Format("\n<!-- END UI EXTENSION: {0} -->", extensionDescription));
}
page.WriteLiteral("\n</div>");
page.WriteLiteral("\n<!-- END: Disco UI Extensions -->");
page.WriteLiteral("\n<!-- END: Disco ICT UI Extensions -->");
}
}
Disco.Services/Plugins/Plugins.cs
+2 -2
View File
@@ -314,9 +314,9 @@ namespace Disco.Services.Plugins
throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] is not compatible: {2}", pluginManifest.Id, pluginManifest.VersionFormatted, pluginIncompatible.Reason));
if (pluginManifest.HostVersionMin != null && pluginManifest.HostVersionMin > hostVersion)
throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] does not support this version of Disco (Requires v{2} or greater)", pluginManifest.Id, pluginManifest.VersionFormatted, pluginManifest.HostVersionMin.ToString()));
throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] does not support this version of Disco ICT (Requires v{2} or greater)", pluginManifest.Id, pluginManifest.VersionFormatted, pluginManifest.HostVersionMin.ToString()));
if (pluginManifest.HostVersionMax != null && pluginManifest.HostVersionMax < hostVersion)
throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] does not support this version of Disco (Support expired as of v{2})", pluginManifest.Id, pluginManifest.VersionFormatted, pluginManifest.HostVersionMax.ToString()));
throw new InvalidOperationException(string.Format("The plugin [{0} v{1}] does not support this version of Disco ICT (Support expired as of v{2})", pluginManifest.Id, pluginManifest.VersionFormatted, pluginManifest.HostVersionMax.ToString()));
RegisterPluginAssemblyReferences(pluginManifest);
Disco.Services/Plugins/UninstallPluginTask.cs
+1 -1
View File
@@ -45,7 +45,7 @@ namespace Disco.Services.Plugins
File.Copy(manifestUninstallFileLocation, manifestDataUninstallFileLocation);
}
Status.Finished("Restarting Disco, please wait...", "/Config/Plugins");
Status.Finished("Restarting Disco ICT, please wait...", "/Config/Plugins");
Plugins.RestartApp(2500);
}
Disco.Services/Plugins/UpdatePluginTask.cs
+1 -1
View File
@@ -88,7 +88,7 @@ namespace Disco.Services.Plugins
ExecuteTaskInternal(Status, pluginPackagesLocation, updatePlugins);
Status.Finished("Restarting Disco, please wait...", "/Config/Plugins");
Status.Finished("Restarting Disco ICT, please wait...", "/Config/Plugins");
Plugins.RestartApp(2500);
}
Disco.Services/Plugins/UpdatePluginsAfterDiscoUpdateTask.cs
+3 -3
View File
@@ -10,11 +10,11 @@ namespace Disco.Services.Plugins
{
private static object _startLock = new object();
public override string TaskName { get { return "Updating Disco Plugins"; } }
public override string TaskName { get { return "Updating Disco ICT Plugins"; } }
protected override void ExecuteTask()
{
Status.UpdateStatus(0, "Updating plugins after Disco update", "Starting, please wait...");
Status.UpdateStatus(0, "Updating plugins after Disco ICT update", "Starting, please wait...");
// Wait for App to Load (10 Seconds)
for (int i = 0; i < 10; i++)
@@ -33,7 +33,7 @@ namespace Disco.Services.Plugins
UpdatePluginTask.UpdateOffline(Status);
// Restart
Status.Finished("Restarting Disco, please wait...", "/");
Status.Finished("Restarting Disco ICT, please wait...", "/");
Plugins.RestartApp(2500);
}