From fac8f0acfa298db869b6911ddb7c72cb9115d65b Mon Sep 17 00:00:00 2001 From: Gary Sharp Date: Mon, 3 Jun 2013 17:39:07 +1000 Subject: [PATCH] Fix: Call Uninstall Plugin Hook --- Disco.BI/Properties/AssemblyInfo.cs | 4 ++-- Disco.Data/Properties/AssemblyInfo.cs | 4 ++-- Disco.Models/Properties/AssemblyInfo.cs | 4 ++-- Disco.Services/Plugins/UninstallPluginTask.cs | 6 ++++++ Disco.Services/Properties/AssemblyInfo.cs | 4 ++-- Disco.Web.Extensions/Properties/AssemblyInfo.cs | 4 ++-- Disco.Web/Disco.Web.csproj | 6 ++++-- Disco.Web/Properties/AssemblyInfo.cs | 4 ++-- 8 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs index f5130456..69d51aaa 100644 --- a/Disco.BI/Properties/AssemblyInfo.cs +++ b/Disco.BI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0521.1703")] -[assembly: AssemblyFileVersion("1.2.0521.1703")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0527.1408")] +[assembly: AssemblyFileVersion("1.2.0527.1408")] \ No newline at end of file diff --git a/Disco.Data/Properties/AssemblyInfo.cs b/Disco.Data/Properties/AssemblyInfo.cs index 97160a4c..ee8c1dfe 100644 --- a/Disco.Data/Properties/AssemblyInfo.cs +++ b/Disco.Data/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0521.1703")] -[assembly: AssemblyFileVersion("1.2.0521.1703")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0603.1734")] +[assembly: AssemblyFileVersion("1.2.0603.1734")] \ No newline at end of file diff --git a/Disco.Models/Properties/AssemblyInfo.cs b/Disco.Models/Properties/AssemblyInfo.cs index 3c91fdd4..b2ad8c2f 100644 --- a/Disco.Models/Properties/AssemblyInfo.cs +++ b/Disco.Models/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0521.1703")] -[assembly: AssemblyFileVersion("1.2.0521.1703")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0603.1734")] +[assembly: AssemblyFileVersion("1.2.0603.1734")] \ No newline at end of file diff --git a/Disco.Services/Plugins/UninstallPluginTask.cs b/Disco.Services/Plugins/UninstallPluginTask.cs index 4b6bec62..3d4f8628 100644 --- a/Disco.Services/Plugins/UninstallPluginTask.cs +++ b/Disco.Services/Plugins/UninstallPluginTask.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using System.Web; using Disco.Services.Tasks; using Quartz; +using Disco.Data.Repository; namespace Disco.Services.Plugins { @@ -28,6 +29,11 @@ namespace Disco.Services.Plugins if (!File.Exists(manifestFileLocation)) throw new FileNotFoundException("Plugin Manifest File Not Found", manifestFileLocation); + using (DiscoDataContext dbContext = new DiscoDataContext()) + { + manifest.UninstallPlugin(dbContext, UninstallData, this.Status); + } + string manifestUninstallFileLocation = Path.Combine(manifest.PluginLocation, "manifest.uninstall.json"); if (File.Exists(manifestUninstallFileLocation)) diff --git a/Disco.Services/Properties/AssemblyInfo.cs b/Disco.Services/Properties/AssemblyInfo.cs index d6ca168a..24466d08 100644 --- a/Disco.Services/Properties/AssemblyInfo.cs +++ b/Disco.Services/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0521.1703")] -[assembly: AssemblyFileVersion("1.2.0521.1703")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0603.1734")] +[assembly: AssemblyFileVersion("1.2.0603.1734")] \ No newline at end of file diff --git a/Disco.Web.Extensions/Properties/AssemblyInfo.cs b/Disco.Web.Extensions/Properties/AssemblyInfo.cs index cc99be3e..8c6042a5 100644 --- a/Disco.Web.Extensions/Properties/AssemblyInfo.cs +++ b/Disco.Web.Extensions/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.0521.1703")] -[assembly: AssemblyFileVersion("1.2.0521.1703")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0527.1408")] +[assembly: AssemblyFileVersion("1.2.0527.1408")] \ No newline at end of file diff --git a/Disco.Web/Disco.Web.csproj b/Disco.Web/Disco.Web.csproj index f22a7e94..e7685550 100644 --- a/Disco.Web/Disco.Web.csproj +++ b/Disco.Web/Disco.Web.csproj @@ -1801,7 +1801,9 @@ _Layout.generated.cs - + + Designer + @@ -1861,7 +1863,7 @@ False - + diff --git a/Disco.Web/Properties/AssemblyInfo.cs b/Disco.Web/Properties/AssemblyInfo.cs index d16a4635..9e78a0d4 100644 --- a/Disco.Web/Properties/AssemblyInfo.cs +++ b/Disco.Web/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.2.0521.1703")] -[assembly: AssemblyFileVersion("1.2.0521.1703")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0527.1408")] +[assembly: AssemblyFileVersion("1.2.0527.1408")] \ No newline at end of file