diff --git a/CommonLibrary/Extensions.cs b/CommonLibrary/Extensions.cs index baf872b..ab3f1a3 100644 --- a/CommonLibrary/Extensions.cs +++ b/CommonLibrary/Extensions.cs @@ -5,13 +5,15 @@ namespace CommonLibrary { public static class Extensions { + //TODO: 제거후 PathCombine 에 통합 public static string PathCombineL(params string[] paths) { var directorySeparatorChar = System.IO.Path.AltDirectorySeparatorChar.ToString(); return PathCombine(directorySeparatorChar, paths).Replace("\\", "/"); } - public static string PathCombineW(params string[] paths) + //TODO: 제거예정 + public static string PathCombineW(params string[] paths) { var directorySeparatorChar = System.IO.Path.DirectorySeparatorChar.ToString(); return PathCombine(directorySeparatorChar, paths).Replace("/", "\\"); diff --git a/Mitria_Minecraft_Launcher/App.config b/Mitria_Minecraft_Launcher/App.config index 56efbc7..49ba9b7 100644 --- a/Mitria_Minecraft_Launcher/App.config +++ b/Mitria_Minecraft_Launcher/App.config @@ -1,6 +1,22 @@ - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mitria_Minecraft_Launcher/ILLink/ILLink.Descriptors.LibraryBuild.xml b/Mitria_Minecraft_Launcher/ILLink/ILLink.Descriptors.LibraryBuild.xml new file mode 100644 index 0000000..a42d7f0 --- /dev/null +++ b/Mitria_Minecraft_Launcher/ILLink/ILLink.Descriptors.LibraryBuild.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Mitria_Minecraft_Launcher/Mitria_Minecraft_Launcher.csproj b/Mitria_Minecraft_Launcher/Mitria_Minecraft_Launcher.csproj index 8442d0e..a8387e0 100644 --- a/Mitria_Minecraft_Launcher/Mitria_Minecraft_Launcher.csproj +++ b/Mitria_Minecraft_Launcher/Mitria_Minecraft_Launcher.csproj @@ -1,6 +1,6 @@  - + Debug @@ -46,8 +46,8 @@ - - ..\packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll + + ..\packages\Costura.Fody.6.0.0\lib\netstandard2.0\Costura.dll ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll @@ -60,15 +60,18 @@ True True + + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll + - - ..\packages\System.Console.4.3.0\lib\net46\System.Console.dll + + ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll True True - - ..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.9.0.3\lib\net462\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll @@ -116,8 +119,11 @@ True True - - ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll + + ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll + + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll True True @@ -127,18 +133,24 @@ True + + ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll + ..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll True True - - ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll + + ..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll True True - - ..\packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + + ..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll True True @@ -153,7 +165,7 @@ True - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll True True @@ -167,13 +179,13 @@ True True - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll True True - ..\packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll + ..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll True True @@ -186,7 +198,7 @@ - ..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll + ..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll True True @@ -267,6 +279,7 @@ + @@ -277,17 +290,19 @@ - + + call "c:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe" sign /tr http://timestamp.digicert.com /td sha256 /fd sha256 /n "Crudelis Private Root Certificate Authority" $(TargetPath) + 이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다. - - - + + + + - - - call "c:\Program Files (x86)\Windows Kits\10\App Certification Kit\signtool.exe" sign /tr http://timestamp.digicert.com /td sha256 /fd sha256 /n "Crudelis Private Root Certificate Authority" $(TargetPath) - + + + \ No newline at end of file diff --git a/Mitria_Minecraft_Launcher/Updater/GameUpdateManager.cs b/Mitria_Minecraft_Launcher/Updater/GameUpdateManager.cs index d23e57f..afc2d24 100644 --- a/Mitria_Minecraft_Launcher/Updater/GameUpdateManager.cs +++ b/Mitria_Minecraft_Launcher/Updater/GameUpdateManager.cs @@ -124,7 +124,7 @@ namespace Mitria_Minecraft_Launcher.Updater CommonLibrary.Log.INFO("[Package] LocalVersion : " + thisVersion); CommonLibrary.Log.INFO("[Package] RemoteVersion : " + remoteVersion); result = remoteVersion.CompareTo(thisVersion); - + //TODO: 만약 Major 버전이 바뀌면 전부삭제, 아니면 있는 폴더면 선별후 삭제 // 1 : 리모트가 큼, 0 : 같음, -1 리모트가 적음 if (result == 0) { diff --git a/Mitria_Minecraft_Launcher/packages.config b/Mitria_Minecraft_Launcher/packages.config index 045df22..aaa208f 100644 --- a/Mitria_Minecraft_Launcher/packages.config +++ b/Mitria_Minecraft_Launcher/packages.config @@ -1,16 +1,17 @@  - - - + + + - + + - + - + @@ -22,30 +23,33 @@ - - + + + + - - + + + - + - + - + - + \ No newline at end of file diff --git a/Mitria_Minecraft_Launcher_Dev/App.xaml b/Mitria_Minecraft_Launcher_Dev/App.xaml new file mode 100644 index 0000000..c1547e5 --- /dev/null +++ b/Mitria_Minecraft_Launcher_Dev/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/Mitria_Minecraft_Launcher_Dev/App.xaml.cs b/Mitria_Minecraft_Launcher_Dev/App.xaml.cs new file mode 100644 index 0000000..4b7deb3 --- /dev/null +++ b/Mitria_Minecraft_Launcher_Dev/App.xaml.cs @@ -0,0 +1,13 @@ +using System.Configuration; +using System.Data; +using System.Windows; + +namespace Mitria_Minecraft_Launcher_Dev; + +/// +/// Interaction logic for App.xaml +/// +public partial class App : Application +{ +} + diff --git a/Mitria_Minecraft_Launcher_Dev/AssemblyInfo.cs b/Mitria_Minecraft_Launcher_Dev/AssemblyInfo.cs new file mode 100644 index 0000000..cc29e7f --- /dev/null +++ b/Mitria_Minecraft_Launcher_Dev/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly:ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/Mitria_Minecraft_Launcher_Dev/LauncherForm.xaml b/Mitria_Minecraft_Launcher_Dev/LauncherForm.xaml new file mode 100644 index 0000000..e916acb --- /dev/null +++ b/Mitria_Minecraft_Launcher_Dev/LauncherForm.xaml @@ -0,0 +1,19 @@ + + + + + + + + + + + + diff --git a/Mitria_Minecraft_Launcher_Dev/LauncherForm.xaml.cs b/Mitria_Minecraft_Launcher_Dev/LauncherForm.xaml.cs new file mode 100644 index 0000000..e2393ec --- /dev/null +++ b/Mitria_Minecraft_Launcher_Dev/LauncherForm.xaml.cs @@ -0,0 +1,23 @@ +using System.Text; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Mitria_Minecraft_Launcher_Dev; + +/// +/// Interaction logic for MainWindow.xaml +/// +public partial class MainWindow : Window +{ + public MainWindow() + { + InitializeComponent(); + } +} \ No newline at end of file diff --git a/Mitria_Minecraft_Launcher_Dev/Mitria_Minecraft_Launcher_Dev.csproj b/Mitria_Minecraft_Launcher_Dev/Mitria_Minecraft_Launcher_Dev.csproj new file mode 100644 index 0000000..ec96ecf --- /dev/null +++ b/Mitria_Minecraft_Launcher_Dev/Mitria_Minecraft_Launcher_Dev.csproj @@ -0,0 +1,16 @@ + + + + WinExe + net8.0-windows7.0 + enable + enable + true + + + + + + + + diff --git a/Mitria_Minecraft_Project.sln b/Mitria_Minecraft_Project.sln index 17f87b0..b9e5b2b 100644 --- a/Mitria_Minecraft_Project.sln +++ b/Mitria_Minecraft_Project.sln @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommonLibrary", "CommonLibr EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mitria_Argument_Creater", "Mitria_Argument_Creater\Mitria_Argument_Creater.csproj", "{52250463-A90A-4DF7-B17D-A08940858305}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mitria_Minecraft_Launcher_Dev", "Mitria_Minecraft_Launcher_Dev\Mitria_Minecraft_Launcher_Dev.csproj", "{453C9BCC-E144-4DE2-BEE9-FE02175E55EC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -33,6 +35,10 @@ Global {52250463-A90A-4DF7-B17D-A08940858305}.Debug|Any CPU.Build.0 = Debug|Any CPU {52250463-A90A-4DF7-B17D-A08940858305}.Release|Any CPU.ActiveCfg = Release|Any CPU {52250463-A90A-4DF7-B17D-A08940858305}.Release|Any CPU.Build.0 = Release|Any CPU + {453C9BCC-E144-4DE2-BEE9-FE02175E55EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {453C9BCC-E144-4DE2-BEE9-FE02175E55EC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {453C9BCC-E144-4DE2-BEE9-FE02175E55EC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {453C9BCC-E144-4DE2-BEE9-FE02175E55EC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Mitria_Minecraft_Updater/Mitria_Minecraft_Updater.csproj b/Mitria_Minecraft_Updater/Mitria_Minecraft_Updater.csproj index fb54fca..b29c2f7 100644 --- a/Mitria_Minecraft_Updater/Mitria_Minecraft_Updater.csproj +++ b/Mitria_Minecraft_Updater/Mitria_Minecraft_Updater.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 Mitria_Minecraft_Updater.Program mmu embedded