Fix globalisation issues with ProjectBuilder2017

microsoft · Jan 31, 2018 · d0a5683 · d0a5683
1 parent 30fbba1
commit d0a5683
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/...t.VisualStudio.2017/ProjectBuilder2015.cs → ...t.VisualStudio.2017/ProjectBuilder2017.cs b/...t.VisualStudio.2017/ProjectBuilder2015.cs → ...t.VisualStudio.2017/ProjectBuilder2017.cs
@@ -1,28 +1,27 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using ApiPortVS.Common;
 using ApiPortVS.Contracts;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using EnvDTE;
-using Microsoft.VisualStudio.Shell.Interop;
-using System.Threading;
-using ApiPortVS.Common;
-using System.Diagnostics;
 using Microsoft.VisualStudio.ProjectSystem;
+using Microsoft.VisualStudio.ProjectSystem.Build;
 using Microsoft.VisualStudio.ProjectSystem.Properties;
-using Microsoft.VisualStudio;
+using Microsoft.VisualStudio.Shell.Interop;
+using System;
 using System.Collections.Concurrent;
-using Microsoft.VisualStudio.ProjectSystem.Build;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using static Microsoft.Fx.Portability.Utils.FormattableStringHelper;
 
 namespace ApiPortVS.VS2017
 {
-    public class ProjectBuilder2015 : DefaultProjectBuilder
+    public class ProjectBuilder2017 : DefaultProjectBuilder
     {
-        public ProjectBuilder2015(
+        public ProjectBuilder2017(
             IVsSolutionBuildManager2 buildManager,
             IVSThreadingService threadingService,
             IProjectMapper projectMapper)
@@ -36,7 +35,7 @@ public ProjectBuilder2015(
         /// https://github.com/Microsoft/visualfsharp/blob/master/vsintegration/tests/unittests/Tests.ProjectSystem.Miscellaneous.fs#L168-L182
         /// </summary>
         /// <returns>null if it is unable to retrieve VS configuration objects</returns>
-        public override async Task<IEnumerable<string>> GetBuildOutputFilesAsync(Project project, CancellationToken cancellationToken = default(CancellationToken))
+        public override async Task<IEnumerable<string>> GetBuildOutputFilesAsync(Project project, CancellationToken cancellationToken = default)
         {
             if (project == null)
             {
@@ -61,7 +60,7 @@ public ProjectBuilder2015(
         /// project is not a CPS project.</returns>
         private async Task<IEnumerable<string>> GetBuildOutputFilesFromCPSAsync(
             Project project,
-            CancellationToken cancellationToken = default(CancellationToken))
+            CancellationToken cancellationToken = default)
         {
             if (project == null)
             {
@@ -72,7 +71,7 @@ private async Task<IEnumerable<string>> GetBuildOutputFilesFromCPSAsync(
 
             if (hierarchy == null)
             {
-                Trace.TraceWarning($"Unable to locate {nameof(IVsHierarchy)} for {project.Name}");
+                Trace.TraceWarning(ToCurrentCulture($"Unable to locate {nameof(IVsHierarchy)} for {project.Name}"));
                 return null;
             }
 
@@ -110,7 +109,7 @@ private async Task<IEnumerable<string>> GetBuildOutputFilesFromCPSAsync(
                     }
                     catch (Exception e)
                     {
-                        Trace.TraceError($"Could not fetch key output from project configuration {proj.ProjectConfiguration.Name}. Exception: {e}", e);
+                        Trace.TraceError(ToCurrentCulture($"Could not fetch key output from project configuration {proj.ProjectConfiguration.Name}. Exception: {e}"), e);
                     }
                 }
             }

diff --git a/src/ApiPort.VisualStudio.2017/ServiceProvider.cs b/src/ApiPort.VisualStudio.2017/ServiceProvider.cs
@@ -24,7 +24,7 @@ protected override void Load(ContainerBuilder builder)
             builder.RegisterType<VSThreadingService>()
                 .As<IVSThreadingService>()
                 .SingleInstance();
-            builder.RegisterType<ProjectBuilder2015>()
+            builder.RegisterType<ProjectBuilder2017>()
                 .As<IProjectBuilder>()
                 .SingleInstance();
         }