Bug fix in auto updater.

bitbound · Feb 26, 2017 · a383560 · a383560
1 parent bc65b8f
commit a383560
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/Make-EXE/MainWindow.xaml.cs b/Make-EXE/MainWindow.xaml.cs
@@ -31,7 +31,7 @@ public MainWindow()
             foreach (var arg in Environment.GetCommandLineArgs().Skip(1))
             {
                 // If true, invalid argument was passed.
-                if (arg.ToLower() != "-file" && arg.ToLower() != "-silent" && arg.ToLower() != "-embed" && !File.Exists(arg.ToLower()))
+                if (arg.ToLower() != "-file" && arg.ToLower() != "-silent" && arg.ToLower() != "-wpfautoupdate" && arg.ToLower() != "-embed" && !File.Exists(arg.ToLower()))
                 {
                     var sb = new StringBuilder();
                     sb.AppendLine("Command Line Syntax");
@@ -73,9 +73,10 @@ public MainWindow()
                 }
             }
             InitializeComponent();
-            WPF_Auto_Updater.Updater.RemoteFileURI = "https://translucency.info/Downloads/" + WPF_Auto_Updater.Updater.FileName;
-            WPF_Auto_Updater.Updater.ServiceURI = "https://translucency.info/Services/VersionCheck.cshtml?Path=/Downloads/" + WPF_Auto_Updater.Updater.FileName;
-            WPF_Auto_Updater.Updater.CheckCommandLineArgs();
+            WPF_Auto_Update.Updater.RemoteFileURI = "https://translucency.info/Downloads/" + WPF_Auto_Update.Updater.FileName;
+            WPF_Auto_Update.Updater.ServiceURI = "https://translucency.info/Services/VersionCheck.cshtml?Path=/Downloads/" + WPF_Auto_Update.Updater.FileName;
+            WPF_Auto_Update.Updater.UpdateTimeout = Duration.Forever;
+            WPF_Auto_Update.Updater.CheckCommandLineArgs();
         }
 
         private void Current_DispatcherUnhandledException(Object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
@@ -102,7 +103,7 @@ private void Current_DispatcherUnhandledException(Object sender, System.Windows.
 
         private void Window_Loaded(Object sender, RoutedEventArgs e)
         {
-            WPF_Auto_Updater.Updater.CheckForUpdates(true);
+            WPF_Auto_Update.Updater.CheckForUpdates(true);
             if (targetPath != null)
             {
                 this.Hide();

diff --git a/Make-EXE/Make-EXE.csproj b/Make-EXE/Make-EXE.csproj
@@ -57,8 +57,8 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="WPF_Auto_Updater">
-      <HintPath>..\..\..\ClassLibraries\WPF Auto Updater\WPF_Auto_Updater\bin\Release\WPF_Auto_Updater.dll</HintPath>
+    <Reference Include="WPF-Auto-Update">
+      <HintPath>..\..\..\ClassLibraries\WPF Auto Updater\WPF_Auto_Updater\bin\Release\WPF-Auto-Update.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Make-EXE/Properties/AssemblyInfo.cs b/Make-EXE/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.2.0")]
+[assembly: AssemblyFileVersion("1.2.2.0")]
 [assembly: Guid("eea5aba0-927d-44ef-95ff-b4eccca23cfe")]
 
diff --git a/Make-EXE/Windows/AssemblyWindow.xaml.cs b/Make-EXE/Windows/AssemblyWindow.xaml.cs
@@ -138,6 +138,7 @@ private void buttonMake_Click(object sender, RoutedEventArgs e)
 
         private void buttonCancel_Click(object sender, RoutedEventArgs e)
         {
+            this.Close();
             Environment.Exit(0);
         }
     }
-Original file line number
+Diff line change
@@ Expand Up @@
             private void buttonCancel_Click(object sender, RoutedEventArgs e)
             {
+                this.Close();
                 Environment.Exit(0);
             }
         }
@@ Expand Down @@