Split out localization for portable and desktop

EnlistmentInfo.targets

@@ -2,6 +2,8 @@
 <Project ToolsVersion="dogfood" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+
+    <DistinguishingFactor Condition=" '$(TargetFrameworkProfile)' != '' ">.$(TargetFrameworkProfile)</DistinguishingFactor>
   </PropertyGroup>
 
   <Import Project="$(VSToolsDeRazzlePath)Common.targets"/>
@@ -14,11 +16,21 @@
     <FilesToSign Condition=" '$(DevDivProjectType)' == 'vsix' ">
       <Authenticode>vsix</Authenticode>
     </FilesToSign>
+
+    <FilesToLocalize>
+      <Languages>$(VS)</Languages>
+      <ProjectFile>$(MSBuildThisFileFullPath)</ProjectFile>
+      <HasLceComments>true</HasLceComments>
+      <LciCommentFile>$(MSBuildThisFileDirectory)\loc\lci\$(TargetName)$(DistinguishingFactor)$(TargetExt).lci</LciCommentFile>
+      <TranslationFile>$(MSBuildThisFileDirectory)\loc\lcl\{Lang}\$(TargetName)$(DistinguishingFactor)$(TargetExt).lcl</TranslationFile>
+    </FilesToLocalize>
   </ItemDefinitionGroup>
 
   <ItemGroup Condition=" '$(Nonshipping)' != 'true' ">
     <FilesToSign Include="$(TargetPath)" Condition=" '$(DevDivProjectType)' == 'product' " />
     <FilesToSign Include="$(TargetDir)$(TargetName).vsix" Condition=" '$(DevDivProjectType)' == 'vsix' " />
+
+    <FilesToLocalize Include="$(TargetPath)" Condition=" '$(LocalizeOutputAssembly)' == 'true' " />
   </ItemGroup>
 
   <!-- Add the satellite resource assemblies to be signed. Time this such that localization has already done its work. -->

Validation.locmanifest

@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemDefinitionGroup>
-    <FilesToLocalize>
-      <Languages>$(VS)</Languages>
-      <ProjectFile>$(MSBuildThisFileFullPath)</ProjectFile>
-      <HasLceComments>true</HasLceComments>
-      <LciCommentFile>$(MSBuildThisFileDirectory)\loc\lci\$(TargetName)$(TargetExt).lci</LciCommentFile>
-      <TranslationFile>$(MSBuildThisFileDirectory)\loc\lcl\{Lang}\$(TargetName)$(TargetExt).lcl</TranslationFile>
-    </FilesToLocalize>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <FilesToLocalize Include="$(OutDir)\Microsoft.VisualStudio.Validation.dll" Condition="'$(MSBuildProjectFile)' == 'Microsoft.VisualStudio.Validation.Desktop.csproj'" />
-    <FilesToLocalize Include="$(OutDir)\Microsoft.VisualStudio.Validation.Portable\Microsoft.VisualStudio.Validation.dll" Condition="'$(MSBuildProjectFile)' == 'Microsoft.VisualStudio.Validation.Portable.csproj'" />
-  </ItemGroup>
+  <!-- Microbuild requires this file to be present. -->
 </Project>

loc/lci/Microsoft.VisualStudio.Validation.Profile151.dll.lci

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LCX SchemaVersion="6.0" Name="Microsoft.VisualStudio.Validation.dll" PsrId="211" FileType="1" SrcCul="en-US" xmlns="http://schemas.microsoft.com/locstudio/2006/6/lcx">
+  <OwnedComments>
+    <Cmt Name="LcxAdmin" />
+    <Cmt Name="Loc" />
+  </OwnedComments>
+</LCX>

src/Microsoft.VisualStudio.Validation.Desktop/Microsoft.VisualStudio.Validation.Desktop.csproj

@@ -12,6 +12,7 @@
     <GenerateLCE>true</GenerateLCE>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <LocalizeOutputAssembly>true</LocalizeOutputAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineConstants>TRACE;DEBUG;DESKTOP</DefineConstants>

src/Microsoft.VisualStudio.Validation.Portable/Microsoft.VisualStudio.Validation.Portable.csproj

@@ -19,6 +19,7 @@
     <TargetFrameworkProfile>Profile151</TargetFrameworkProfile>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <OutputPath>$(OutputPath)$(MSBuildProjectName)\</OutputPath>
+    <LocalizeOutputAssembly>true</LocalizeOutputAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <CodeAnalysisRuleSet>Microsoft.VisualStudio.Validation.Portable.ruleset</CodeAnalysisRuleSet>