diff --git a/Make-EXE/MainWindow.xaml.cs b/Make-EXE/MainWindow.xaml.cs index dcc980d..2fd008d 100644 --- 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 index 7533423..2c250a7 100644 --- a/Make-EXE/Make-EXE.csproj +++ b/Make-EXE/Make-EXE.csproj @@ -57,8 +57,8 @@ - - ..\..\..\ClassLibraries\WPF Auto Updater\WPF_Auto_Updater\bin\Release\WPF_Auto_Updater.dll + + ..\..\..\ClassLibraries\WPF Auto Updater\WPF_Auto_Updater\bin\Release\WPF-Auto-Update.dll diff --git a/Make-EXE/Properties/AssemblyInfo.cs b/Make-EXE/Properties/AssemblyInfo.cs index 81dd29a..c4a2f03 100644 --- 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 index 2923183..d4835eb 100644 --- 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); } }