diff --git a/Application/MainWindow/UpdateHandler.cs b/Application/MainWindow/UpdateHandler.cs index d51813b..82cc3d5 100644 --- a/Application/MainWindow/UpdateHandler.cs +++ b/Application/MainWindow/UpdateHandler.cs @@ -9,8 +9,8 @@ namespace FeedCenter private static void InitializeUpdate() { UpdateCheck.ApplicationName = Properties.Resources.ApplicationDisplayName; + UpdateCheck.UpdateServerType = ServerType.GitHub; UpdateCheck.UpdateServer = Settings.Default.VersionLocation; - UpdateCheck.UpdateFile = Settings.Default.VersionFile; UpdateCheck.ApplicationShutdown = ApplicationShutdown; UpdateCheck.ApplicationCurrentMessage = ApplicationCurrentMessage; UpdateCheck.ApplicationUpdateMessage = ApplicationUpdateMessage; diff --git a/Application/Properties/Settings.Designer.cs b/Application/Properties/Settings.Designer.cs index c7ffc8c..00cf9b0 100644 --- a/Application/Properties/Settings.Designer.cs +++ b/Application/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace FeedCenter.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.1.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -262,16 +262,7 @@ namespace FeedCenter.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("FeedCenterSetup.xml")] - public string VersionFile { - get { - return ((string)(this["VersionFile"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://server/FeedCenter/")] + [global::System.Configuration.DefaultSettingValueAttribute("https://api.github.com/repos/ckaczor/FeedCenter/releases/latest")] public string VersionLocation { get { return ((string)(this["VersionLocation"])); diff --git a/Application/Properties/Settings.settings b/Application/Properties/Settings.settings index 461a19a..62bdabb 100644 --- a/Application/Properties/Settings.settings +++ b/Application/Properties/Settings.settings @@ -62,11 +62,8 @@ Normal - - FeedCenterSetup.xml - - http://server/FeedCenter/ + https://api.github.com/repos/ckaczor/FeedCenter/releases/latest diff --git a/Application/app.config b/Application/app.config index 678a240..5631d43 100644 --- a/Application/app.config +++ b/Application/app.config @@ -82,11 +82,8 @@ 01:00:00 - - FeedCenterSetup.xml - - http://server/FeedCenter/ + https://api.github.com/repos/ckaczor/FeedCenter/releases/latest diff --git a/Common b/Common index 81ef8f4..88149c4 160000 --- a/Common +++ b/Common @@ -1 +1 @@ -Subproject commit 81ef8f451c5ceada2ed704ecaaa789e623a7352d +Subproject commit 88149c43c39f9e647945114b71746736d5d9cc02 diff --git a/appveyor.yml b/appveyor.yml index 3f8bc8d..7cacc30 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.{build} +version: 1.0.0.{build} pull_requests: do_not_increment_build_number: true skip_tags: true