diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs index d1ea26bf..96ec1fd8 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.0503.2044")] -[assembly: AssemblyFileVersion("1.2.0503.2044")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0506.1443")] +[assembly: AssemblyFileVersion("1.2.0506.1443")] \ No newline at end of file diff --git a/Disco.Client/Properties/AssemblyInfo.cs b/Disco.Client/Properties/AssemblyInfo.cs index 6fd92637..5debe370 100644 --- a/Disco.Client/Properties/AssemblyInfo.cs +++ b/Disco.Client/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.0503.2044")] -[assembly: AssemblyFileVersion("1.2.0503.2044")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0506.1442")] +[assembly: AssemblyFileVersion("1.2.0506.1442")] \ No newline at end of file diff --git a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs index 3ac0a5f9..ad55df75 100644 --- a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs +++ b/Disco.ClientBootstrapper/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.0503.2044")] -[assembly: AssemblyFileVersion("1.2.0503.2044")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0506.1436")] +[assembly: AssemblyFileVersion("1.2.0506.1436")] \ No newline at end of file diff --git a/Disco.Data/Properties/AssemblyInfo.cs b/Disco.Data/Properties/AssemblyInfo.cs index 745e5946..8ae1fdfe 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.0503.2044")] -[assembly: AssemblyFileVersion("1.2.0503.2044")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0506.1443")] +[assembly: AssemblyFileVersion("1.2.0506.1443")] \ No newline at end of file diff --git a/Disco.Models/Properties/AssemblyInfo.cs b/Disco.Models/Properties/AssemblyInfo.cs index 27f56e4d..7036ac87 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.0503.2044")] -[assembly: AssemblyFileVersion("1.2.0503.2044")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0506.1443")] +[assembly: AssemblyFileVersion("1.2.0506.1443")] \ No newline at end of file diff --git a/Disco.Services/Plugins/UpdatePluginTask.cs b/Disco.Services/Plugins/UpdatePluginTask.cs index 0dfe549f..a5a2c838 100644 --- a/Disco.Services/Plugins/UpdatePluginTask.cs +++ b/Disco.Services/Plugins/UpdatePluginTask.cs @@ -101,8 +101,6 @@ namespace Disco.Services.Plugins DirectoryInfo pluginDirectoryRoot = new DirectoryInfo(pluginsLocation); if (pluginDirectoryRoot.Exists) { - MirgrateV1Plugins(pluginsLocation, pluginsStorageLocation); - foreach (DirectoryInfo pluginDirectory in pluginDirectoryRoot.EnumerateDirectories()) { string pluginManifestFilename = Path.Combine(pluginDirectory.FullName, "manifest.json"); @@ -135,105 +133,6 @@ namespace Disco.Services.Plugins } } - internal static void MirgrateV1Plugins(string pluginsLocation, string pluginsStorageLocation) - { - var migrationPackage = Path.Combine(HttpRuntime.BinDirectory, "Disco1.1-1.2PluginMigration.zip"); - - if (File.Exists(migrationPackage)) - { - // eduSTAR.net - var eduSTARPluginPath = Path.Combine(pluginsLocation, "EduSTARnetCertificateProvider"); - if (Directory.Exists(eduSTARPluginPath)) - { - var eduSTARPluginAssemblyPath = Path.Combine(eduSTARPluginPath, "EduSTARnetCertificateProvider.dll"); - if (File.Exists(eduSTARPluginAssemblyPath)) - { - // Delete Old Plugin - Directory.Delete(eduSTARPluginPath, true); - - // Add New Plugin - eduSTARPluginPath = Path.Combine(pluginsLocation, "eduSTARnet"); - using (var migrationZipPackageStream = new FileStream(migrationPackage, FileMode.Open, FileAccess.Read, FileShare.Read)) - { - using (ZipArchive migrationZipPackage = new ZipArchive(migrationZipPackageStream)) - { - var pluginZipPackage = migrationZipPackage.Entries.Where(e => e.Name.Equals("eduSTARnet.discoPlugin", StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault(); - if (pluginZipPackage != null) - { - using (var pluginPackageStream = pluginZipPackage.Open()) - { - using (ZipArchive pluginPackageArchive = new ZipArchive(pluginPackageStream)) - { - foreach (var entry in pluginPackageArchive.Entries) - { - var entryPath = Path.Combine(eduSTARPluginPath, entry.FullName); - Directory.CreateDirectory(Path.GetDirectoryName(entryPath)); - using (var entryOutput = new FileStream(entryPath, FileMode.Create, FileAccess.Write, FileShare.None)) - { - using (var entryStream = entry.Open()) - { - entryStream.CopyTo(entryOutput); - } - } - } - } - } - } - } - } - } - } - - // LWT - var LWTPluginPath = Path.Combine(pluginsLocation, "LWTWarrantyProvider"); - if (Directory.Exists(LWTPluginPath)) - { - var LWTPluginAssemblyPath = Path.Combine(LWTPluginPath, "LWTWarrantyProvider.dll"); - if (File.Exists(LWTPluginAssemblyPath)) - { - // Delete Old Plugin - Directory.Delete(LWTPluginPath, true); - // Delete Plugin Storage - var LWTPluginStoragePath = Path.Combine(pluginsStorageLocation, "LWTWarrantyProvider"); - if (Directory.Exists(LWTPluginStoragePath)) - Directory.Delete(LWTPluginStoragePath, true); - - // Add New Plugin - LWTPluginPath = Path.Combine(pluginsLocation, "LWTPlugin"); - using (var migrationZipPackageStream = new FileStream(migrationPackage, FileMode.Open, FileAccess.Read, FileShare.Read)) - { - using (ZipArchive migrationZipPackage = new ZipArchive(migrationZipPackageStream)) - { - var pluginZipPackage = migrationZipPackage.Entries.Where(e => e.Name.Equals("LWTPlugin.discoPlugin", StringComparison.InvariantCultureIgnoreCase)).FirstOrDefault(); - if (pluginZipPackage != null) - { - using (var pluginPackageStream = pluginZipPackage.Open()) - { - using (ZipArchive pluginPackageArchive = new ZipArchive(pluginPackageStream)) - { - foreach (var entry in pluginPackageArchive.Entries) - { - var entryPath = Path.Combine(LWTPluginPath, entry.FullName); - Directory.CreateDirectory(Path.GetDirectoryName(entryPath)); - using (var entryOutput = new FileStream(entryPath, FileMode.Create, FileAccess.Write, FileShare.None)) - { - using (var entryStream = entry.Open()) - { - entryStream.CopyTo(entryOutput); - } - } - } - } - } - } - } - } - } - - } - } - } - internal static void ExecuteTaskInternal(ScheduledTaskStatus Status, string pluginPackagesLocation, List> UpdatePlugins) { while (UpdatePlugins.Count > 0) diff --git a/Disco.Services/Properties/AssemblyInfo.cs b/Disco.Services/Properties/AssemblyInfo.cs index 44bd8ad4..f7d28e79 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.0503.2044")] -[assembly: AssemblyFileVersion("1.2.0503.2044")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0506.1443")] +[assembly: AssemblyFileVersion("1.2.0506.1443")] \ No newline at end of file diff --git a/Disco.Web.Extensions/Properties/AssemblyInfo.cs b/Disco.Web.Extensions/Properties/AssemblyInfo.cs index 4f4eaf65..3e7231f4 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.0503.2044")] -[assembly: AssemblyFileVersion("1.2.0503.2044")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0506.1443")] +[assembly: AssemblyFileVersion("1.2.0506.1443")] \ No newline at end of file diff --git a/Disco.Web/Disco.Web.csproj b/Disco.Web/Disco.Web.csproj index 709a03c8..980bf57f 100644 --- a/Disco.Web/Disco.Web.csproj +++ b/Disco.Web/Disco.Web.csproj @@ -780,7 +780,6 @@ RazorGenerator Install.generated.cs - Core.js.bundle @@ -1854,7 +1853,7 @@ False - + diff --git a/Disco.Web/Properties/AssemblyInfo.cs b/Disco.Web/Properties/AssemblyInfo.cs index 286d3dfe..babe0d2e 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.0503.2044")] -[assembly: AssemblyFileVersion("1.2.0503.2044")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0506.1443")] +[assembly: AssemblyFileVersion("1.2.0506.1443")] \ No newline at end of file