From f58b4640c593d2316f7ddca276c9e50ba68e82e1 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz+git@gmail.com>
Date: Fri, 7 Jun 2024 21:45:16 +1000
Subject: [PATCH] Have local dotnet tools restored with NuGet packages

reverts 8f7e61339
---
 .github/workflows/ci.yml                 | 2 +-
 Common.props                             | 5 +++++
 Dist/.InvokeCLIOnMainSln.sh              | 1 -
 src/BizHawk.Common/BizHawk.Common.csproj | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d539afc8f..969b4c8d5a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,7 +43,7 @@ jobs:
           dotnet-version: "8"
 
       - name: Test
-        run: dotnet tool restore && dotnet test BizHawk.sln -c Release -p:ContinuousIntegrationBuild=true
+        run: dotnet test BizHawk.sln -c Release -p:ContinuousIntegrationBuild=true
         shell: pwsh
 
   package:
diff --git a/Common.props b/Common.props
index 3a18589e5a..ecab4a527c 100644
--- a/Common.props
+++ b/Common.props
@@ -52,4 +52,9 @@
 		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="all" />
 		<PackageReference Include="System.Resources.Extensions" PrivateAssets="all" />
 	</ItemGroup>
+	<Target Name="RestoreTools" BeforeTargets="PreBuildEvent">
+		<!-- why is this not the default behaviour -->
+		<Exec Command="dotnet tool restore"
+			StandardOutputImportance="low" /> <!-- this parameter has almost no documentation, hooray -->
+	</Target>
 </Project>
diff --git a/Dist/.InvokeCLIOnMainSln.sh b/Dist/.InvokeCLIOnMainSln.sh
index 52750bca14..fa09f31098 100755
--- a/Dist/.InvokeCLIOnMainSln.sh
+++ b/Dist/.InvokeCLIOnMainSln.sh
@@ -12,5 +12,4 @@ if [ -z "$NUGET_PACKAGES" ]; then export NUGET_PACKAGES="$HOME/.nuget/packages";
 printf "running 'dotnet %s' in %s configuration, extra args: %s\n" "$cmd" "$config" "$*"
 version=$(grep -Po "MainVersion = \"\K(.*)(?=\")" src/BizHawk.Common/VersionInfo.cs)
 git_hash="$(git rev-parse --verify HEAD 2>/dev/null || printf "0000000000000000000000000000000000000000")"
-dotnet tool restore >/dev/null || (echo "dotnet tool restore failed"; exit 1)
 dotnet "$cmd" BizHawk.sln -c "$config" -m -clp:NoSummary -p:Version="$version" -p:SourceRevisionId="$git_hash" "$@"
diff --git a/src/BizHawk.Common/BizHawk.Common.csproj b/src/BizHawk.Common/BizHawk.Common.csproj
index 45ee07b38e..d0eb269428 100644
--- a/src/BizHawk.Common/BizHawk.Common.csproj
+++ b/src/BizHawk.Common/BizHawk.Common.csproj
@@ -16,7 +16,7 @@
 	<ItemGroup>
 		<Analyzer Include="$(MSBuildProjectDirectory)/../../References/BizHawk.SrcGen.VersionInfo.dll" />
 	</ItemGroup>
-	<Target Name="InstallGitHooks" BeforeTargets="PreBuildEvent">
+	<Target Name="InstallGitHooks" AfterTargets="PreBuildEvent">
 		<Exec Command="dotnet pwsh $(MSBuildProjectDirectory)/../../Dist/install_git_hooks.ps1" />
 	</Target>
 </Project>