From 2fa1fe8ce201b9ef91c5c37c066b06747f120f5d Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Fri, 8 Sep 2017 13:27:18 +0100
Subject: [PATCH] Fix build output so that versioned packages go into the
 correct directory when run through KoreBuild

---
 build/FixPackageOutputDirs.targets            | 33 +++++++++++++++++++
 build/repo.targets                            |  3 ++
 src/Directory.Build.props                     |  2 +-
 src/Directory.Build.targets                   |  2 +-
 .../Helpers/TemplatePackageInstaller.cs       |  2 +-
 5 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 build/FixPackageOutputDirs.targets
 create mode 100644 build/repo.targets

diff --git a/build/FixPackageOutputDirs.targets b/build/FixPackageOutputDirs.targets
new file mode 100644
index 0000000000..bf6e3b7889
--- /dev/null
+++ b/build/FixPackageOutputDirs.targets
@@ -0,0 +1,33 @@
+<Project>
+
+  <!--
+   The "Pack" target which emits .nupkg files to disk also holds a lock on those file
+   until the whole build process exits [1]. This makes it difficult to perform any
+   subsequent work on the package files, such as moving them or modifying their
+   contents. As a workaround, we cause the nupkgs to be written to a temporary
+   subdirectory, and then after they are emitted, our SubstituteProjectFileVariables
+   task writes its output to the original intended build directory.
+   
+   [1] The file locking might be a bug in the NuGet client code. For example, see
+   https://github.com/NuGet/NuGet.Client/blob/63e8539791d4f662efffceb2185ad4510396d76e/src/NuGet.Core/NuGet.Commands/CommandRunners/PackCommandRunner.cs#L135
+   It opens a "PackageArchiveReader" (which in turn uses File.Open to open a file
+   handle) after creating each package, but never close/disposes it.
+   -->
+
+  <PropertyGroup>
+    <PackageDependsOn>RedirectPackageOutputDir;$(PackageDependsOn);RestorePackageOutputDir</PackageDependsOn>
+  </PropertyGroup>
+
+  <Target Name="RedirectPackageOutputDir">
+    <PropertyGroup>
+      <OrigBuildDir>$(BuildDir)</OrigBuildDir>
+      <BuildDir>$(BuildDir)unversioned\</BuildDir>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="RestorePackageOutputDir">
+    <PropertyGroup>
+      <BuildDir>$(OrigBuildDir)</BuildDir>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/build/repo.targets b/build/repo.targets
new file mode 100644
index 0000000000..ebf190d5aa
--- /dev/null
+++ b/build/repo.targets
@@ -0,0 +1,3 @@
+<Project>
+  <Import Project="FixPackageOutputDirs.targets" />
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 631e9f3fbe..9eeff7f936 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -9,7 +9,7 @@
     <NoWarn>2008;8021</NoWarn>
     <PackageVersion Condition="'$(VersionSuffix)' == ''">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(VersionSuffix)' != ''">$(VersionPrefix)-$(VersionSuffix)</PackageVersion>
-    <PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(MSBuildThisFileDirectory)..\artifacts\tmp\</PackageOutputPath>    
+    <PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(MSBuildThisFileDirectory)..\artifacts\build\unversioned\</PackageOutputPath>
     <NuspecProperties>version=$(PackageVersion)</NuspecProperties>
     <AspNetCoreVersionFromLineup>@(PackageReference->WithMetadataValue('Identity', 'Microsoft.AspNetCore')->Metadata('Version'))</AspNetCoreVersionFromLineup>
     <EntityFrameworkVersionFromLineup>@(PackageReference->WithMetadataValue('Identity', 'Microsoft.EntityFrameworkCore')->Metadata('Version'))</EntityFrameworkVersionFromLineup>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 85a4173c5e..cac4464de7 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -11,7 +11,7 @@
     TaskName="DependencyUpdater.SubstituteProjectFileVariables"
     AssemblyFile="$(MSBuildProjectDirectory)\$(OutputPath)DependencyUpdater.dll" />
 
-  <Target Name="RunTask" AfterTargets="Pack">
+  <Target Name="InjectVersionsIntoProjectFilesInPackage" AfterTargets="Pack">
     <SubstituteProjectFileVariables
         NupkgFile="$(PackageOutputPath)$(MSBuildProjectName).$(PackageVersion).nupkg"
         Substitutions="TemplateAspNetCoreVersion=$(AspNetCoreVersionFromLineup); TemplateEntityFrameworkVersion=$(EntityFrameworkVersionFromLineup)"
diff --git a/test/Templates.Test/Helpers/TemplatePackageInstaller.cs b/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
index c836389f0d..33e2e32e26 100644
--- a/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
+++ b/test/Templates.Test/Helpers/TemplatePackageInstaller.cs
@@ -30,7 +30,7 @@ namespace Templates.Test.Helpers
 
             // Locate the artifacts directory containing the built template packages
             var solutionDir = FindAncestorDirectoryContaining("Templating.sln");
-            var artifactsDir = Path.Combine(solutionDir, "artifacts");
+            var artifactsDir = Path.Combine(solutionDir, "artifacts", "build");
             var builtPackages = Directory.GetFiles(artifactsDir, "*.nupkg");
             foreach (var packagePath in builtPackages)
             {