From 5475a81a55abc330be998810b7b4cde96cad58f4 Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Mon, 15 Jul 2019 10:25:17 -0700
Subject: [PATCH] Switch to lower case t (templates) for the folder name under
 dotnet.

---
 src/redist/targets/BundledTemplates.targets | 4 ++--
 src/redist/targets/GenerateDebs.targets     | 4 ++--
 src/redist/targets/GeneratePKG.targets      | 4 ++--
 src/redist/targets/GenerateRPMs.targets     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index 3c498063e..e698e7a31 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -42,13 +42,13 @@
       <BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
     </ItemGroup>
     <Copy SourceFiles="%(BundledTemplate.RestoredNupkgPath)"
-          DestinationFolder="$(RedistLayoutPath)Templates/$(BundledTemplatesVersion)"/>
+          DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplatesVersion)"/>
   </Target>
 
   <Target Name="LayoutTemplatesForMSI"
           DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersion"
           Condition="$(ProductMonikerRid.StartsWith('win'))">
     <Copy SourceFiles="%(BundledTemplate.RestoredNupkgPath)"
-          DestinationFolder="$(TemplatesLayoutPath)Templates/$(BundledTemplatesVersion)"/>
+          DestinationFolder="$(TemplatesLayoutPath)templates/$(BundledTemplatesVersion)"/>
   </Target>
 </Project>
diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets
index 2d093603a..421b6e70a 100644
--- a/src/redist/targets/GenerateDebs.targets
+++ b/src/redist/targets/GenerateDebs.targets
@@ -83,7 +83,7 @@
       <ManpagesDirectory>$(RepoRoot)Documentation/manpages</ManpagesDirectory>
       <EndToEndTestProject>$(RepoRoot)test/EndToEnd/EndToEnd.Tests.csproj</EndToEndTestProject>
       <CLISdkRoot>$(RedistLayoutPath)sdk/</CLISdkRoot>
-      <TemplatesRoot>$(RedistLayoutPath)Templates/</TemplatesRoot>
+      <TemplatesRoot>$(RedistLayoutPath)templates/</TemplatesRoot>
     </PropertyGroup>
 
     <ItemGroup>
@@ -252,7 +252,7 @@
 
       <!-- Create layout: Templates -->
       <Copy
-        DestinationFiles="@(TemplatesFiles->'$(LayoutPackageRootDir)/Templates/%(RecursiveDir)%(Filename)%(Extension)')"
+        DestinationFiles="@(TemplatesFiles->'$(LayoutPackageRootDir)/templates/%(RecursiveDir)%(Filename)%(Extension)')"
         SourceFiles="@(TemplatesFiles)"
         OverwriteReadOnlyFiles="True"
         SkipUnchangedFiles="False"
diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets
index b819dda6f..8f1cf9d65 100644
--- a/src/redist/targets/GeneratePKG.targets
+++ b/src/redist/targets/GeneratePKG.targets
@@ -131,7 +131,7 @@
             Condition=" '$(OSName)' == 'osx' ">
 
       <ItemGroup>
-        <TemplateFiles Include="$(RedistLayoutPath)Templates/**/*" />
+        <TemplateFiles Include="$(RedistLayoutPath)templates/**/*" />
       </ItemGroup>
       
       <!-- Copy ASP.NET runtime and targeting pack to internal layout, as we don't currently chain that in with a pkg dependency -->
@@ -141,7 +141,7 @@
                                  DestinationDirectory="$(SdkInternalLayoutPath)" />
 
       <Copy SourceFiles="@(TemplateFiles)"
-            DestinationFiles="@(TemplateFiles->'$(SdkInternalLayoutPath)/Templates/%(RecursiveDir)%(Filename)%(Extension)')" />
+            DestinationFiles="@(TemplateFiles->'$(SdkInternalLayoutPath)/templates/%(RecursiveDir)%(Filename)%(Extension)')" />
 
       <ReplaceFileContents
         InputFiles="$(SdkPkgScriptTemplateFile)"
diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets
index 9f37069f4..3f5a07e08 100644
--- a/src/redist/targets/GenerateRPMs.targets
+++ b/src/redist/targets/GenerateRPMs.targets
@@ -175,7 +175,7 @@
       <SdkRpmPackageName>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkRpmPackageVersion)</SdkRpmPackageName>
       <RpmPackageVersion>$(SdkVersion)</RpmPackageVersion>
       <InputRoot>$(RedistLayoutPath)sdk/</InputRoot>
-      <DotnetNewTemplatesRoot>$(RedistLayoutPath)Templates/</DotnetNewTemplatesRoot>
+      <DotnetNewTemplatesRoot>$(RedistLayoutPath)templates/</DotnetNewTemplatesRoot>
       <SdkRPMInstallerFile>$(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkRPMInstallerFile>
       <RpmFile>$(SdkRPMInstallerFile)</RpmFile>
       <!-- Need to acquire manpage files from CLI repo: https://github.com/dotnet/cli/issues/10266 -->
@@ -191,7 +191,7 @@
       <RpmLayoutDirectory>$(RpmIntermediatesDir)/RpmLayoutDirectory/</RpmLayoutDirectory>
       <RpmLayoutPackageRoot>$(RpmLayoutDirectory)package_root</RpmLayoutPackageRoot>
       <RpmLayoutSDK>$(RpmLayoutPackageRoot)/sdk</RpmLayoutSDK>
-      <RpmLayoutDotnetNewTemplates>$(RpmLayoutPackageRoot)/Templates</RpmLayoutDotnetNewTemplates>
+      <RpmLayoutDotnetNewTemplates>$(RpmLayoutPackageRoot)/templates</RpmLayoutDotnetNewTemplates>
       <RpmLayoutDocs>$(RpmLayoutDirectory)docs</RpmLayoutDocs>                <!-- Man Pages -->
       <RpmLayoutTemplates>$(RpmLayoutDirectory)templates</RpmLayoutTemplates> <!-- Copyright, Changelog -->
       <RpmLayoutScripts>$(RpmLayoutDirectory)scripts</RpmLayoutScripts>