Work around dotnet tool restore issue

Author: wtgodbe

eng/Tools.props

@@ -10,6 +10,10 @@
     <PackageReference Include="Yarn.MSBuild" Version="1.22.10" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <AspnetTempConfigPath>$([MSBuild]::NormalizePath('$(RepoRoot)', '.tempconfig'))</AspnetTempConfigPath>
+  </PropertyGroup>
+
   <!-- Update the generated files when we restore projects. Skip in desktop msbuild due to VS 16.8 requirements. -->
   <Target Name="GenerateDirectoryBuildFiles"
       AfterTargets="Restore"
@@ -22,4 +26,14 @@
         RemoveProperties="BaseIntermediateOutputPath;ExcludeRestorePackageImports"
         Targets="GenerateDirectoryBuildFiles" />
   </Target>
-</Project>
+
+  <Target Name="RestoreAspnetRepoTools"
+          Condition="'$(DotNetBuildFromSource)' != 'true' and Exists('$(AspnetTempConfigPath)')"
+          BeforeTargets="Restore">
+
+    <Exec Command='"$(DotNetTool)" tool restore' WorkingDirectory="$([MSBuild]::NormalizePath('$(AspnetTempConfigPath)', 'dotnet-dump'))" />
+    <Exec Command='"$(DotNetTool)" tool restore' WorkingDirectory="$([MSBuild]::NormalizePath('$(AspnetTempConfigPath)', 'dotnet-serve'))" />
+    <Exec Command='"$(DotNetTool)" tool restore' WorkingDirectory="$([MSBuild]::NormalizePath('$(AspnetTempConfigPath)', 'dotnet-ef'))" />
+    <Exec Command='"$(DotNetTool)" tool restore' WorkingDirectory="$([MSBuild]::NormalizePath('$(AspnetTempConfigPath)', 'Microsoft.Playwright.CLI'))" />
+  </Target>
+</Project>

eng/tools/GenerateFiles/GenerateFiles.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net5.0</TargetFramework>
     <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
 
-    <ConfigDirectory>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.config'))</ConfigDirectory>
+    <ConfigDirectory>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', '.tempconfig'))</ConfigDirectory>
   </PropertyGroup>
 
   <ItemGroup>
@@ -43,9 +43,24 @@
       Properties="$(_TemplateProperties)"
       OutputPath="$(BaseOutputPath)Directory.Build.targets" />
 
-    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(ConfigDirectory)dotnet-tools.json" />
-    <GenerateFileFromTemplate TemplateFile="$(MSBuildThisFileDirectory)dotnet-tools.json.in"
+    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(ConfigDirectory)dotnet-tools.dotnet-dump.json.in" />
+    <GenerateFileFromTemplate TemplateFile="$(MSBuildThisFileDirectory)dotnet-tools.dotnet-dump.json.in"
       Properties="$(_TemplateProperties)"
-      OutputPath="$(ConfigDirectory)dotnet-tools.json" />
+      OutputPath="$(ConfigDirectory)dotnet-dump/dotnet-tools.json" />
+
+    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(ConfigDirectory)dotnet-tools.dotnet-serve.json.in" />
+    <GenerateFileFromTemplate TemplateFile="$(MSBuildThisFileDirectory)dotnet-tools.dotnet-serve.json.in"
+      Properties="$(_TemplateProperties)"
+      OutputPath="$(ConfigDirectory)dotnet-serve/dotnet-tools.json" />
+
+    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(ConfigDirectory)dotnet-tools.dotnet-ef.json.in" />
+    <GenerateFileFromTemplate TemplateFile="$(MSBuildThisFileDirectory)dotnet-tools.dotnet-ef.json.in"
+      Properties="$(_TemplateProperties)"
+      OutputPath="$(ConfigDirectory)dotnet-ef/dotnet-tools.json" />
+
+    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; $(ConfigDirectory)dotnet-tools.Microsoft.Playwright.CLI.json.in" />
+    <GenerateFileFromTemplate TemplateFile="$(MSBuildThisFileDirectory)dotnet-tools.Microsoft.Playwright.CLI.json.in"
+      Properties="$(_TemplateProperties)"
+      OutputPath="$(ConfigDirectory)Microsoft.Playwright.CLI/dotnet-tools.json" />
   </Target>
 </Project>

eng/tools/GenerateFiles/dotnet-tools.Microsoft.Playwright.CLI.json.in

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "Microsoft.Playwright.CLI": {
+      "version": "${MicrosoftPlaywrightCLIVersion}",
+      "commands": [
+        "playwright"
+      ]
+    }
+  }
+}

eng/tools/GenerateFiles/dotnet-tools.dotnet-dump.json.in

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-dump": {
+      "version": "${DotnetDumpVersion}",
+      "commands": [
+        "dotnet-dump"
+      ]
+    }
+  }
+}

eng/tools/GenerateFiles/dotnet-tools.dotnet-ef.json.in

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "${DotnetEfVersion}",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

eng/tools/GenerateFiles/dotnet-tools.dotnet-serve.json.in

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-serve": {
+      "version": "${DotnetServeVersion}",
+      "commands": [
+        "dotnet-serve"
+      ]
+    }
+  }
+}