From 115d7525821a53675457405a9944f3d06f21f2c0 Mon Sep 17 00:00:00 2001 From: SuhorukovAnton Date: Tue, 31 Aug 2021 15:43:40 +0300 Subject: [PATCH] backup.core: fix --- .../Backup/ASC.Data.Backup.csproj | 30 ------- .../Backup/BackupResource.Designer.cs | 81 ------------------- .../Backup/BackupResource.resx | 67 --------------- .../Backup/Properties/launchSettings.json | 12 +-- .../ASC.Data.Backup/Backup/appsettings.json | 2 +- 5 files changed, 7 insertions(+), 185 deletions(-) delete mode 100644 common/services/ASC.Data.Backup/Backup/BackupResource.Designer.cs delete mode 100644 common/services/ASC.Data.Backup/Backup/BackupResource.resx diff --git a/common/services/ASC.Data.Backup/Backup/ASC.Data.Backup.csproj b/common/services/ASC.Data.Backup/Backup/ASC.Data.Backup.csproj index 9362e71336..37868998d4 100644 --- a/common/services/ASC.Data.Backup/Backup/ASC.Data.Backup.csproj +++ b/common/services/ASC.Data.Backup/Backup/ASC.Data.Backup.csproj @@ -12,37 +12,7 @@ none false - - - True - True - BackupResource.resx - - - - - ResXFileCodeGenerator - BackupResource.Designer.cs - - - - - - true - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - diff --git a/common/services/ASC.Data.Backup/Backup/BackupResource.Designer.cs b/common/services/ASC.Data.Backup/Backup/BackupResource.Designer.cs deleted file mode 100644 index 8ce0296779..0000000000 --- a/common/services/ASC.Data.Backup/Backup/BackupResource.Designer.cs +++ /dev/null @@ -1,81 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace ASC.Data.Backup { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class BackupResource { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal BackupResource() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ASC.Data.Backup.BackupResource", typeof(BackupResource).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to The backup file is invalid. Please, use a file created in ONLYOFFICE v11.5 or later.. - /// - internal static string BackupNotFound { - get { - return ResourceManager.GetString("BackupNotFound", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Set Password. - /// - internal static string ButtonSetPassword { - get { - return ResourceManager.GetString("ButtonSetPassword", resourceCulture); - } - } - } -} diff --git a/common/services/ASC.Data.Backup/Backup/BackupResource.resx b/common/services/ASC.Data.Backup/Backup/BackupResource.resx deleted file mode 100644 index 69c7f0c17e..0000000000 --- a/common/services/ASC.Data.Backup/Backup/BackupResource.resx +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.6.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.6.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - The backup file is invalid. Please, use a file created in ONLYOFFICE v11.5 or later. - - - Set Password - - \ No newline at end of file diff --git a/common/services/ASC.Data.Backup/Backup/Properties/launchSettings.json b/common/services/ASC.Data.Backup/Backup/Properties/launchSettings.json index 68d9288976..aa9d9d1439 100644 --- a/common/services/ASC.Data.Backup/Backup/Properties/launchSettings.json +++ b/common/services/ASC.Data.Backup/Backup/Properties/launchSettings.json @@ -5,10 +5,10 @@ "launchBrowser": false, "launchUrl": "http://localhost:5012/api/2.0/backup/backuptmp", "environmentVariables": { - "$STORAGE_ROOT": "../../../Data", + "$STORAGE_ROOT": "../../../../Data", "log__name": "backup", - "log__dir": "../../../Logs", - "core__products__folder": "../../../products", + "log__dir": "../../../../Logs", + "core__products__folder": "../../../../products", "ASPNETCORE_ENVIRONMENT": "Development", "ASPNETCORE_URLS": "http://localhost:5012" } @@ -18,10 +18,10 @@ "launchBrowser": false, "launchUrl": "http://localhost:5012/api/2.0/backup/backuptmp", "environmentVariables": { - "$STORAGE_ROOT": "../../../Data", + "$STORAGE_ROOT": "../../../../Data", "log__name": "backup", - "log__dir": "../../../Logs", - "core__products__folder": "../../../products", + "log__dir": "../../../../Logs", + "core__products__folder": "../../../../products", "ASPNETCORE_ENVIRONMENT": "Development", "ASPNETCORE_URLS": "http://localhost:5012" }, diff --git a/common/services/ASC.Data.Backup/Backup/appsettings.json b/common/services/ASC.Data.Backup/Backup/appsettings.json index 9bf702e310..22b605e6a5 100644 --- a/common/services/ASC.Data.Backup/Backup/appsettings.json +++ b/common/services/ASC.Data.Backup/Backup/appsettings.json @@ -1,3 +1,3 @@ { - "pathToConf": "..\\..\\..\\config" + "pathToConf": "..\\..\\..\\..\\config" }