diff --git a/.gitignore b/.gitignore index 7efd73e..eeac0c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ -/source/Gamer_Clock/Gamer_Clock.csproj.user -/source/Gamer_Clock/bin -/source/Gamer_Clock/obj -/source/Gamer_Clock/bld -/source/Gamer_Clock/bin -/source/packages -/source/**/*.suo -*.user -*.log -source/.vs/Gamer_Clock/* \ No newline at end of file +/source/**/**.csproj.user +/source/**/bin +/source/**/obj +/source/**/bld +/source/**/bin +/source/packages +/source/**/*.suo +*.user +*.log +source/.vs/**/* \ No newline at end of file diff --git a/Gamer Clock/Gamer_Clock.exe b/Gamer Clock/Gamer_Clock.exe index 3a71e79..c501900 100644 Binary files a/Gamer Clock/Gamer_Clock.exe and b/Gamer Clock/Gamer_Clock.exe differ diff --git a/Gamer Clock/Gamer_Clock_Update.exe b/Gamer Clock/Gamer_Clock_Update.exe index d8c308c..aff9d3d 100644 Binary files a/Gamer Clock/Gamer_Clock_Update.exe and b/Gamer Clock/Gamer_Clock_Update.exe differ diff --git a/README.md b/README.md index 8985bf4..088a8d2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Gamer Clock for OSD 1.0.0.2 +# Gamer Clock for OSD 1.0.0.3 ## **English** ## Introduce @@ -33,6 +33,9 @@ You can Update at "Option" Window. Just Click "Update" button. May be Gamer Cloc ## ChangeLog --- +### 1.0.0.3 +- Fix can't update bug + ### 1.0.0.2 - Prepare for github release - Modified some URL for github release @@ -78,6 +81,9 @@ Riva Turner 를 이용한 **게이머**를 위한 시계 입니다. ## 체인지로그 --- +### 1.0.0.3 +- 업데이트가 되지 않는 버그 수정 + ### 1.0.0.2 - github 릴리즈를 위한 소소한 변경 - github 릴리즈를 위한 배포 방식 변경으로 인한 일부 내부 URL 변경 diff --git a/Source/Gamer_Clock/Form2.vb b/Source/Gamer_Clock/Form2.vb index ffef545..bc947c9 100644 --- a/Source/Gamer_Clock/Form2.vb +++ b/Source/Gamer_Clock/Form2.vb @@ -48,7 +48,6 @@ Public Class Form2 Private Sub Form2_Load(sender As Object, e As EventArgs) Handles MyBase.Load CloseButton.Disable(Me) - My.Computer.Network.DownloadFile("https://github.com/icaros7/GamerClock/raw/master/Gamer%20Clock/Gamer_Clock.exe", "Gamer_Clock.exe") Me.Location = Screen.AllScreens(My.Settings.Main_Monitor - 1).Bounds.Location + New Point(Screen.AllScreens(My.Settings.Main_Monitor - 1).WorkingArea.Width / 2 - Me.Width / 2, Screen.AllScreens(My.Settings.Main_Monitor - 1).WorkingArea.Height / 2 - Me.Height / 2) Dim Cnt As Int32 = Screen.AllScreens.Length Dim i As Int32 = 1 @@ -121,7 +120,7 @@ Public Class Form2 End Sub Private Sub Cancel_btn_Click(sender As Object, e As EventArgs) Handles Cancel_btn.Click - Dim NoSave = MsgBox("저장 하지 않고 종료하시겠습니까?", vbExclamation + vbYesNoCancel, "취소") + Dim NoSave = MsgBox("저장 하지 않고 종료하시겠습니까?", vbExclamation + vbYesNo, "취소") If NoSave = vbYes Then Me.Hide() End If @@ -147,7 +146,7 @@ Public Class Form2 If MsgBox("새로운 업데이트가 있습니다. 설치 하시겠습니까?" + vbCrLf + vbCrLf + "설치된 버전 : " + CurrentVersion + vbCrLf + "최신 버전 : " + LastVersion, vbQuestion + vbYesNo, "업데이트") = vbYes Then On Error GoTo UpdateError - My.Computer.Network.DownloadFile("https://github.com/icaros7/GamerClock/raw/master/Gamer%20Clock/Gamer_Clock.exe", "Gamer_Clock.exe") + Shell(Application.StartupPath + "\Gamer_Clock_Update.exe") Else MsgBox("가급적 최신 버전 사용을 권장합니다.", vbCritical, "안내") Exit Sub diff --git a/Source/Gamer_Clock/Gamer_Clock.vbproj b/Source/Gamer_Clock/Gamer_Clock.vbproj index 344059a..61d3c10 100644 --- a/Source/Gamer_Clock/Gamer_Clock.vbproj +++ b/Source/Gamer_Clock/Gamer_Clock.vbproj @@ -29,8 +29,8 @@ Gamer Clock for OSD iHomin Gamer Clock for OSD - 2 - 1.0.0.2 + 3 + 1.0.0.3 false true true diff --git a/Source/Gamer_Clock/My Project/AssemblyInfo.vb b/Source/Gamer_Clock/My Project/AssemblyInfo.vb index 73ff748..f0c5bf2 100644 --- a/Source/Gamer_Clock/My Project/AssemblyInfo.vb +++ b/Source/Gamer_Clock/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' 지정되도록 할 수 있습니다. ' - - + + diff --git a/Source/Gamer_Clock_Update/Program.cs b/Source/Gamer_Clock_Update/Program.cs index 2b8b3ce..143b1d8 100644 --- a/Source/Gamer_Clock_Update/Program.cs +++ b/Source/Gamer_Clock_Update/Program.cs @@ -18,6 +18,11 @@ static void Main(string[] args) { if (System.IO.File.Exists("Gamer_Clock.exe")) { + foreach (var process in Process.GetProcessesByName("Gamer_Clock")) + { + process.Kill(); + } + System.Threading.Thread.Sleep(1000); System.IO.File.Delete("Gamer_Clock.exe"); WebClient we = new WebClient(); we.DownloadFile("https://raw.githubusercontent.com/icaros7/GamerClock/master/Gamer%20Clock/Gamer_Clock.exe", @"Gamer_Clock.exe"); diff --git a/Source/Gamer_Clock_Update/bin/Release/Gamer_Clock_Update.exe b/Source/Gamer_Clock_Update/bin/Release/Gamer_Clock_Update.exe deleted file mode 100644 index a6bae0d..0000000 Binary files a/Source/Gamer_Clock_Update/bin/Release/Gamer_Clock_Update.exe and /dev/null differ diff --git a/Source/Gamer_Clock_Update/bin/Release/Gamer_Clock_Update.exe.config b/Source/Gamer_Clock_Update/bin/Release/Gamer_Clock_Update.exe.config deleted file mode 100644 index 00bfd11..0000000 --- a/Source/Gamer_Clock_Update/bin/Release/Gamer_Clock_Update.exe.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Source/Gamer_Clock_Update/bin/Release/Gamer_Clock_Update.pdb b/Source/Gamer_Clock_Update/bin/Release/Gamer_Clock_Update.pdb deleted file mode 100644 index c9edaec..0000000 Binary files a/Source/Gamer_Clock_Update/bin/Release/Gamer_Clock_Update.pdb and /dev/null differ diff --git a/Source/Gamer_Clock_Update/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Source/Gamer_Clock_Update/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 6c6bc60..0000000 Binary files a/Source/Gamer_Clock_Update/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ diff --git a/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.csproj.CoreCompileInputs.cache b/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.csproj.CoreCompileInputs.cache deleted file mode 100644 index e001088..0000000 --- a/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -26d8c2d85edb17ee498da4e4815b5c3a8da7fe71 diff --git a/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.csproj.FileListAbsolute.txt b/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.csproj.FileListAbsolute.txt deleted file mode 100644 index 3089aa0..0000000 --- a/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,7 +0,0 @@ -E:\workspace\GamerClock\Source\Gamer_Clock_Update\bin\Release\Gamer_Clock_Update.exe.config -E:\workspace\GamerClock\Source\Gamer_Clock_Update\bin\Release\Gamer_Clock_Update.exe -E:\workspace\GamerClock\Source\Gamer_Clock_Update\bin\Release\Gamer_Clock_Update.pdb -E:\workspace\GamerClock\Source\Gamer_Clock_Update\obj\Release\Gamer_Clock_Update.csproj.CoreCompileInputs.cache -E:\workspace\GamerClock\Source\Gamer_Clock_Update\obj\Release\Gamer_Clock_Update.exe -E:\workspace\GamerClock\Source\Gamer_Clock_Update\obj\Release\Gamer_Clock_Update.pdb -E:\workspace\GamerClock\Source\Gamer_Clock_Update\obj\Release\Gamer_Clock_Update.csprojAssemblyReference.cache diff --git a/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.csprojAssemblyReference.cache b/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.csprojAssemblyReference.cache deleted file mode 100644 index 5b44899..0000000 Binary files a/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.csprojAssemblyReference.cache and /dev/null differ diff --git a/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.exe b/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.exe deleted file mode 100644 index a6bae0d..0000000 Binary files a/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.exe and /dev/null differ diff --git a/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.pdb b/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.pdb deleted file mode 100644 index c9edaec..0000000 Binary files a/Source/Gamer_Clock_Update/obj/Release/Gamer_Clock_Update.pdb and /dev/null differ diff --git a/Source/Gamer_Clock_Update/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/Source/Gamer_Clock_Update/obj/Release/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs deleted file mode 100644 index e69de29..0000000 diff --git a/Source/Gamer_Clock_Update/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/Source/Gamer_Clock_Update/obj/Release/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs deleted file mode 100644 index e69de29..0000000 diff --git a/Source/Gamer_Clock_Update/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/Source/Gamer_Clock_Update/obj/Release/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs deleted file mode 100644 index e69de29..0000000