From bc6d00d4cc0a480191d31ca19748af4e4c6935eb Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Wed, 18 Jun 2025 09:08:41 -0500
Subject: [PATCH] Load the GetNuGetShortFolderName Task in PackTool.props, so
 that the rest of the product has it ambiently available.

Fixes a reported issue in ios/android/maui builds: https://github.com/search?q=path%3A*.props+OR+path%3A*.targets+AND+%28NOT+path%3A*%2FMicrosoft.NET.PackTool.targets%29+AND+%28NOT+path%3A*%2FMicrosoft.NET.Publish.targets%29+GetNuGetShortFolderName&type=code
---
 .../targets/Microsoft.NET.PackProjectTool.props           | 4 ++++
 .../targets/Microsoft.NET.PackTool.targets                | 8 +++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackProjectTool.props b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackProjectTool.props
index 1edaa328a375..7f037ac79343 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackProjectTool.props
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackProjectTool.props
@@ -10,6 +10,10 @@ Copyright (c) .NET Foundation. All rights reserved.
 ***********************************************************************************************
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- This UsingTask is in the PackTool.props because there is usage of it in other areas of the product
+       and on public GitHub: https://github.com/search?q=path%3A*.props+OR+path%3A*.targets+AND+%28NOT+path%3A*%2FMicrosoft.NET.PackTool.targets%29+AND+%28NOT+path%3A*%2FMicrosoft.NET.Publish.targets%29+GetNuGetShortFolderName&amp;type=code -->
+  <UsingTask TaskName="Microsoft.NET.Build.Tasks.GetNuGetShortFolderName"
+            AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
 
   <PropertyGroup>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_PackProjectToolValidation</TargetsForTfmSpecificContentInPackage>
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets
index d29604b7fa97..83e3f08c54a6 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.PackTool.targets
@@ -33,9 +33,9 @@ NOTE: This file is imported from the following contexts, so be aware when writin
   <UsingTask TaskName="Microsoft.NET.Build.Tasks.GenerateShims"
             AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
   <UsingTask TaskName="Microsoft.NET.Build.Tasks.GetEmbeddedApphostPaths"
-      AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
-  <UsingTask TaskName="Microsoft.NET.Build.Tasks.GetNuGetShortFolderName"
-             AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
+            AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
+  <UsingTask TaskName="AddPackageType"
+            AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
 
   <PropertyGroup>
     <!-- tools are specially-formatted packages, so we tell nuget Pack to not even try to include build output -->
@@ -351,8 +351,6 @@ NOTE: This file is imported from the following contexts, so be aware when writin
     </ItemGroup>
   </Target>
 
-  <UsingTask TaskName="AddPackageType" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
-
   <Target Name="SetDotnetToolPackageType">
 
     <PropertyGroup>