Merge branch 'next' into next

Author: comintern

RetailCoder.VBE/App.cs

@@ -13,8 +13,10 @@
 using System.Globalization;
 using System.Linq;
 using System.Windows.Forms;
+using Rubberduck.UI.Command;
 using Rubberduck.UI.Command.MenuItems.CommandBars;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
+using Rubberduck.VersionCheck;
 
 namespace Rubberduck
 {
@@ -28,6 +30,8 @@ public sealed class App : IDisposable
         private readonly IAppMenu _appMenus;
         private readonly RubberduckCommandBar _stateBar;
         private readonly IRubberduckHooks _hooks;
+        private readonly IVersionCheck _version;
+        private readonly CommandBase _checkVersionCommand;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
@@ -39,7 +43,9 @@ public App(IVBE vbe,
             IGeneralConfigService configService,
             IAppMenu appMenus,
             RubberduckCommandBar stateBar,
-            IRubberduckHooks hooks)
+            IRubberduckHooks hooks,
+            IVersionCheck version,
+            CommandBase checkVersionCommand)
         {
             _vbe = vbe;
             _messageBox = messageBox;
@@ -49,6 +55,8 @@ public App(IVBE vbe,
             _appMenus = appMenus;
             _stateBar = stateBar;
             _hooks = hooks;
+            _version = version;
+            _checkVersionCommand = checkVersionCommand;
 
             _hooks.MessageReceived += _hooks_MessageReceived;
             _configService.SettingsChanged += _configService_SettingsChanged;
@@ -158,6 +166,11 @@ public void Startup()
             _stateBar.SetStatusLabelCaption(ParserState.Pending);
             _stateBar.EvaluateCanExecute(_parser.State);
             UpdateLoggingLevel();
+
+            if (_config.UserSettings.GeneralSettings.CheckVersion)
+            {
+                _checkVersionCommand.Execute(null);
+            }
         }
 
         public void Shutdown()
@@ -229,8 +242,8 @@ private void CheckForLegacyIndenterSettings()
 
         private void LogRubberduckSart()
         {
-            var version = GetType().Assembly.GetName().Version.ToString();
-            GlobalDiagnosticsContext.Set("RubberduckVersion", version);
+            var version = _version.CurrentVersion;
+            GlobalDiagnosticsContext.Set("RubberduckVersion", version.ToString());
             var headers = new List<string>
             {
                 string.Format("Rubberduck version {0} loading:", version),

RetailCoder.VBE/Extension.cs

@@ -172,6 +172,7 @@ private void InitializeAddIn()
             {
                 splash = new Splash
                 {
+                    // note: IVersionCheck.CurrentVersion could return this string.
                     Version = string.Format("version {0}", Assembly.GetExecutingAssembly().GetName().Version)
                 };
                 splash.Show();

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -70,6 +70,7 @@ public override void Load()
             Bind<TestExplorerModel>().ToSelf().InSingletonScope();
             Bind<IOperatingSystem>().To<WindowsOperatingSystem>().InSingletonScope();
 
+            Bind<CommandBase>().To<VersionCheckCommand>().WhenInjectedExactlyInto<App>();
             BindCodeInspectionTypes();
 
             var assemblies = new[]

RetailCoder.VBE/Rubberduck.csproj

@@ -232,6 +232,10 @@
     <Reference Include="extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
+      <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="ICSharpCode.AvalonEdit">
       <HintPath>..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
     </Reference>
@@ -281,6 +285,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Printing" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Windows.Forms" />
@@ -493,6 +498,7 @@
     <Compile Include="UI\CodeExplorer\Commands\AddClassModuleCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\AddStdModuleCommand.cs" />
     <Compile Include="UI\CodeExplorer\Commands\AddTestModuleCommand.cs" />
+    <Compile Include="VersionCheck\IVersionCheck.cs" />
     <Compile Include="UI\Command\MenuItems\CommandBars\AppCommandBarBase.cs" />
     <Compile Include="UI\Command\MenuItems\CommandBars\ContextSelectionLabelMenuItem.cs" />
     <Compile Include="UI\Command\MenuItems\CommandBars\IContextFormatter.cs" />
@@ -507,6 +513,7 @@
     <Compile Include="UI\Command\MenuItems\RegexAssistantCommand.cs" />
     <Compile Include="UI\Command\MenuItems\RegexAssistantCommandMenuItem.cs" />
     <Compile Include="UI\Command\MenuItems\ParentMenus\ToolsParentMenu.cs" />
+    <Compile Include="UI\Command\VersionCheckCommand.cs" />
     <Compile Include="UI\Controls\BindableTextEditor.cs" />
     <Compile Include="UI\Controls\LinkButton.xaml.cs">
       <DependentUpon>LinkButton.xaml</DependentUpon>

RetailCoder.VBE/Settings/GeneralSettings.cs

@@ -9,6 +9,7 @@ public interface IGeneralSettings
     {
         DisplayLanguageSetting Language { get; set; }
         bool ShowSplash { get; set; }
+        bool CheckVersion { get; set; }
         bool SmartIndenterPrompted { get; set; }
         bool AutoSaveEnabled { get; set; }
         int AutoSavePeriod { get; set; }
@@ -21,6 +22,7 @@ public class GeneralSettings : IGeneralSettings, IEquatable<GeneralSettings>
     {
         public DisplayLanguageSetting Language { get; set; }
         public bool ShowSplash { get; set; }
+        public bool CheckVersion { get; set; }
         public bool SmartIndenterPrompted { get; set; }
         public bool AutoSaveEnabled { get; set; }
         public int AutoSavePeriod { get; set; }
@@ -51,6 +53,7 @@ public GeneralSettings()
         {
             Language = new DisplayLanguageSetting("en-US");
             ShowSplash = true;
+            CheckVersion = true;
             SmartIndenterPrompted = false;
             AutoSaveEnabled = false;
             AutoSavePeriod = 10;
@@ -63,6 +66,7 @@ public bool Equals(GeneralSettings other)
             return other != null &&
                    Language.Equals(other.Language) &&
                    ShowSplash == other.ShowSplash &&
+                   CheckVersion == other.CheckVersion &&
                    SmartIndenterPrompted == other.SmartIndenterPrompted &&
                    AutoSaveEnabled == other.AutoSaveEnabled &&
                    AutoSavePeriod == other.AutoSavePeriod &&

RetailCoder.VBE/UI/About/AboutControl.xaml

@@ -65,19 +65,11 @@
                                FontWeight="SemiBold"
                                FontSize="10" />
                     <TextBlock FontSize="10"
-                               xml:space="preserve">Code Review Stack Exchange
-JetBrains ReSharper Community Team
+                               xml:space="preserve">JetBrains ReSharper Community Team
+Code Review Stack Exchange
 Stack Overflow
                     </TextBlock>
-                    
-                    <TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_BlogsHeader}"
-                               FontWeight="SemiBold"
-                               FontSize="10" />
-                    <TextBlock FontSize="10"
-                               xml:space="preserve">Michal Krzych (vba4all.com)
-Knjname developer blog (clockahead.blogspot.jp)
-                    </TextBlock>
-                    
+                                        
                     <TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_ContributorsHeader}"
                                FontWeight="SemiBold"
                                FontSize="10" />
@@ -86,7 +78,7 @@ Knjname developer blog (clockahead.blogspot.jp)
 Andrew Jackson
 Andrin Meier
 Bruno Costa
-Carlos J. Quintero (MZ-Tools articles &amp; help with VBE API)
+Carlos J. Quintero (MZ-Tools)
 @Comintern
 @daFreeMan
 @Duga SE chat bot
@@ -95,13 +87,14 @@ Frank Van Heeswijk
 Gareth Leachman
 @Heslacher
 Jeroen Vannevel
+Michal Krzych (vba4all.com)
 @mjolka
 Philip Wales
-Rob Bovey
+Rob Bovey (Smart Indenter)
 Ross McLean
 Ross Knudsen
 Simon Forsberg
-Stephen Bullen
+Stephen Bullen (Smart Indenter)
                     </TextBlock>
 
                     <TextBlock Text="{Resx ResxName=Rubberduck.UI.RubberduckUI, Key=AboutWindow_GeneralThanks}"

RetailCoder.VBE/UI/About/AboutControlViewModel.cs

@@ -3,17 +3,24 @@
 using System.Reflection;
 using NLog;
 using Rubberduck.UI.Command;
+using Rubberduck.VersionCheck;
 
 namespace Rubberduck.UI.About
 {
     public class AboutControlViewModel
     {
+        private readonly IVersionCheck _version;
+
+        public AboutControlViewModel(IVersionCheck version)
+        {
+            _version = version;
+        }
+
         public string Version
         {
             get
             {
-                var name = Assembly.GetExecutingAssembly().GetName();
-                return string.Format(RubberduckUI.Rubberduck_AboutBuild, name.Version, name.ProcessorArchitecture);
+                return string.Format(RubberduckUI.Rubberduck_AboutBuild, _version.CurrentVersion);
             }
         }
 

RetailCoder.VBE/UI/About/AboutDialog.Designer.cs

@@ -8,7 +8,8 @@ public AboutDialog()
         {
             InitializeComponent();
 
-            ViewModel = new AboutControlViewModel();
+            // todo: inject these dependencies?
+            ViewModel = new AboutControlViewModel(new VersionCheck.VersionCheck());
         }
 
         private AboutControlViewModel _viewModel;
@@ -22,10 +23,6 @@ private AboutControlViewModel ViewModel
             }
         }
 
-        private void AboutDialog_Load(object sender, System.EventArgs e)
-        {
-
-        }
         protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
         {
             if (keyData == Keys.Escape)

RetailCoder.VBE/UI/About/AboutDialog.cs

@@ -139,4 +139,4 @@
         AAAABwAAAAMAAAADAAAAAwAAAAMAAAADAAAAAwAAAAAAAAQAAACMAAAA/AAAAP4DAAD+BwAA
 </value>
   </data>
-</root>
+</root>