업데이트 분리 작업
- 패키지 업데이트 분리 작업 - 라이센스 정리 작업 - 타겟 프레임워크 정리
This commit is contained in:
@@ -9,9 +9,10 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>CommonLibrary</RootNamespace>
|
<RootNamespace>CommonLibrary</RootNamespace>
|
||||||
<AssemblyName>CommonLibrary</AssemblyName>
|
<AssemblyName>CommonLibrary</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<Deterministic>true</Deterministic>
|
<Deterministic>true</Deterministic>
|
||||||
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" ?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
|
||||||
</startup>
|
</startup>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@@ -8,10 +8,11 @@
|
|||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<RootNamespace>Mitria_Argument_Creater</RootNamespace>
|
<RootNamespace>Mitria_Argument_Creater</RootNamespace>
|
||||||
<AssemblyName>Mitria_Argument_Creater</AssemblyName>
|
<AssemblyName>Mitria_Argument_Creater</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
<Deterministic>true</Deterministic>
|
<Deterministic>true</Deterministic>
|
||||||
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
@@ -65,6 +66,7 @@
|
|||||||
<Compile Include="Properties\Resources.Designer.cs">
|
<Compile Include="Properties\Resources.Designer.cs">
|
||||||
<AutoGen>True</AutoGen>
|
<AutoGen>True</AutoGen>
|
||||||
<DependentUpon>Resources.resx</DependentUpon>
|
<DependentUpon>Resources.resx</DependentUpon>
|
||||||
|
<DesignTime>True</DesignTime>
|
||||||
</Compile>
|
</Compile>
|
||||||
<None Include="Properties\Settings.settings">
|
<None Include="Properties\Settings.settings">
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
<Generator>SettingsSingleFileGenerator</Generator>
|
||||||
|
@@ -8,62 +8,54 @@
|
|||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
namespace Mitria_Argument_Creater.Properties
|
namespace Mitria_Argument_Creater.Properties {
|
||||||
{
|
using System;
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다.
|
/// 지역화된 문자열 등을 찾기 위한 강력한 형식의 리소스 클래스입니다.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
// 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder
|
// 이 클래스는 ResGen 또는 Visual Studio와 같은 도구를 통해 StronglyTypedResourceBuilder
|
||||||
// 클래스에서 자동으로 생성되었습니다.
|
// 클래스에서 자동으로 생성되었습니다.
|
||||||
// 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여
|
// 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을
|
||||||
// ResGen을 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오.
|
// 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오.
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
|
||||||
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
internal class Resources
|
internal class Resources {
|
||||||
{
|
|
||||||
|
|
||||||
private static global::System.Resources.ResourceManager resourceMan;
|
private static global::System.Resources.ResourceManager resourceMan;
|
||||||
|
|
||||||
private static global::System.Globalization.CultureInfo resourceCulture;
|
private static global::System.Globalization.CultureInfo resourceCulture;
|
||||||
|
|
||||||
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
|
||||||
internal Resources()
|
internal Resources() {
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다.
|
/// 이 클래스에서 사용하는 캐시된 ResourceManager 인스턴스를 반환합니다.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||||
internal static global::System.Resources.ResourceManager ResourceManager
|
internal static global::System.Resources.ResourceManager ResourceManager {
|
||||||
{
|
get {
|
||||||
get
|
if (object.ReferenceEquals(resourceMan, null)) {
|
||||||
{
|
|
||||||
if ((resourceMan == null))
|
|
||||||
{
|
|
||||||
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Mitria_Argument_Creater.Properties.Resources", typeof(Resources).Assembly);
|
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Mitria_Argument_Creater.Properties.Resources", typeof(Resources).Assembly);
|
||||||
resourceMan = temp;
|
resourceMan = temp;
|
||||||
}
|
}
|
||||||
return resourceMan;
|
return resourceMan;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대해 현재 스레드의 CurrentUICulture 속성을
|
/// 이 강력한 형식의 리소스 클래스를 사용하여 모든 리소스 조회에 대해 현재 스레드의 CurrentUICulture 속성을
|
||||||
/// 재정의합니다.
|
/// 재정의합니다.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
|
||||||
internal static global::System.Globalization.CultureInfo Culture
|
internal static global::System.Globalization.CultureInfo Culture {
|
||||||
{
|
get {
|
||||||
get
|
|
||||||
{
|
|
||||||
return resourceCulture;
|
return resourceCulture;
|
||||||
}
|
}
|
||||||
set
|
set {
|
||||||
{
|
|
||||||
resourceCulture = value;
|
resourceCulture = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,28 +1,24 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// 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.
|
// 이러한 변경 내용이 손실됩니다.
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
namespace Mitria_Argument_Creater.Properties
|
namespace Mitria_Argument_Creater.Properties {
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
|
||||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
|
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
{
|
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
|
||||||
public static Settings Default
|
public static Settings Default {
|
||||||
{
|
get {
|
||||||
get
|
|
||||||
{
|
|
||||||
return defaultInstance;
|
return defaultInstance;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup>
|
<startup>
|
||||||
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
|
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1" />
|
||||||
</startup>
|
</startup>
|
||||||
<runtime>
|
<runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
@@ -19,4 +19,4 @@
|
|||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
@@ -23,6 +23,7 @@ namespace Mitria_Minecraft_Launcher
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
public struct ClientVersion
|
public struct ClientVersion
|
||||||
{
|
{
|
||||||
|
@@ -1,8 +0,0 @@
|
|||||||
<linker>
|
|
||||||
<assembly fullname="System.Diagnostics.DiagnosticSource">
|
|
||||||
<type fullname="System.Diagnostics.Metrics.MetricsEventSource">
|
|
||||||
<!-- Used by System.Private.CoreLib via reflection to init the EventSource -->
|
|
||||||
<method name="GetInstance" />
|
|
||||||
</type>
|
|
||||||
</assembly>
|
|
||||||
</linker>
|
|
@@ -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)
|
switch (e.MessageType)
|
||||||
{
|
{
|
||||||
case Updater.GameUpdateManagerMessageType.First:
|
case GameUpdateManagerMessageType.First:
|
||||||
this.Invoke(new MethodInvoker(
|
this.Invoke(new MethodInvoker(
|
||||||
delegate ()
|
delegate ()
|
||||||
{
|
{
|
||||||
@@ -139,7 +139,7 @@ namespace Mitria_Minecraft_Launcher
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Updater.GameUpdateManagerMessageType.Second:
|
case GameUpdateManagerMessageType.Second:
|
||||||
this.Invoke(new MethodInvoker(delegate ()
|
this.Invoke(new MethodInvoker(delegate ()
|
||||||
{
|
{
|
||||||
label_Second.Text = "[" + e.MinValue.UnitSeparator() + "/" + e.MaxValue.UnitSeparator() + "]";
|
label_Second.Text = "[" + e.MinValue.UnitSeparator() + "/" + e.MaxValue.UnitSeparator() + "]";
|
||||||
@@ -149,7 +149,7 @@ namespace Mitria_Minecraft_Launcher
|
|||||||
}));
|
}));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case Updater.GameUpdateManagerMessageType.Message:
|
case GameUpdateManagerMessageType.Message:
|
||||||
this.Invoke(new MethodInvoker(delegate ()
|
this.Invoke(new MethodInvoker(delegate ()
|
||||||
{
|
{
|
||||||
textBox_ProgressLog.Text += e.Message + Environment.NewLine;
|
textBox_ProgressLog.Text += e.Message + Environment.NewLine;
|
||||||
|
@@ -9,12 +9,13 @@
|
|||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<RootNamespace>Mitria_Minecraft_Launcher</RootNamespace>
|
<RootNamespace>Mitria_Minecraft_Launcher</RootNamespace>
|
||||||
<AssemblyName>MitriaMLauncher</AssemblyName>
|
<AssemblyName>MitriaMLauncher</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
|
||||||
<Deterministic>false</Deterministic>
|
<Deterministic>false</Deterministic>
|
||||||
<NuGetPackageImportStamp>
|
<NuGetPackageImportStamp>
|
||||||
</NuGetPackageImportStamp>
|
</NuGetPackageImportStamp>
|
||||||
|
<TargetFrameworkProfile />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
@@ -70,8 +71,8 @@
|
|||||||
<Private>True</Private>
|
<Private>True</Private>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Core" />
|
<Reference Include="System.Core" />
|
||||||
<Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
<Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.8, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.3\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.8\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
|
<HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
|
||||||
@@ -279,7 +280,6 @@
|
|||||||
<Folder Include="API\" />
|
<Folder Include="API\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Content Include="ILLink\ILLink.Descriptors.LibraryBuild.xml" />
|
|
||||||
<Content Include="Program.Icon.ico" />
|
<Content Include="Program.Icon.ico" />
|
||||||
<None Include="Resources\Loading.gif" />
|
<None Include="Resources\Loading.gif" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
@@ -299,10 +299,10 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props'))" />
|
<Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props'))" />
|
||||||
<Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets'))" />
|
<Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets'))" />
|
||||||
<Error Condition="!Exists('..\packages\Fody.6.9.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.9.2\build\Fody.targets'))" />
|
|
||||||
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
|
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
|
||||||
|
<Error Condition="!Exists('..\packages\Fody.6.9.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.9.3\build\Fody.targets'))" />
|
||||||
</Target>
|
</Target>
|
||||||
<Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" />
|
<Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" />
|
||||||
<Import Project="..\packages\Fody.6.9.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.9.2\build\Fody.targets')" />
|
|
||||||
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
|
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
|
||||||
|
<Import Project="..\packages\Fody.6.9.3\build\Fody.targets" Condition="Exists('..\packages\Fody.6.9.3\build\Fody.targets')" />
|
||||||
</Project>
|
</Project>
|
@@ -19,7 +19,7 @@ namespace Mitria_Minecraft_Launcher.Properties {
|
|||||||
// 클래스에서 자동으로 생성되었습니다.
|
// 클래스에서 자동으로 생성되었습니다.
|
||||||
// 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을
|
// 멤버를 추가하거나 제거하려면 .ResX 파일을 편집한 다음 /str 옵션을 사용하여 ResGen을
|
||||||
// 다시 실행하거나 VS 프로젝트를 다시 빌드하십시오.
|
// 다시 실행하거나 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.Diagnostics.DebuggerNonUserCodeAttribute()]
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
internal class Resources {
|
internal class Resources {
|
||||||
|
@@ -1,27 +1,24 @@
|
|||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
// <auto-generated>
|
// <auto-generated>
|
||||||
// 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.
|
// 이러한 변경 내용이 손실됩니다.
|
||||||
// </auto-generated>
|
// </auto-generated>
|
||||||
//------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
namespace Mitria_Minecraft_Launcher.Properties {
|
||||||
namespace Mitria_Minecraft_Launcher.Properties
|
|
||||||
{
|
|
||||||
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
|
||||||
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
|
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
|
||||||
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
|
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
|
||||||
{
|
|
||||||
|
|
||||||
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
|
||||||
|
|
||||||
public static Settings Default
|
public static Settings Default {
|
||||||
{
|
get {
|
||||||
get
|
|
||||||
{
|
|
||||||
return defaultInstance;
|
return defaultInstance;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -119,13 +119,15 @@ namespace Mitria_Minecraft_Launcher.Updater
|
|||||||
|
|
||||||
GameUpdateManagerMessage(this, new GameUpdateManagerMessageEventArgs(GameUpdateManagerMessageType.First, 4, 9, "[4/9] Package Version Check"));
|
GameUpdateManagerMessage(this, new GameUpdateManagerMessageEventArgs(GameUpdateManagerMessageType.First, 4, 9, "[4/9] Package Version Check"));
|
||||||
Log.INFO("[Package] Version Check");
|
Log.INFO("[Package] Version Check");
|
||||||
|
var x = dataPatchInformation.PackageDirectorys;
|
||||||
|
|
||||||
thisVersion = Version.Parse(Settings.UserClientVersion.PackageVersion);
|
thisVersion = Version.Parse(Settings.UserClientVersion.PackageVersion);
|
||||||
remoteVersion = Version.Parse(dataPatchInformation.PackageVersion);
|
remoteVersion = Version.Parse(dataPatchInformation.PackageVersion);
|
||||||
CommonLibrary.Log.INFO("[Package] LocalVersion : " + thisVersion);
|
CommonLibrary.Log.INFO("[Package] LocalVersion : " + thisVersion);
|
||||||
CommonLibrary.Log.INFO("[Package] RemoteVersion : " + remoteVersion);
|
CommonLibrary.Log.INFO("[Package] RemoteVersion : " + remoteVersion);
|
||||||
result = remoteVersion.CompareTo(thisVersion);
|
result = remoteVersion.CompareTo(thisVersion);
|
||||||
|
|
||||||
//TODO: 만약 Major 버전이 바뀌면 전부삭제, 아니면 있는 폴더면 선별후 삭제
|
//TODO: 만약 Major 버전이 바뀌면 전부삭제, 아니면 있는 폴더면 선별후 삭제^
|
||||||
// 1 : 리모트가 큼, 0 : 같음, -1 리모트가 적음
|
// 1 : 리모트가 큼, 0 : 같음, -1 리모트가 적음
|
||||||
if (result == 0)
|
if (result == 0)
|
||||||
{
|
{
|
||||||
@@ -136,7 +138,6 @@ namespace Mitria_Minecraft_Launcher.Updater
|
|||||||
CommonLibrary.Log
|
CommonLibrary.Log
|
||||||
.INFO(string.Format("{0}", result == 1 ? "remote is the upper version" : "remote is the lower version"));
|
.INFO(string.Format("{0}", result == 1 ? "remote is the upper version" : "remote is the lower version"));
|
||||||
|
|
||||||
|
|
||||||
bool packageInitialization = true;
|
bool packageInitialization = true;
|
||||||
|
|
||||||
if (thisVersion.Major < remoteVersion.Major || thisVersion.Minor < remoteVersion.Minor)
|
if (thisVersion.Major < remoteVersion.Major || thisVersion.Minor < remoteVersion.Minor)
|
||||||
@@ -156,7 +157,6 @@ namespace Mitria_Minecraft_Launcher.Updater
|
|||||||
downloader.DownloadFile(downloadUrl, targetPath);
|
downloader.DownloadFile(downloadUrl, targetPath);
|
||||||
Log.INFO("[Package] Download End");
|
Log.INFO("[Package] Download End");
|
||||||
|
|
||||||
|
|
||||||
var rootDirectoryInfo = new System.IO.DirectoryInfo(System.IO.Path.GetFullPath(CommonLibrary.Extensions.PathCombineW(Settings.UserLauncherConfig.GameDirectory, Settings.NowProfile.ServerName)));
|
var rootDirectoryInfo = new System.IO.DirectoryInfo(System.IO.Path.GetFullPath(CommonLibrary.Extensions.PathCombineW(Settings.UserLauncherConfig.GameDirectory, Settings.NowProfile.ServerName)));
|
||||||
|
|
||||||
if (!rootDirectoryInfo.Exists)
|
if (!rootDirectoryInfo.Exists)
|
||||||
@@ -164,7 +164,7 @@ namespace Mitria_Minecraft_Launcher.Updater
|
|||||||
rootDirectoryInfo.Create();
|
rootDirectoryInfo.Create();
|
||||||
Log.INFO("[Package] +[D] " + rootDirectoryInfo.FullName);
|
Log.INFO("[Package] +[D] " + rootDirectoryInfo.FullName);
|
||||||
}
|
}
|
||||||
else if(packageInitialization)
|
else if (packageInitialization)
|
||||||
{
|
{
|
||||||
Log.INFO("[Package] Empty GameDirectory Start");
|
Log.INFO("[Package] Empty GameDirectory Start");
|
||||||
// 비우기 전에 스크린샷폴더 보존 /screenshots
|
// 비우기 전에 스크린샷폴더 보존 /screenshots
|
||||||
@@ -185,7 +185,7 @@ namespace Mitria_Minecraft_Launcher.Updater
|
|||||||
{
|
{
|
||||||
Log.INFO("[Package] Partial Clean GameDirectory Start");
|
Log.INFO("[Package] Partial Clean GameDirectory Start");
|
||||||
var tempPacker = new ProgressPacker();
|
var tempPacker = new ProgressPacker();
|
||||||
var list = tempPacker.GetTopLevelItem(targetPath);
|
var list = tempPacker.GetTopLevelItem(targetPath);
|
||||||
// 리스트에 있는 디렉토리와 파일 삭제
|
// 리스트에 있는 디렉토리와 파일 삭제
|
||||||
foreach (var item in list)
|
foreach (var item in list)
|
||||||
{
|
{
|
||||||
@@ -195,7 +195,7 @@ namespace Mitria_Minecraft_Launcher.Updater
|
|||||||
Extensions.DeleteDirectory(target);
|
Extensions.DeleteDirectory(target);
|
||||||
Log.INFO("[Package] -[D] " + target);
|
Log.INFO("[Package] -[D] " + target);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Extensions.DeleteFile(target);
|
Extensions.DeleteFile(target);
|
||||||
Log.INFO("[Package] -[F] " + target);
|
Log.INFO("[Package] -[F] " + target);
|
||||||
@@ -203,35 +203,6 @@ namespace Mitria_Minecraft_Launcher.Updater
|
|||||||
}
|
}
|
||||||
Log.INFO("[Package] Partial Clean GameDirectory End");
|
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();
|
var progressPacker = new ProgressPacker();
|
||||||
@@ -451,5 +422,4 @@ public class GameUpdateManagerMessageEventArgs : EventArgs
|
|||||||
MaxValue = maxValue;
|
MaxValue = maxValue;
|
||||||
Message = message;
|
Message = message;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
@@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="Costura.Fody" version="6.0.0" targetFramework="net472" developmentDependency="true" />
|
<package id="Costura.Fody" version="6.0.0" targetFramework="net472" developmentDependency="true" />
|
||||||
<package id="Fody" version="6.9.2" targetFramework="net472" developmentDependency="true" />
|
<package id="Fody" version="6.9.3" targetFramework="net481" developmentDependency="true" />
|
||||||
<package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net472" />
|
<package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net472" />
|
||||||
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
|
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="NETStandard.Library" version="2.0.3" targetFramework="net472" />
|
<package id="NETStandard.Library" version="2.0.3" targetFramework="net472" />
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
|
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Console" version="4.3.1" targetFramework="net472" />
|
<package id="System.Console" version="4.3.1" targetFramework="net472" />
|
||||||
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
|
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Diagnostics.DiagnosticSource" version="9.0.3" targetFramework="net472" />
|
<package id="System.Diagnostics.DiagnosticSource" version="9.0.8" targetFramework="net481" />
|
||||||
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net472" />
|
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net472" />
|
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net472" />
|
||||||
<package id="System.Globalization" version="4.3.0" targetFramework="net472" />
|
<package id="System.Globalization" version="4.3.0" targetFramework="net472" />
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<TargetFramework>net8.0-windows7.0</TargetFramework>
|
<TargetFramework>net9.0-windows7.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<UseWPF>true</UseWPF>
|
<UseWPF>true</UseWPF>
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
<TargetFramework>net9.0</TargetFramework>
|
||||||
<StartupObject>Mitria_Minecraft_Updater.Program</StartupObject>
|
<StartupObject>Mitria_Minecraft_Updater.Program</StartupObject>
|
||||||
<AssemblyName>mmu</AssemblyName>
|
<AssemblyName>mmu</AssemblyName>
|
||||||
<DebugType>embedded</DebugType>
|
<DebugType>embedded</DebugType>
|
||||||
|
@@ -253,6 +253,7 @@ namespace Mitria_Minecraft_Updater
|
|||||||
Console.WriteLine("Update Complete");
|
Console.WriteLine("Update Complete");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static void ComponentUpdate(string serverName, VersionType versionType)
|
public static void ComponentUpdate(string serverName, VersionType versionType)
|
||||||
{
|
{
|
||||||
CommonLibrary.DataPatchInformation dataPatchInformation = Settings.LoadDataPatchInformation(serverName);
|
CommonLibrary.DataPatchInformation dataPatchInformation = Settings.LoadDataPatchInformation(serverName);
|
||||||
|
Reference in New Issue
Block a user