From b1b9dfda093a6d90d4c9209126ba87e250398a0d Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Mon, 12 Nov 2018 15:23:44 -0800
Subject: [PATCH] Include templates in layout

---
 eng/Versions.props                              |  2 ++
 src/redist/redist.csproj                        |  1 +
 .../redist/targets/BundledTemplates.targets     | 17 +++++++++++++++++
 .../targets/GenerateBundledVersions.targets     |  4 ++--
 src/redist/targets/GenerateLayout.targets       |  3 ++-
 5 files changed, 24 insertions(+), 3 deletions(-)
 rename old/build/BundledTemplates.props => src/redist/targets/BundledTemplates.targets (63%)

diff --git a/eng/Versions.props b/eng/Versions.props
index 268e7cf87..cd6a5e1d5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,6 +53,8 @@
       $(RestoreSources);
       https://dotnet.myget.org/F/msbuild/api/v3/index.json;
       https://dotnet.myget.org/F/nuget-build/api/v3/index.json;
+      https://dotnet.myget.org/F/templating/api/v3/index.json;
+      https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json;
     </RestoreSources>
   </PropertyGroup>
 
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 3cc084616..b4c374b20 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -10,6 +10,7 @@
   <Import Project="targets\Versions.targets" />
   <Import Project="targets\SetBuildDefaults.targets" />
   <Import Project="targets\Branding.targets" />
+  <Import Project="targets\BundledTemplates.targets" />
   <Import Project="targets\GenerateBundledVersions.targets" />
   <Import Project="targets\GenerateLayout.targets" />
   <Import Project="targets\FileExtensions.targets" />
diff --git a/old/build/BundledTemplates.props b/src/redist/targets/BundledTemplates.targets
similarity index 63%
rename from old/build/BundledTemplates.props
rename to src/redist/targets/BundledTemplates.targets
index 47413069d..f7a3605fe 100644
--- a/old/build/BundledTemplates.props
+++ b/src/redist/targets/BundledTemplates.targets
@@ -12,4 +12,21 @@
 
     <BundledTemplate Include="NUnit3.DotNetNew.Template" Version="$(NUnit3TemplatesVersion)" />
   </ItemGroup>
+
+  <!-- Restore bundled templates via PackageReference -->
+  <ItemGroup>
+    <PackageReference Include="@(BundledTemplate)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <BundledTemplate Update="@(BundledTemplate)">
+      <NupkgPathRelativeToPackageRoot>%(Identity)/%(Version)/%(Identity).%(Version).nupkg</NupkgPathRelativeToPackageRoot>
+      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
+    </BundledTemplate>
+  </ItemGroup>
+
+  <Target Name="LayoutTemplates" DependsOnTargets="SetupBundledComponents">
+    <Copy SourceFiles="%(BundledTemplate.RestoredNupkgPath)"
+          DestinationFolder="$(SdkOutputDirectory)Templates/"/>
+  </Target>
 </Project>
diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 4584c60aa..7089a0b72 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -181,7 +181,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </BundledVersionsPropsContent>
   </PropertyGroup>
 
-    <WriteLinesToFile File="$(SdkOutputDirectory)/$(BundledVersionsPropsFileName)"
+    <WriteLinesToFile File="$(SdkOutputDirectory)$(BundledVersionsPropsFileName)"
                       Lines="$(BundledVersionsPropsContent)"
                       Overwrite="true" />
   </Target>
@@ -214,7 +214,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </BundledBundledCliToolsPropsContent>
   </PropertyGroup>
 
-    <WriteLinesToFile File="$(SdkOutputDirectory)/$(BundledBundledCliToolsPropsFileName)"
+    <WriteLinesToFile File="$(SdkOutputDirectory)$(BundledBundledCliToolsPropsFileName)"
                       Lines="$(BundledBundledCliToolsPropsContent)"
                       Overwrite="true" />
   </Target>
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 78b7f487d..2d570dccf 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -7,7 +7,7 @@
   
   <Target Name="SetupBundledComponents" DependsOnTargets="GetCurrentRuntimeInformation;SetupFileExtensions;SetSdkVersionInfo;SetBuildDefaults">
     <PropertyGroup>
-      <SdkOutputDirectory>$(RedistLayoutPath)sdk\$(SdkVersion)</SdkOutputDirectory>
+      <SdkOutputDirectory>$(RedistLayoutPath)sdk\$(SdkVersion)\</SdkOutputDirectory>
       <CoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
       <DotnetExtensionsBlobRootUrl Condition="'$(DotnetExtensionsBlobRootUrl)' == ''">https://dotnetcli.blob.core.windows.net/dotnet/</DotnetExtensionsBlobRootUrl>
       
@@ -217,6 +217,7 @@
                             CleanLayoutPath;
                             ExtractBundledComponents;
                             GenerateBundledVersions;
+                            LayoutTemplates;
                             RetargetTools"
           AfterTargets="Build">