From 43108eda7850474198636e0b08293a5e92571486 Mon Sep 17 00:00:00 2001
From: Alan McGovern <alan.mcgovern@gmail.com>
Date: Wed, 17 Jul 2024 13:29:00 +0100
Subject: [PATCH] Create the 'out' directory before restoring packages

This makes it easier to guarantee the path always exists so msbuild
/t:Restore more reliably succeeds.

Don't rely on running the 'pack' command to create the directory.
---
 build.proj                  | 2 +-
 src/Directory.Build.props   | 4 +++-
 src/Directory.Build.targets | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.proj b/build.proj
index b5e98d26e..da0c0249e 100644
--- a/build.proj
+++ b/build.proj
@@ -5,6 +5,7 @@
         <CI Condition="'$(CI)' == '' ">false</CI>
 
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <!-- this is also in src/Directory.Build.props -->
         <Out Condition=" '$(Out)' == '' ">$(MSBuildThisFileDirectory)out</Out>
 
         <MSBuildCommonProperties>$(MSBuildCommonProperties);Deterministic=true</MSBuildCommonProperties>
@@ -39,7 +40,6 @@
     </Target>
 
     <Target Name="Pack">
-        <MakeDir Directories="$(Out)" />
         <MSBuild
             Projects="@(PackFile)"
             Properties="$(MSBuildCommonProperties);Configuration=%(PackFile.Configuration);PackageOutputPath=$(Out)"
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 1ab5757b2..87a8a8310 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -46,7 +46,9 @@
     <Deterministic>true</Deterministic>
     <RestorePackagesWithLockFile>false</RestorePackagesWithLockFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    
+
+    <Out Condition=" '$(Out)' == ''">$(MSBuildThisFileDirectory)..\out</Out>
+
     <!-- These are essentially junk if i'm compiling against net472/NetStandard2.0 and newer targets.
          Most rules result in uncompilable net472 code, so let's ignore them as i don't want to wade
          through fixing/ignoring hundreds of rules with little real-world value. -->
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 98beade74..f3436d501 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -42,6 +42,10 @@
     <PackageReference Update="System.Memory" Version="$(SystemMemoryVersion)" />
   </ItemGroup>
 
+  <Target Name="CreateOutDirectory" BeforeTargets="_GetAllRestoreProjectPathItems;Restore;BeforeResolveReferences;CollectPackageReferences">
+    <MakeDir Directories="$(Out)" />
+  </Target>
+
   <Target Name="SetAssemblyVersion" BeforeTargets="GetAssemblyVersion" Condition="'$(RestoreSuccess)' != 'true' Or '$(Configuration)' == 'Debug' Or '$(GitInfoVersion)' == '' ">
     <PropertyGroup>
       <Version>0.0.0.1</Version>