Merge branch 'master' into fixes/1644-GitServiceHelper-avoid-MEF

Author: jcansdale

src/GitHub.App/Commands/UsageTrackingCommand.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Windows.Input;
+using System.Linq.Expressions;
+using GitHub.Models;
+using GitHub.Services;
+using GitHub.Extensions;
+
+namespace GitHub.Commands
+{
+    /// <summary>
+    /// A proxy <see cref="ICommand"/> that increments a usage counter after executing the command.
+    /// </summary>
+    public class UsageTrackingCommand : ICommand
+    {
+        readonly ICommand command;
+        readonly Lazy<IUsageTracker> usageTracker;
+        readonly Expression<Func<UsageModel.MeasuresModel, int>> counter;
+
+        /// <summary>
+        /// The usage tracker and counter to increment after the target command is executed.
+        /// </summary>
+        /// <param name="usageTracker">The usage tracker.</param>
+        /// <param name="counter">The counter to increment.</param>
+        /// <param name="command">The target command.</param>
+        public UsageTrackingCommand(
+            Lazy<IUsageTracker> usageTracker, Expression<Func<UsageModel.MeasuresModel, int>> counter,
+            ICommand command)
+        {
+            this.command = command;
+            this.usageTracker = usageTracker;
+            this.counter = counter;
+        }
+
+        public event EventHandler CanExecuteChanged
+        {
+            add { command.CanExecuteChanged += value; }
+            remove { command.CanExecuteChanged -= value; }
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            return command.CanExecute(parameter);
+        }
+
+        public void Execute(object parameter)
+        {
+            command.Execute(parameter);
+            usageTracker.Value.IncrementCounter(counter).Forget();
+        }
+    }
+}

src/GitHub.App/GitHub.App.csproj

@@ -205,6 +205,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Commands\UsageTrackingCommand.cs" />
     <Compile Include="Factories\ViewViewModelFactory.cs" />
     <Compile Include="Factories\ModelServiceFactory.cs" />
     <Compile Include="Models\IssueCommentModel.cs" />
@@ -402,7 +403,7 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>