diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2018-04-16 22:59:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-16 22:59:38 +0300 |
| commit | fa63f9098dbb40cf0d212d73778afe9421ee7276 (patch) | |
| tree | bcca1403f13044af7dd0d5c42226714598ab4139 /main/src/core | |
| parent | a141d16f18c7adcb5b6163d02a3effc00bc1ac1d (diff) | |
| parent | aab87b65567b05faaa1558b7b836bb3e5bccbf8a (diff) | |
Merge pull request #4577 from mono/backport-pr-4555-to-master
[master] Fix 591345: [Updater] \u0022Updates have been downloaded and are ready to …
Diffstat (limited to 'main/src/core')
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Core.Setup/UpdateChannel.cs | 8 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/UpdateService.cs | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Setup/UpdateChannel.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Setup/UpdateChannel.cs index 04b80584f3..0b0cee17f1 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Setup/UpdateChannel.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.Setup/UpdateChannel.cs @@ -60,7 +60,7 @@ namespace MonoDevelop.Core.Setup return false; } - return a.Idx == Idx; + return a.Id == Id; } public bool Equals (UpdateChannel a) @@ -68,7 +68,7 @@ namespace MonoDevelop.Core.Setup if ((object)a == null) { return false; } - return (a.Idx == Idx); + return (a.Id == Id); } public static bool operator == (UpdateChannel a, UpdateChannel b) @@ -79,7 +79,7 @@ namespace MonoDevelop.Core.Setup if (Object.ReferenceEquals (a, null) || Object.ReferenceEquals (b, null)) { return false; } - return a.Idx == b.Idx; + return a.Id == b.Id; } public static bool operator != (UpdateChannel a, UpdateChannel b) @@ -90,7 +90,7 @@ namespace MonoDevelop.Core.Setup if (Object.ReferenceEquals (a, null) || Object.ReferenceEquals (b, null)) { return true; } - return a.Idx != b.Idx; + return a.Id != b.Id; } public static bool operator <= (UpdateChannel a, UpdateChannel b) diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/UpdateService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/UpdateService.cs index dff987d8c7..1a8bfb5e26 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/UpdateService.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Updater/UpdateService.cs @@ -89,7 +89,16 @@ namespace MonoDevelop.Ide.Updater var updateChannelId = PropertyService.Get<string> ("MonoDevelop.Ide.AddinUpdater.UpdateChannel"); if (string.IsNullOrEmpty (updateChannelId)) return UpdateChannel.FromUpdateLevel (PropertyService.Get ("MonoDevelop.Ide.AddinUpdater.UpdateLevel", UpdateLevel.Stable)); - return new UpdateChannel (updateChannelId, updateChannelId, "", 0); + if (UpdateChannel.Stable.Id == updateChannelId) + return UpdateChannel.Stable; + else if (UpdateChannel.Beta.Id == updateChannelId) + return UpdateChannel.Beta; + else if (UpdateChannel.Alpha.Id == updateChannelId) + return UpdateChannel.Alpha; + else if (UpdateChannel.Test.Id == updateChannelId) + return UpdateChannel.Test; + else + return new UpdateChannel (updateChannelId, updateChannelId, "", 0); } set { PropertyService.Set ("MonoDevelop.Ide.AddinUpdater.UpdateChannel", value.Id); |