Merge branch 'master' into fixes/resizeable-peek-view

Author: grokys

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -15,7 +15,7 @@
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(Buildtype)' == 'Internal'">
     <AssemblyOriginatorKeyFile>..\..\script\Key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

src/GitHub.VisualStudio/AssemblyResolverPackage.cs

@@ -39,7 +39,6 @@ public class AssemblyResolverPackage : Package
 
         public AssemblyResolverPackage()
         {
-            Debug.WriteLine("GitHub assembly resolver is now active.");
             extensionDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
             AppDomain.CurrentDomain.AssemblyResolve += LoadAssemblyFromExtensionDir;
         }
@@ -70,14 +69,11 @@ Assembly LoadAssemblyFromExtensionDir(object sender, ResolveEventArgs e)
                     // Resolve any version of our assemblies.
                     if (!ourAssemblies.Contains(name, StringComparer.OrdinalIgnoreCase))
                     {
-                        Trace.WriteLine(string.Format(CultureInfo.CurrentCulture, "Not resolving '{0}' to '{1}'.", e.Name, targetName.FullName));
                         return null;
                     }
 
-                    Trace.WriteLine(string.Format(CultureInfo.CurrentCulture, "Resolving '{0}' to '{1}'.", e.Name, targetName.FullName));
                 }
 
-                Trace.WriteLine(string.Format(CultureInfo.CurrentCulture, "Loading '{0}' from '{1}'.", targetName.FullName, filename));
                 return Assembly.LoadFrom(filename);
             }
             catch (Exception ex)
@@ -89,7 +85,6 @@ Assembly LoadAssemblyFromExtensionDir(object sender, ResolveEventArgs e)
                     Environment.NewLine,
                     ex,
                     Environment.NewLine);
-                Trace.WriteLine(log);
                 VsOutputLogger.Write(log);
             }
 

src/GitHub.VisualStudio/Services/UsageTracker.cs

@@ -210,7 +210,7 @@ async Task Initialize()
             {
                 await ThreadingHelper.SwitchToMainThreadAsync();
 
-                client = gitHubServiceProvider.GetService<IMetricsService>();
+                client = gitHubServiceProvider.TryGetService<IMetricsService>();
                 connectionManager = gitHubServiceProvider.GetService<IConnectionManager>();
                 userSettings = gitHubServiceProvider.GetService<IPackageSettings>();
                 vsservices = gitHubServiceProvider.GetService<IVSServices>();