From 513d841f80fa17790545c69ea9f6d901dbaddd3b Mon Sep 17 00:00:00 2001 From: Crudelis Date: Fri, 5 Sep 2025 17:51:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?= =?UTF-8?q?=EB=B6=84=EB=A6=AC=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 패키지 업데이트 분리 작업 - 라이센스 정리 작업 - 타겟 프레임워크 정리 --- CommonLibrary/CommonLibrary.csproj | 3 +- Mitria_Argument_Creater/App.config | 6 +-- .../Mitria_Argument_Creater.csproj | 4 +- .../Properties/Resources.Designer.cs | 48 ++++++++----------- .../Properties/Settings.Designer.cs | 30 +++++------- Mitria_Minecraft_Launcher/App.config | 4 +- Mitria_Minecraft_Launcher/DataModel.cs | 1 + .../ILLink.Descriptors.LibraryBuild.xml | 8 ---- Mitria_Minecraft_Launcher/LauncherForm.cs | 8 ++-- .../Mitria_Minecraft_Launcher.csproj | 12 ++--- .../Properties/Resources.Designer.cs | 2 +- .../Properties/Settings.Designer.cs | 29 +++++------ .../Updater/GameUpdateManager.cs | 42 +++------------- Mitria_Minecraft_Launcher/packages.config | 4 +- .../Mitria_Minecraft_Launcher_Dev.csproj | 2 +- .../Mitria_Minecraft_Updater.csproj | 2 +- Mitria_Minecraft_Updater/Program.cs | 1 + 17 files changed, 79 insertions(+), 127 deletions(-) delete mode 100644 Mitria_Minecraft_Launcher/ILLink/ILLink.Descriptors.LibraryBuild.xml diff --git a/CommonLibrary/CommonLibrary.csproj b/CommonLibrary/CommonLibrary.csproj index 660ff45..ea81315 100644 --- a/CommonLibrary/CommonLibrary.csproj +++ b/CommonLibrary/CommonLibrary.csproj @@ -9,9 +9,10 @@ Properties CommonLibrary CommonLibrary - v4.7.2 + v4.8.1 512 true + true diff --git a/Mitria_Argument_Creater/App.config b/Mitria_Argument_Creater/App.config index 56efbc7..5ab1a35 100644 --- a/Mitria_Argument_Creater/App.config +++ b/Mitria_Argument_Creater/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Mitria_Argument_Creater/Mitria_Argument_Creater.csproj b/Mitria_Argument_Creater/Mitria_Argument_Creater.csproj index fea12b8..1971549 100644 --- a/Mitria_Argument_Creater/Mitria_Argument_Creater.csproj +++ b/Mitria_Argument_Creater/Mitria_Argument_Creater.csproj @@ -8,10 +8,11 @@ WinExe Mitria_Argument_Creater Mitria_Argument_Creater - v4.7.2 + v4.8.1 512 true true + AnyCPU @@ -65,6 +66,7 @@ True Resources.resx + True SettingsSingleFileGenerator diff --git a/Mitria_Argument_Creater/Properties/Resources.Designer.cs b/Mitria_Argument_Creater/Properties/Resources.Designer.cs index 8585ba1..0f6db37 100644 --- a/Mitria_Argument_Creater/Properties/Resources.Designer.cs +++ b/Mitria_Argument_Creater/Properties/Resources.Designer.cs @@ -8,62 +8,54 @@ // //------------------------------------------------------------------------------ -namespace Mitria_Argument_Creater.Properties -{ - - +namespace Mitria_Argument_Creater.Properties { + using System; + + /// /// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다. /// // 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder // 클래스에서 자동으로 생성되었습니다. - // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 - // ResGen을 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 + // 다시 실행하거나 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 - { - + 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() - { + internal Resources() { } - + /// /// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Mitria_Argument_Creater.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 - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/Mitria_Argument_Creater/Properties/Settings.Designer.cs b/Mitria_Argument_Creater/Properties/Settings.Designer.cs index 07dea68..92a50cf 100644 --- a/Mitria_Argument_Creater/Properties/Settings.Designer.cs +++ b/Mitria_Argument_Creater/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 Mitria_Argument_Creater.Properties -{ - - +namespace Mitria_Argument_Creater.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.14.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/Mitria_Minecraft_Launcher/App.config b/Mitria_Minecraft_Launcher/App.config index 49ba9b7..30739d8 100644 --- a/Mitria_Minecraft_Launcher/App.config +++ b/Mitria_Minecraft_Launcher/App.config @@ -1,7 +1,7 @@  - + @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/Mitria_Minecraft_Launcher/DataModel.cs b/Mitria_Minecraft_Launcher/DataModel.cs index 0b21c29..9bf9b13 100644 --- a/Mitria_Minecraft_Launcher/DataModel.cs +++ b/Mitria_Minecraft_Launcher/DataModel.cs @@ -23,6 +23,7 @@ namespace Mitria_Minecraft_Launcher } } + [Serializable] public struct ClientVersion { diff --git a/Mitria_Minecraft_Launcher/ILLink/ILLink.Descriptors.LibraryBuild.xml b/Mitria_Minecraft_Launcher/ILLink/ILLink.Descriptors.LibraryBuild.xml deleted file mode 100644 index a42d7f0..0000000 --- a/Mitria_Minecraft_Launcher/ILLink/ILLink.Descriptors.LibraryBuild.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/Mitria_Minecraft_Launcher/LauncherForm.cs b/Mitria_Minecraft_Launcher/LauncherForm.cs index fe37789..ae37600 100644 --- a/Mitria_Minecraft_Launcher/LauncherForm.cs +++ b/Mitria_Minecraft_Launcher/LauncherForm.cs @@ -118,11 +118,11 @@ namespace Mitria_Minecraft_Launcher } } - private void GameUpdateManager_GameUpdateManagerMessage(object sender, Updater.GameUpdateManagerMessageEventArgs e) + private void GameUpdateManager_GameUpdateManagerMessage(object sender, GameUpdateManagerMessageEventArgs e) { switch (e.MessageType) { - case Updater.GameUpdateManagerMessageType.First: + case GameUpdateManagerMessageType.First: this.Invoke(new MethodInvoker( delegate () { @@ -139,7 +139,7 @@ namespace Mitria_Minecraft_Launcher break; - case Updater.GameUpdateManagerMessageType.Second: + case GameUpdateManagerMessageType.Second: this.Invoke(new MethodInvoker(delegate () { label_Second.Text = "[" + e.MinValue.UnitSeparator() + "/" + e.MaxValue.UnitSeparator() + "]"; @@ -149,7 +149,7 @@ namespace Mitria_Minecraft_Launcher })); break; - case Updater.GameUpdateManagerMessageType.Message: + case GameUpdateManagerMessageType.Message: this.Invoke(new MethodInvoker(delegate () { textBox_ProgressLog.Text += e.Message + Environment.NewLine; diff --git a/Mitria_Minecraft_Launcher/Mitria_Minecraft_Launcher.csproj b/Mitria_Minecraft_Launcher/Mitria_Minecraft_Launcher.csproj index a8387e0..774e5c4 100644 --- a/Mitria_Minecraft_Launcher/Mitria_Minecraft_Launcher.csproj +++ b/Mitria_Minecraft_Launcher/Mitria_Minecraft_Launcher.csproj @@ -9,12 +9,13 @@ WinExe Mitria_Minecraft_Launcher MitriaMLauncher - v4.7.2 + v4.8.1 512 true false + AnyCPU @@ -70,8 +71,8 @@ True - - ..\packages\System.Diagnostics.DiagnosticSource.9.0.3\lib\net462\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.9.0.8\lib\net462\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll @@ -279,7 +280,6 @@ - @@ -299,10 +299,10 @@ - + - + \ No newline at end of file diff --git a/Mitria_Minecraft_Launcher/Properties/Resources.Designer.cs b/Mitria_Minecraft_Launcher/Properties/Resources.Designer.cs index d2deb43..13cd675 100644 --- a/Mitria_Minecraft_Launcher/Properties/Resources.Designer.cs +++ b/Mitria_Minecraft_Launcher/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Mitria_Minecraft_Launcher.Properties { // 클래스에서 자동으로 생성되었습니다. // 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을 // 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] + [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 { diff --git a/Mitria_Minecraft_Launcher/Properties/Settings.Designer.cs b/Mitria_Minecraft_Launcher/Properties/Settings.Designer.cs index eda325b..11a0f4c 100644 --- a/Mitria_Minecraft_Launcher/Properties/Settings.Designer.cs +++ b/Mitria_Minecraft_Launcher/Properties/Settings.Designer.cs @@ -1,27 +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 Mitria_Minecraft_Launcher.Properties -{ +namespace Mitria_Minecraft_Launcher.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.14.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/Mitria_Minecraft_Launcher/Updater/GameUpdateManager.cs b/Mitria_Minecraft_Launcher/Updater/GameUpdateManager.cs index 0640698..09f5ef8 100644 --- a/Mitria_Minecraft_Launcher/Updater/GameUpdateManager.cs +++ b/Mitria_Minecraft_Launcher/Updater/GameUpdateManager.cs @@ -119,13 +119,15 @@ namespace Mitria_Minecraft_Launcher.Updater GameUpdateManagerMessage(this, new GameUpdateManagerMessageEventArgs(GameUpdateManagerMessageType.First, 4, 9, "[4/9] Package Version Check")); Log.INFO("[Package] Version Check"); + var x = dataPatchInformation.PackageDirectorys; + thisVersion = Version.Parse(Settings.UserClientVersion.PackageVersion); remoteVersion = Version.Parse(dataPatchInformation.PackageVersion); CommonLibrary.Log.INFO("[Package] LocalVersion : " + thisVersion); CommonLibrary.Log.INFO("[Package] RemoteVersion : " + remoteVersion); result = remoteVersion.CompareTo(thisVersion); - //TODO: 만약 Major 버전이 바뀌면 전부삭제, 아니면 있는 폴더면 선별후 삭제 + //TODO: 만약 Major 버전이 바뀌면 전부삭제, 아니면 있는 폴더면 선별후 삭제^ // 1 : 리모트가 큼, 0 : 같음, -1 리모트가 적음 if (result == 0) { @@ -136,7 +138,6 @@ namespace Mitria_Minecraft_Launcher.Updater CommonLibrary.Log .INFO(string.Format("{0}", result == 1 ? "remote is the upper version" : "remote is the lower version")); - bool packageInitialization = true; if (thisVersion.Major < remoteVersion.Major || thisVersion.Minor < remoteVersion.Minor) @@ -156,7 +157,6 @@ namespace Mitria_Minecraft_Launcher.Updater downloader.DownloadFile(downloadUrl, targetPath); Log.INFO("[Package] Download End"); - var rootDirectoryInfo = new System.IO.DirectoryInfo(System.IO.Path.GetFullPath(CommonLibrary.Extensions.PathCombineW(Settings.UserLauncherConfig.GameDirectory, Settings.NowProfile.ServerName))); if (!rootDirectoryInfo.Exists) @@ -164,7 +164,7 @@ namespace Mitria_Minecraft_Launcher.Updater rootDirectoryInfo.Create(); Log.INFO("[Package] +[D] " + rootDirectoryInfo.FullName); } - else if(packageInitialization) + else if (packageInitialization) { Log.INFO("[Package] Empty GameDirectory Start"); // 비우기 전에 스크린샷폴더 보존 /screenshots @@ -185,7 +185,7 @@ namespace Mitria_Minecraft_Launcher.Updater { Log.INFO("[Package] Partial Clean GameDirectory Start"); var tempPacker = new ProgressPacker(); - var list = tempPacker.GetTopLevelItem(targetPath); + var list = tempPacker.GetTopLevelItem(targetPath); // 리스트에 있는 디렉토리와 파일 삭제 foreach (var item in list) { @@ -195,7 +195,7 @@ namespace Mitria_Minecraft_Launcher.Updater Extensions.DeleteDirectory(target); Log.INFO("[Package] -[D] " + target); } - else + else { Extensions.DeleteFile(target); Log.INFO("[Package] -[F] " + target); @@ -203,35 +203,6 @@ namespace Mitria_Minecraft_Launcher.Updater } Log.INFO("[Package] Partial Clean GameDirectory End"); } - - // 용도가 뭐지/??? - if (Settings.UserClientVersion.PackageDirectorys != null) - { - foreach (var item in Settings.UserClientVersion.PackageDirectorys) - { - var directoryInfo = new System.IO.DirectoryInfo(System.IO.Path.GetFullPath(item)); - - if (directoryInfo.Exists) - { - directoryInfo.Delete(true); - Log.INFO("[Package] -[D] " + directoryInfo.FullName); - } - } - } - - if (dataPatchInformation.PackageDirectorys != null) - { - foreach (var item in dataPatchInformation.PackageDirectorys) - { - var directoryInfo = new System.IO.DirectoryInfo(System.IO.Path.GetFullPath(item)); - - if (directoryInfo.Exists) - { - directoryInfo.Delete(true); - Log.INFO("[Package] -[D] " + directoryInfo.FullName); - } - } - } // 패키지 언팩 var progressPacker = new ProgressPacker(); @@ -451,5 +422,4 @@ public class GameUpdateManagerMessageEventArgs : EventArgs MaxValue = maxValue; Message = message; } -} } \ No newline at end of file diff --git a/Mitria_Minecraft_Launcher/packages.config b/Mitria_Minecraft_Launcher/packages.config index aaa208f..4494737 100644 --- a/Mitria_Minecraft_Launcher/packages.config +++ b/Mitria_Minecraft_Launcher/packages.config @@ -1,7 +1,7 @@  - + @@ -11,7 +11,7 @@ - + diff --git a/Mitria_Minecraft_Launcher_Dev/Mitria_Minecraft_Launcher_Dev.csproj b/Mitria_Minecraft_Launcher_Dev/Mitria_Minecraft_Launcher_Dev.csproj index ec96ecf..72e7be3 100644 --- a/Mitria_Minecraft_Launcher_Dev/Mitria_Minecraft_Launcher_Dev.csproj +++ b/Mitria_Minecraft_Launcher_Dev/Mitria_Minecraft_Launcher_Dev.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net9.0-windows7.0 enable enable true diff --git a/Mitria_Minecraft_Updater/Mitria_Minecraft_Updater.csproj b/Mitria_Minecraft_Updater/Mitria_Minecraft_Updater.csproj index be4a0fb..601ea1e 100644 --- a/Mitria_Minecraft_Updater/Mitria_Minecraft_Updater.csproj +++ b/Mitria_Minecraft_Updater/Mitria_Minecraft_Updater.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net9.0 Mitria_Minecraft_Updater.Program mmu embedded diff --git a/Mitria_Minecraft_Updater/Program.cs b/Mitria_Minecraft_Updater/Program.cs index c7ddf01..581e264 100644 --- a/Mitria_Minecraft_Updater/Program.cs +++ b/Mitria_Minecraft_Updater/Program.cs @@ -253,6 +253,7 @@ namespace Mitria_Minecraft_Updater Console.WriteLine("Update Complete"); } + public static void ComponentUpdate(string serverName, VersionType versionType) { CommonLibrary.DataPatchInformation dataPatchInformation = Settings.LoadDataPatchInformation(serverName);