diff --git a/ArinWarev1/ECO2_2025V1.vbproj b/ArinWarev1/ECO2_2025V1.vbproj index 3cfd56d..86c1725 100644 --- a/ArinWarev1/ECO2_2025V1.vbproj +++ b/ArinWarev1/ECO2_2025V1.vbproj @@ -719,7 +719,7 @@ DS2.xsd - + PreserveNewest @@ -845,10 +845,10 @@ PreserveNewest - + PreserveNewest - + PreserveNewest diff --git a/ArinWarev1/MdiMain.vb b/ArinWarev1/MdiMain.vb index 238758c..5b67d8e 100644 --- a/ArinWarev1/MdiMain.vb +++ b/ArinWarev1/MdiMain.vb @@ -308,7 +308,15 @@ Public Class MdiMain Dim nameOnly As String = System.IO.Path.GetFileNameWithoutExtension(zipfilename) Dim zipcheckfile As String = zipfilename + ".complete" - If System.IO.File.Exists(zipcheckfile) Then Continue For + Dim fi As New System.IO.FileInfo(zipfilename) + Dim completefileinfo As String = fi.LastWriteTime.ToString("yyyyMMddHHmmss.fff") + "|" + fi.Length.ToString() + If System.IO.File.Exists(zipcheckfile) Then + '//해당파일의 날짜와 용량이 내부에 기록되어있다 그정보가 틀리다면 진행을한다. + Dim fileinfo As String = System.IO.File.ReadAllText(zipcheckfile, System.Text.Encoding.UTF8).Trim() + If fileinfo.Equals(completefileinfo) Then + Continue For + End If + End If Dim targetPath As New DirectoryInfo(Path.Combine(Application.StartupPath, nameOnly)) @@ -324,7 +332,8 @@ Public Class MdiMain MessageBox.Show("파일 압축 해제에 실패했습니다." & vbCrLf & "일부 기능이 제한될 수 있습니다.", "경고", MessageBoxButtons.OK, MessageBoxIcon.Warning) Else - System.IO.File.WriteAllText(zipcheckfile, "complete", System.Text.Encoding.UTF8) + + System.IO.File.WriteAllText(zipcheckfile, completefileinfo, System.Text.Encoding.UTF8) End If Next diff --git a/ArinWarev1/EBWebView.zip b/ArinWarev1/Template/EBWebView.zip similarity index 100% rename from ArinWarev1/EBWebView.zip rename to ArinWarev1/Template/EBWebView.zip diff --git a/ArinWarev1/WebView2Runtime.zip b/ArinWarev1/Template/WebView2Runtime.zip similarity index 100% rename from ArinWarev1/WebView2Runtime.zip rename to ArinWarev1/Template/WebView2Runtime.zip diff --git a/ArinWarev1/wwwroot.zip b/ArinWarev1/Template/wwwroot.zip similarity index 95% rename from ArinWarev1/wwwroot.zip rename to ArinWarev1/Template/wwwroot.zip index 7867d2a..30cfb5e 100644 Binary files a/ArinWarev1/wwwroot.zip and b/ArinWarev1/Template/wwwroot.zip differ diff --git a/Setup1/Setup1.vdproj b/Setup1/Setup1.vdproj index 18efc0f..12a72f9 100644 --- a/Setup1/Setup1.vdproj +++ b/Setup1/Setup1.vdproj @@ -21,7 +21,13 @@ } "Entry" { - "MsmKey" = "8:_1AF1DCC296EB4AD58414C003DFEF6A61" + "MsmKey" = "8:_1B82797EE76C4687B40F102FB1C3656C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_26069AE042094C99B6D68EFBF0407E39" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -57,6 +63,12 @@ } "Entry" { + "MsmKey" = "8:_3B45869800BE418CB04B7AAE60ECC4C3" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_3BE85EAE54344746B9CBC3B7045AB889" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -64,6 +76,12 @@ "Entry" { "MsmKey" = "8:_3E4ACF51547513CA033A352F53714D81" + "OwnerKey" = "8:_5C78790BE844478C9C716929BE45A267" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_3E4ACF51547513CA033A352F53714D81" "OwnerKey" = "8:_D541DEE33C7640AC935C339497D767B6" "MsmSig" = "8:_UNDEFINED" } @@ -75,12 +93,6 @@ } "Entry" { - "MsmKey" = "8:_3E4ACF51547513CA033A352F53714D81" - "OwnerKey" = "8:_5C78790BE844478C9C716929BE45A267" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_3F3FFE1FF99E4444B306BE60F3FB6997" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -147,6 +159,12 @@ } "Entry" { + "MsmKey" = "8:_6913B5242057436886DF5DB3C58CEB55" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_691C9DA50302E0464D0E64E97C1242A2" "OwnerKey" = "8:_29FE169CCEBDEB4C07246AF3E1D7D1EF" "MsmSig" = "8:_UNDEFINED" @@ -213,12 +231,6 @@ } "Entry" { - "MsmKey" = "8:_ABAD4F98418842A7AC6C7239653C8DBF" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_AD951B42EF214BF0882807B6B1358B02" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -237,12 +249,6 @@ } "Entry" { - "MsmKey" = "8:_CC78EB0F07814AA0BE37D7466D8929FB" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_CCE4CF0D896E4F54A89EC7254893A356" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -291,74 +297,14 @@ } "Entry" { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_CE47408D9D1AC3C1A1C987DBD7CA7F43" + "MsmKey" = "8:_FE8E361859744E078E1D240184E37E6C" + "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_5C78790BE844478C9C716929BE45A267" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_D541DEE33C7640AC935C339497D767B6" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3E4ACF51547513CA033A352F53714D81" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_85623F2834184CA2A083635A5BAE18C9" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_55C7A65939B117D312DD5A518DF4B270" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3A96F072BA7F90374AF5E6A6BCC34084" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4608D921DC658CD173C039AF16C5E283" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_59B3512FD7C9D2430BF7B3C6379B9C9D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_36E293D174759AFAAD42CF70AA63402C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_ECC375834F59CEFC1D106FE35A78C9C5" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_29FE169CCEBDEB4C07246AF3E1D7D1EF" + "OwnerKey" = "8:_E5FD918B4BE4C70000A151506717226F" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -370,19 +316,13 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_691C9DA50302E0464D0E64E97C1242A2" + "OwnerKey" = "8:_ECC375834F59CEFC1D106FE35A78C9C5" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_4B290A29E53110D5B83008A4DD0873A2" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_88E9E9750BBC8DE9EFD32EE0994A73F2" + "OwnerKey" = "8:_D541DEE33C7640AC935C339497D767B6" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -394,7 +334,13 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_E5FD918B4BE4C70000A151506717226F" + "OwnerKey" = "8:_88E9E9750BBC8DE9EFD32EE0994A73F2" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_85623F2834184CA2A083635A5BAE18C9" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -421,6 +367,72 @@ "OwnerKey" = "8:_ADE6E41741BD7CD14907A44E54816E0D" "MsmSig" = "8:_UNDEFINED" } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_CE47408D9D1AC3C1A1C987DBD7CA7F43" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_691C9DA50302E0464D0E64E97C1242A2" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_5C78790BE844478C9C716929BE45A267" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_3E4ACF51547513CA033A352F53714D81" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_59B3512FD7C9D2430BF7B3C6379B9C9D" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_55C7A65939B117D312DD5A518DF4B270" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4B290A29E53110D5B83008A4DD0873A2" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_4608D921DC658CD173C039AF16C5E283" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_3A96F072BA7F90374AF5E6A6BCC34084" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_36E293D174759AFAAD42CF70AA63402C" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_29FE169CCEBDEB4C07246AF3E1D7D1EF" + "MsmSig" = "8:_UNDEFINED" + } } "Configurations" { @@ -556,10 +568,30 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1AF1DCC296EB4AD58414C003DFEF6A61" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1B82797EE76C4687B40F102FB1C3656C" { - "SourcePath" = "8:C:\\eco2\\debug_2016\\wwwroot.zip" - "TargetName" = "8:wwwroot.zip" + "SourcePath" = "8:..\\ArinWarev1\\Template\\EBWebView.zip" + "TargetName" = "8:EBWebView.zip" + "Tag" = "8:" + "Folder" = "8:_957C6D0C8FC44AC0B56EA59602B3F5E3" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_26069AE042094C99B6D68EFBF0407E39" + { + "SourcePath" = "8:..\\ArinWarev1\\Template\\Sample.tpl" + "TargetName" = "8:Sample.tpl" "Tag" = "8:" "Folder" = "8:_957C6D0C8FC44AC0B56EA59602B3F5E3" "Condition" = "8:" @@ -709,6 +741,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3B45869800BE418CB04B7AAE60ECC4C3" + { + "SourcePath" = "8:..\\ArinWarev1\\Template\\Sample" + "TargetName" = "8:Sample" + "Tag" = "8:" + "Folder" = "8:_957C6D0C8FC44AC0B56EA59602B3F5E3" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3BE85EAE54344746B9CBC3B7045AB889" { "SourcePath" = "8:C:\\ECO2\\debug_2016\\Data\\weather_river.dat" @@ -975,6 +1027,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6913B5242057436886DF5DB3C58CEB55" + { + "SourcePath" = "8:..\\ArinWarev1\\Template\\WebView2Runtime.zip" + "TargetName" = "8:WebView2Runtime.zip" + "Tag" = "8:" + "Folder" = "8:_957C6D0C8FC44AC0B56EA59602B3F5E3" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_691C9DA50302E0464D0E64E97C1242A2" { "AssemblyRegister" = "3:1" @@ -1261,26 +1333,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_ABAD4F98418842A7AC6C7239653C8DBF" - { - "SourcePath" = "8:C:\\eco2\\debug_2016\\EBWebView.zip" - "TargetName" = "8:EBWebView.zip" - "Tag" = "8:" - "Folder" = "8:_957C6D0C8FC44AC0B56EA59602B3F5E3" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AD951B42EF214BF0882807B6B1358B02" { "SourcePath" = "8:C:\\ECO2\\debug_2016\\Data\\weather_supdo.dat" @@ -1363,26 +1415,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CC78EB0F07814AA0BE37D7466D8929FB" - { - "SourcePath" = "8:C:\\eco2\\debug_2016\\WebView2Runtime.zip" - "TargetName" = "8:WebView2Runtime.zip" - "Tag" = "8:" - "Folder" = "8:_957C6D0C8FC44AC0B56EA59602B3F5E3" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CCE4CF0D896E4F54A89EC7254893A356" { "SourcePath" = "8:C:\\ECO2\\debug_2016\\Data\\weather_cha.dat" @@ -1578,6 +1610,26 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FE8E361859744E078E1D240184E37E6C" + { + "SourcePath" = "8:..\\ArinWarev1\\Template\\wwwroot.zip" + "TargetName" = "8:wwwroot.zip" + "Tag" = "8:" + "Folder" = "8:_957C6D0C8FC44AC0B56EA59602B3F5E3" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } } "FileType" { @@ -1668,7 +1720,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:ECO2_2025V1" "ProductCode" = "8:{1C694875-DBD9-43E7-A9DC-0EEE63429810}" - "PackageCode" = "8:{243E9F17-5190-4A4F-8AF7-6017B7B7685C}" + "PackageCode" = "8:{4476376D-5BCD-4B0F-B2CB-BF13909AC674}" "UpgradeCode" = "8:{650A91F6-635B-4C09-8A64-C123C180E487}" "AspNetVersion" = "8:2.0.50727.0" "RestartWWWService" = "11:FALSE"