diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs deleted file mode 100644 index 9e952cf..0000000 --- a/Properties/Resources.Designer.cs +++ /dev/null @@ -1,71 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Этот код создан программным средством. -// Версия среды выполнения: 4.0.30319.42000 -// -// Изменения в этом файле могут привести к неправильному поведению и будут утрачены, если -// код создан повторно. -// -//------------------------------------------------------------------------------ - -namespace SaveWizard_rewritten.Properties -{ - - - /// - /// Класс ресурсов со строгим типом для поиска локализованных строк и пр. - /// - // Этот класс был автоматически создан при помощи StronglyTypedResourceBuilder - // класс с помощью таких средств, как ResGen или Visual Studio. - // Для добавления или удаления члена измените файл .ResX, а затем перезапустите ResGen - // с параметром /str или заново постройте свой VS-проект. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// Возврат кэшированного экземпляра ResourceManager, используемого этим классом. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SaveWizard_rewritten.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Переопределяет свойство CurrentUICulture текущего потока для всех - /// подстановки ресурсов с помощью этого класса ресурсов со строгим типом. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/App.config b/SaveWizard/App.config similarity index 100% rename from App.config rename to SaveWizard/App.config diff --git a/ILRepack.targets b/SaveWizard/ILRepack.targets similarity index 100% rename from ILRepack.targets rename to SaveWizard/ILRepack.targets diff --git a/MainForm.Designer.cs b/SaveWizard/MainForm.Designer.cs similarity index 99% rename from MainForm.Designer.cs rename to SaveWizard/MainForm.Designer.cs index d5d80c9..23dec02 100644 --- a/MainForm.Designer.cs +++ b/SaveWizard/MainForm.Designer.cs @@ -1,4 +1,4 @@ -namespace SaveWizard_rewritten +namespace SaveWizard { partial class MainForm { diff --git a/MainForm.cs b/SaveWizard/MainForm.cs similarity index 98% rename from MainForm.cs rename to SaveWizard/MainForm.cs index 983a09e..0d420d2 100644 --- a/MainForm.cs +++ b/SaveWizard/MainForm.cs @@ -4,10 +4,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Runtime.InteropServices; -using System.Text.RegularExpressions; using System.Windows.Forms; -namespace SaveWizard_rewritten +namespace SaveWizard { public partial class MainForm: Form { @@ -267,7 +266,7 @@ namespace SaveWizard_rewritten private void btn_apply_changes_Click(object sender, EventArgs e) { - foreach (KeyValuePair item in items) + foreach (KeyValuePair item in items) if (!item.Value.GetCheck().Checked) RegexHandler.SetValue(RegexHandler.SearchLine(item.Value.GetString()), item.Key.Text); File.WriteAllLines(opened_file_path + ".swbak", RegexHandler.GetBackup()); diff --git a/MainForm.resx b/SaveWizard/MainForm.resx similarity index 100% rename from MainForm.resx rename to SaveWizard/MainForm.resx diff --git a/Program.cs b/SaveWizard/Program.cs similarity index 93% rename from Program.cs rename to SaveWizard/Program.cs index f91c7e7..4e319ff 100644 --- a/Program.cs +++ b/SaveWizard/Program.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace SaveWizard_rewritten +namespace SaveWizard { static class Program { diff --git a/Properties/AssemblyInfo.cs b/SaveWizard/Properties/AssemblyInfo.cs similarity index 100% rename from Properties/AssemblyInfo.cs rename to SaveWizard/Properties/AssemblyInfo.cs diff --git a/SaveWizard/Properties/Resources.Designer.cs b/SaveWizard/Properties/Resources.Designer.cs new file mode 100644 index 0000000..1342cb4 --- /dev/null +++ b/SaveWizard/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace SaveWizard.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [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("SaveWizard.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/Properties/Resources.resx b/SaveWizard/Properties/Resources.resx similarity index 100% rename from Properties/Resources.resx rename to SaveWizard/Properties/Resources.resx diff --git a/Properties/Settings.Designer.cs b/SaveWizard/Properties/Settings.Designer.cs similarity index 57% rename from Properties/Settings.Designer.cs rename to SaveWizard/Properties/Settings.Designer.cs index d1e3287..1e4a6ac 100644 --- a/Properties/Settings.Designer.cs +++ b/SaveWizard/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. // //------------------------------------------------------------------------------ -namespace SaveWizard_rewritten.Properties -{ - - +namespace SaveWizard.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.13.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } } diff --git a/Properties/Settings.settings b/SaveWizard/Properties/Settings.settings similarity index 100% rename from Properties/Settings.settings rename to SaveWizard/Properties/Settings.settings diff --git a/RegexHandler.cs b/SaveWizard/RegexHandler.cs similarity index 99% rename from RegexHandler.cs rename to SaveWizard/RegexHandler.cs index 8d7a63b..30c59c4 100644 --- a/RegexHandler.cs +++ b/SaveWizard/RegexHandler.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text.RegularExpressions; -namespace SaveWizard_rewritten +namespace SaveWizard { static class RegexHandler { diff --git a/SII_Decrypt.dll b/SaveWizard/SII_Decrypt.dll similarity index 100% rename from SII_Decrypt.dll rename to SaveWizard/SII_Decrypt.dll diff --git a/SaveWizard_rewritten.csproj b/SaveWizard/SaveWizard.csproj similarity index 73% rename from SaveWizard_rewritten.csproj rename to SaveWizard/SaveWizard.csproj index 9f9d435..9c1167e 100644 --- a/SaveWizard_rewritten.csproj +++ b/SaveWizard/SaveWizard.csproj @@ -6,14 +6,29 @@ AnyCPU {A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8} WinExe - SaveWizard_rewritten - SaveWizard_rewritten + SaveWizard + SaveWizard v4.8 512 true true + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true AnyCPU @@ -36,7 +51,7 @@ - packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + $(SolutionDir)\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -90,6 +105,7 @@ True Resources.resx + True @@ -111,12 +127,24 @@ Always + + + False + Microsoft .NET Framework 4.8 %28x86 и x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + - + Данный проект ссылается на пакеты NuGet, отсутствующие на этом компьютере. Используйте восстановление пакетов NuGet, чтобы скачать их. Дополнительную информацию см. по адресу: http://go.microsoft.com/fwlink/?LinkID=322105. Отсутствует следующий файл: {0}. - + \ No newline at end of file diff --git a/SecondForm.Designer.cs b/SaveWizard/SecondForm.Designer.cs similarity index 99% rename from SecondForm.Designer.cs rename to SaveWizard/SecondForm.Designer.cs index 41f11de..420f10b 100644 --- a/SecondForm.Designer.cs +++ b/SaveWizard/SecondForm.Designer.cs @@ -1,4 +1,4 @@ -namespace SaveWizard_rewritten +namespace SaveWizard { partial class SecondForm { diff --git a/SecondForm.cs b/SaveWizard/SecondForm.cs similarity index 99% rename from SecondForm.cs rename to SaveWizard/SecondForm.cs index dcad5d2..bd3ca3f 100644 --- a/SecondForm.cs +++ b/SaveWizard/SecondForm.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Windows.Forms; -namespace SaveWizard_rewritten +namespace SaveWizard { public partial class SecondForm: Form { diff --git a/SecondForm.resx b/SaveWizard/SecondForm.resx similarity index 100% rename from SecondForm.resx rename to SaveWizard/SecondForm.resx diff --git a/UpdateForm.Designer.cs b/SaveWizard/UpdateForm.Designer.cs similarity index 99% rename from UpdateForm.Designer.cs rename to SaveWizard/UpdateForm.Designer.cs index 0224ffd..ba399f4 100644 --- a/UpdateForm.Designer.cs +++ b/SaveWizard/UpdateForm.Designer.cs @@ -1,4 +1,4 @@ -namespace SaveWizard_rewritten +namespace SaveWizard { partial class UpdateForm { diff --git a/UpdateForm.cs b/SaveWizard/UpdateForm.cs similarity index 98% rename from UpdateForm.cs rename to SaveWizard/UpdateForm.cs index 42e09b8..9c753f0 100644 --- a/UpdateForm.cs +++ b/SaveWizard/UpdateForm.cs @@ -7,7 +7,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Windows.Forms; -namespace SaveWizard_rewritten +namespace SaveWizard { public partial class UpdateForm: Form { diff --git a/UpdateForm.resx b/SaveWizard/UpdateForm.resx similarity index 100% rename from UpdateForm.resx rename to SaveWizard/UpdateForm.resx diff --git a/Utils.cs b/SaveWizard/Utils.cs similarity index 97% rename from Utils.cs rename to SaveWizard/Utils.cs index 0cd96fd..7281919 100644 --- a/Utils.cs +++ b/SaveWizard/Utils.cs @@ -3,7 +3,7 @@ using System.Security.Cryptography; using System.Text; using System.Windows.Forms; -namespace SaveWizard_rewritten +namespace SaveWizard { static class Utils { diff --git a/packages.config b/SaveWizard/packages.config similarity index 100% rename from packages.config rename to SaveWizard/packages.config diff --git a/SaveWizard_rewritten.sln b/SaveWizard_rewritten.sln index 620cf72..920f50c 100644 --- a/SaveWizard_rewritten.sln +++ b/SaveWizard_rewritten.sln @@ -1,26 +1,26 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.13.35806.99 d17.13 +VisualStudioVersion = 17.13.35806.99 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaveWizard_rewritten", "SaveWizard_rewritten.csproj", "{A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigEditor", "ConfigEditor\ConfigEditor.csproj", "{0EFCF0E0-4EBC-41A3-9207-0BF27630E397}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaveWizard", "SaveWizard\SaveWizard.csproj", "{A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8}.Release|Any CPU.Build.0 = Release|Any CPU {0EFCF0E0-4EBC-41A3-9207-0BF27630E397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0EFCF0E0-4EBC-41A3-9207-0BF27630E397}.Debug|Any CPU.Build.0 = Debug|Any CPU {0EFCF0E0-4EBC-41A3-9207-0BF27630E397}.Release|Any CPU.ActiveCfg = Release|Any CPU {0EFCF0E0-4EBC-41A3-9207-0BF27630E397}.Release|Any CPU.Build.0 = Release|Any CPU + {A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A08C24B5-43A9-4E0B-8C5C-0AB019CBAFE8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE