From c2da61c6f28cd5330bf551b1c0f0c795ef571710 Mon Sep 17 00:00:00 2001
From: Bekir Ozturk <bozturk@microsoft.com>
Date: Wed, 1 Dec 2021 17:52:59 +0100
Subject: [PATCH 1/2] Integrate template localizer into arcade

---
 eng/Version.Details.xml                          |  4 ++++
 eng/Versions.props                               |  1 +
 .../tools/Imports.targets                        |  2 +-
 .../tools/Localization.targets                   | 16 ++++++++++++++--
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fd77513e094..5f2b838c211 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,6 +9,10 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
       <Sha>62ceb439e80bf0814d0ffa17f022d4624ea4aa6c</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.TemplateEngine.Tasks" Version="7.0.100-alpha.1.21601.1">
+      <Uri>https://github.com/dotnet/templating</Uri>
+      <Sha />
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21576.4">
diff --git a/eng/Versions.props b/eng/Versions.props
index c0f3f9cc465..7b87b2e810d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -89,5 +89,6 @@
     <MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview1.1.21116.1</MicrosoftDeploymentDotNetReleasesVersion>
     <!-- Used to flow Source Link version through Arcade SDK -->
     <MicrosoftSourceLinkVersion>$(MicrosoftSourceLinkGitHubVersion)</MicrosoftSourceLinkVersion>
+    <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
   </PropertyGroup>
 </Project>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
index f0b6e53a912..7ab283ab033 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Imports.targets
@@ -18,7 +18,7 @@
   <Import Project="Tests.targets" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
 
   <Import Project="Performance.targets" Condition="'$(DisableArcadeTestFramework)' != 'true'" />
-  <Import Project="Localization.targets" Condition="'$(UsingToolXliff)' == 'true'"/>
+  <Import Project="Localization.targets" />
   <Import Project="VisualStudio.targets" Condition="'$(UsingToolVSSDK)' == 'true' and ('$(IsVsixProject)' == 'true' or '$(IsSwixProject)' == 'true' or '$(GeneratePkgDefFile)' == 'true') and '$(MSBuildRuntimeType)' != 'Core'"/>
   <Import Project="OptimizationData.targets" Condition="'$(UsingToolIbcOptimization)' == 'true'"/>
   <Import Project="SymStore.targets" Condition="'$(ContinuousIntegrationBuild)' == 'true' and '$(OS)' == 'Windows_NT'"/>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets
index 4eef799770d..07218fa45d8 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets
@@ -3,11 +3,11 @@
 <Project>
 
   <!--
+    XliffTasks for localizing .resx files and generating satellite assemblies.
     When not building in CI, automatically sync .xlf files to .resx files on build.
     Otherwise, let the build fail to catch .xlf files that are not up-to-date.
   -->
-
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(UsingToolXliff)' == 'true'">
     <!-- 
       It is only intended to automatically run update during dev cycle. However, it will fail the build on CI if the XLF file is not updated.
       XLF file should be checked in and loc team will update the XLF it with translated version.
@@ -25,4 +25,16 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.XliffTasks" Version="$(MicrosoftDotNetXliffTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" Condition="'$(IsShippingAssembly)' == 'true'" />
   </ItemGroup>
+
+
+  <!-- TemplateLocalizer for localizing 'dotnet new' templates -->
+  <PropertyGroup Condition="'$(UsingToolTemplateLocalizer)' == 'true'">
+    <!-- Run localizer when building on dev machine. -->
+    <LocalizeTemplates Condition="'$(LocalizeTemplates)' == '' and '$(ContinuousIntegrationBuild)' != 'true'">true</LocalizeTemplates>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.TemplateEngine.Tasks" Version="$(MicrosoftTemplateEngineTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" Condition="'$(UsingToolTemplateLocalizer)' == 'true' and '$(IsShippingAssembly)' == 'true'" />
+  </ItemGroup>
+
 </Project>

From cb5ed7394ef18f872c3bcb5a204ff25ab11b5bad Mon Sep 17 00:00:00 2001
From: Bekir Ozturk <bozturk@microsoft.com>
Date: Fri, 3 Dec 2021 20:33:14 +0100
Subject: [PATCH 2/2] Include localizer.tasks package version in arcade.sdk
 package

---
 .../Microsoft.DotNet.Arcade.Sdk.csproj                        | 1 +
 src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
index 63544dd9c13..32d30e285c7 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
@@ -84,6 +84,7 @@
     <MicrosoftDotNetXliffTasksVersion>$(MicrosoftDotNetXliffTasksVersion)</MicrosoftDotNetXliffTasksVersion>
     <MicrosoftDotNetMaestroTasksVersion>$(MicrosoftDotNetMaestroTasksVersion)</MicrosoftDotNetMaestroTasksVersion>
     <MicrosoftSymbolUploaderBuildTaskVersion>$(MicrosoftSymbolUploaderBuildTaskVersion)</MicrosoftSymbolUploaderBuildTaskVersion>
+    <MicrosoftTemplateEngineTasksVersion>$(MicrosoftTemplateEngineTasksVersion)</MicrosoftTemplateEngineTasksVersion>
   </PropertyGroup>
 </Project>]]>
   </_SdkVersionPropsContent>
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets
index 07218fa45d8..d0c2235e188 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Localization.targets
@@ -30,11 +30,11 @@
   <!-- TemplateLocalizer for localizing 'dotnet new' templates -->
   <PropertyGroup Condition="'$(UsingToolTemplateLocalizer)' == 'true'">
     <!-- Run localizer when building on dev machine. -->
-    <LocalizeTemplates Condition="'$(LocalizeTemplates)' == '' and '$(ContinuousIntegrationBuild)' != 'true'">true</LocalizeTemplates>
+    <LocalizeTemplates Condition="'$(ContinuousIntegrationBuild)' != 'true'">true</LocalizeTemplates>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.TemplateEngine.Tasks" Version="$(MicrosoftTemplateEngineTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" Condition="'$(UsingToolTemplateLocalizer)' == 'true' and '$(IsShippingAssembly)' == 'true'" />
+    <PackageReference Include="Microsoft.TemplateEngine.Tasks" Version="$(MicrosoftTemplateEngineTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" Condition="'$(UsingToolTemplateLocalizer)' == 'true'" />
   </ItemGroup>
 
 </Project>