From 4a563163cd055d0f5e7d13ac94f9f47994012017 Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Wed, 8 Dec 2021 09:10:57 +0530
Subject: [PATCH] Prefer "TargetFramework" when specified globally

- Prefer "TargetFramework" over its plural counterpart
  when specified globally, like on the command-line
  and in the MSBuild task, Properties metadata.

- This also adds a "GetGlobalPropertyValueTask" for getting global properties.
---
 .../Core/NuGet.Restore.targets                | 34 ++++++++++++++++---
 .../NuGet.Build.Sdk/Tasks/NuGet.Restore.tasks |  1 +
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets b/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets
index 558e6d3..f51ddb4 100644
--- a/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets
+++ b/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets
@@ -597,18 +597,20 @@
 	============================================================
 	-->
 	<Target Name="_GetRestoreTargetFrameworksOutput"
-			DependsOnTargets="_GetRestoreProjectStyle"
+			DependsOnTargets="_GetRestoreProjectStyle;_CheckIfGlobalTargetFramework"
 			Returns="@(_RestoreTargetFrameworksOutputFiltered)">
 
 		<PropertyGroup>
 			<_RestoreProjectFramework/>
+			<_PreferredTargetFrameworks Condition="'$(_IsGlobalTargetFramework)' == 'true'">$(TargetFramework)</_PreferredTargetFrameworks>
+			<_PreferredTargetFrameworks Condition="'$(_IsGlobalTargetFramework)' != 'true'">$(TargetFrameworks)</_PreferredTargetFrameworks>
 		</PropertyGroup>
 
 		<!-- For project.json projects target frameworks will be read from project.json -->
 		<GetProjectTargetFrameworksTask
 			Condition="'$(RestoreProjectStyle)' != 'ProjectJson'"
 			ProjectPath="$(MSBuildProjectFullPath)"
-			TargetFrameworks="$(TargetFrameworks)"
+			TargetFrameworks="$(_PreferredTargetFrameworks)"
 			TargetFramework="$(TargetFramework)"
 			TargetFrameworkMoniker="$(TargetFrameworkMoniker)"
 			TargetPlatformIdentifier="$(TargetPlatformIdentifier)"
@@ -630,13 +632,16 @@
 
 		Read $(TargetFrameworks) from the project as items.
 		Projects that do not have $(TargetFrameworks) will noop.
+		If $(TargetFramework) is specified globally, it'll be preferred over $(TargetFrameworks)
 	============================================================
 	-->
 	<Target Name="_GetRestoreTargetFrameworksAsItems"
-			DependsOnTargets="_GetRestoreProjectStyle"
+			DependsOnTargets="_GetRestoreProjectStyle;_CheckIfGlobalTargetFramework"
 			Returns="@(_RestoreTargetFrameworkItems)">
 		<ItemGroup Condition="'$(TargetFrameworks)' != ''">
-			<_RestoreTargetFrameworkItems Include="$(TargetFrameworks.Split(';'))"/>
+			<_RestoreTargetFrameworkItems Include="$(TargetFrameworks.Split(';'))" Condition="'$(_IsGlobalTargetFramework)' != 'true'"/>
+			<!-- Use $(TargetFramework) instead of $(TargetFrameworks) when it is specified globally (i.e., on the command-line) -->
+			<_RestoreTargetFrameworkItems Include="$(TargetFramework)" Condition="'$(_IsGlobalTargetFramework)' == 'true'"/>
 		</ItemGroup>
 	</Target>
 
@@ -1376,6 +1381,27 @@
 		</PropertyGroup>
 	</Target>
 
+	<!--
+	============================================================
+				_CheckIfGlobalTargetFramework
+	============================================================
+	-->
+	<Target Name="_CheckIfGlobalTargetFramework"
+			Condition="'$(_DisableNuGetRestoreTargetFrameworksOverride)' != 'true'"
+			Returns="$(_IsGlobalTargetFramework)">
+
+		<!-- Check if $(TargetFramework) is a global property (i.e., specified on the command-line) -->
+		<GetGlobalPropertyValueTask
+			PropertyName="TargetFramework"
+			Condition="'$(TargetFramework)' != ''">
+			<Output TaskParameter="GlobalPropertyValue" PropertyName="_GlobalTargetFramework"/>
+		</GetGlobalPropertyValueTask>
+
+		<PropertyGroup Condition="'$(_GlobalTargetFramework)' != ''">
+			<_IsGlobalTargetFramework Condition="'$(_GlobalTargetFramework)' == '$(TargetFramework)'">true</_IsGlobalTargetFramework>
+		</PropertyGroup>
+	</Target>
+
 	<!--
 	============================================================
 					_IsProjectRestoreSupported
diff --git a/Sources/NuGet.Build.Sdk/Tasks/NuGet.Restore.tasks b/Sources/NuGet.Build.Sdk/Tasks/NuGet.Restore.tasks
index 105790a..c194ab8 100644
--- a/Sources/NuGet.Build.Sdk/Tasks/NuGet.Restore.tasks
+++ b/Sources/NuGet.Build.Sdk/Tasks/NuGet.Restore.tasks
@@ -9,6 +9,7 @@
 
 	<!-- NuGet's Common Tasks -->
 	<UsingTask AssemblyFile="$(NuGetRestoreTasksAssemblyFile)" TaskName="NuGet.Build.Tasks.NuGetMessageTask"/>
+	<UsingTask AssemblyFile="$(NuGetRestoreTasksAssemblyFile)" TaskName="NuGet.Build.Tasks.GetGlobalPropertyValueTask"/>
 	<UsingTask AssemblyFile="$(NuGetRestoreTasksAssemblyFile)" TaskName="NuGet.Build.Tasks.CheckForDuplicateNuGetItemsTask"/>
 	<UsingTask AssemblyFile="$(NuGetRestoreTasksAssemblyFile)" TaskName="NuGet.Build.Tasks.WarnForInvalidProjectsTask"/>
 	<UsingTask AssemblyFile="$(NuGetRestoreTasksAssemblyFile)" TaskName="NuGet.Build.Tasks.GetCentralPackageVersionsTask"/>