From dfc03e7f2c38c553791d63f62efa1c965922c1cb Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Wed, 7 Jun 2017 16:37:04 -0700
Subject: [PATCH] Build localized satellite assemblies

---
 build/DependencyVersions.props                       |  1 +
 build/GenerateResxSource.targets                     | 12 ++++++++----
 build/Signing.proj                                   |  4 +++-
 .../Microsoft.DotNet.Cli.Sln.Internal.csproj         |  1 +
 .../Microsoft.DotNet.Cli.Utils.csproj                |  1 +
 .../Microsoft.DotNet.Configurer.csproj               |  1 +
 src/dotnet/dotnet.csproj                             |  1 +
 7 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index a78a19083..5a5185457 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -22,6 +22,7 @@
     <CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
     <MicroBuildVersion>0.2.0</MicroBuildVersion>
     <SpaTemplateVersion>1.0.0-preview-000249</SpaTemplateVersion>
+    <XliffTasksVersion>0.2.0-beta-000042</XliffTasksVersion>
 
     <!-- This should either be timestamped or notimestamp as appropriate -->
     <AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
diff --git a/build/GenerateResxSource.targets b/build/GenerateResxSource.targets
index 8323e9305..b25582ee2 100644
--- a/build/GenerateResxSource.targets
+++ b/build/GenerateResxSource.targets
@@ -15,12 +15,16 @@
   </Target>
 
   <Target Name="CustomizeResourceNames"
-          BeforeTargets="PrepareResourceNames"
+          BeforeTargets="PrepareResourceNames;GatherXlf"
           >
     <ItemGroup>
-      <EmbeddedResource>
-        <ManifestResourceName Condition="'%(EmbeddedResource.Namespace)' != ''">%(EmbeddedResource.Namespace).%(EmbeddedResource.Filename)</ManifestResourceName>
+      <EmbeddedResource Condition="'%(EmbeddedResource.Namespace)' != ''">
+        <ManifestResourceName>%(EmbeddedResource.Namespace).%(EmbeddedResource.Filename)</ManifestResourceName>
       </EmbeddedResource>
+      <XlfSource Condition="'%(XlfSource.Namespace)' != ''">
+        <ManifestResourceName>%(XlfSource.Namespace).%(XlfSource.Filename)</ManifestResourceName>
+        <XlfTranslatedFileName>%(XlfSource.Namespace).%(XlfSource.Filename)</XlfTranslatedFileName>
+      </XlfSource>
     </ItemGroup>
   </Target>
 
@@ -35,7 +39,7 @@
 
   <Target Name="GetEmbeddedResourcesWithSourceGeneration">
     <ItemGroup>
-      <EmbeddedResourceSG Include="@(EmbeddedResource)" Condition="'%(EmbeddedResource.GenerateSource)' == 'true'" />
+      <EmbeddedResourceSG Include="@(EmbeddedResource)" Condition="'%(EmbeddedResource.GenerateSource)' == 'true' and '%(EmbeddedResource.XlfLanguage)' == ''" />
       <EmbeddedResourceSG>
         <SourceOutputPath>$(IntermediateOutputPath)%(EmbeddedResourceSG.ManifestResourceName).cs</SourceOutputPath>
       </EmbeddedResourceSG>
diff --git a/build/Signing.proj b/build/Signing.proj
index b896366db..c6708d614 100644
--- a/build/Signing.proj
+++ b/build/Signing.proj
@@ -39,13 +39,15 @@
       <FilesToSign Include="$(OutputDirectory)/sdk/**/csc.exe;
                             $(OutputDirectory)/sdk/**/csc.dll;
                             $(OutputDirectory)/sdk/**/dotnet.dll;
+                            $(OutputDirectory)/sdk/**/dotnet.resources.dll;
                             $(OutputDirectory)/sdk/**/System.*.dll;
                             $(OutputDirectory)/sdk/**/Microsoft.*.dll;
                             $(OutputDirectory)/sdk/**/NuGet*.dll;
                             $(OutputDirectory)/sdk/**/datacollector.dll;
                             $(OutputDirectory)/sdk/**/MSBuild.dll;
                             $(OutputDirectory)/sdk/**/testhost.dll;
-                            $(OutputDirectory)/sdk/**/vstest.console.dll">
+                            $(OutputDirectory)/sdk/**/vstest.console.dll;
+                            $(OutputDirectory)/sdk/**/vstest.console.resources.dll">
         <Authenticode>$(InternalCertificateId)</Authenticode>
       </FilesToSign>
       <!-- Built files for the packages -->
diff --git a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj
index fab4bb6bf..2b23027fd 100644
--- a/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj
+++ b/src/Microsoft.DotNet.Cli.Sln.Internal/Microsoft.DotNet.Cli.Sln.Internal.csproj
@@ -24,5 +24,6 @@
     <PackageReference Include="System.Collections.Specialized" Version="4.0.1" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.1.0" />
     <PackageReference Include="NETStandard.Library" Version="1.6.0" />
+    <PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
index b29251ca9..ed1056755 100644
--- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
+++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
@@ -25,6 +25,7 @@
     <PackageReference Include="Microsoft.Build" Version="$(CLI_MSBuild_Version)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(CLI_MSBuild_Version)" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
+    <PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
 </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
diff --git a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
index 92026b83f..25a33c6f8 100644
--- a/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
+++ b/src/Microsoft.DotNet.Configurer/Microsoft.DotNet.Configurer.csproj
@@ -19,6 +19,7 @@
   <ItemGroup>
     <PackageReference Include="NuGet.Common" Version="$(CLI_NuGet_Version)" />
     <PackageReference Include="NuGet.Configuration" Version="$(CLI_NuGet_Version)" />
+    <PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/dotnet/dotnet.csproj b/src/dotnet/dotnet.csproj
index 67f099dd9..beda018da 100644
--- a/src/dotnet/dotnet.csproj
+++ b/src/dotnet/dotnet.csproj
@@ -67,6 +67,7 @@
     <PackageReference Include="Microsoft.TemplateEngine.Cli" Version="$(TemplateEngineVersion)" />
     <PackageReference Include="Microsoft.TemplateEngine.Orchestrator.RunnableProjects" Version="$(TemplateEngineVersion)" />
     <PackageReference Include="Microsoft.TemplateEngine.Utils" Version="$(TemplateEngineVersion)" />
+    <PackageReference Include="XliffTasks" Version="$(XliffTasksVersion)" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="commands\dotnet-migrate\xlf" />