From 3b6b9d0576ee79fc80d91a1d7375b8060ba14f4d Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Thu, 4 Nov 2021 08:37:15 +0530
Subject: [PATCH 1/4] Produce reference assembly in new `ref` output folder

Previously, we were producing the reference assembly in the `OutputPath` directory.
But we also want to produce the reference assembly in a folder `ref` beside `bin` folder.

With that, introduce `ProduceReferenceAssemblyInOutputPath` to control output directory preference;
the `BaseReferenceOutputPath` and `ReferenceOutputPath` as the goto destination for reference assemblies!
---
 .../Microsoft.Common.CurrentVersion.targets   | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/Sources/MSBuild.NET.Legacy.Sdk/Sdk/Microsoft.Common.CurrentVersion.targets b/Sources/MSBuild.NET.Legacy.Sdk/Sdk/Microsoft.Common.CurrentVersion.targets
index 08d2e23..8fb6549 100644
--- a/Sources/MSBuild.NET.Legacy.Sdk/Sdk/Microsoft.Common.CurrentVersion.targets
+++ b/Sources/MSBuild.NET.Legacy.Sdk/Sdk/Microsoft.Common.CurrentVersion.targets
@@ -165,6 +165,23 @@
 		<ProduceReferenceAssembly Condition="'$(ProduceReferenceAssembly)' == '' OR '$(ProduceOnlyReferenceAssembly)' == 'true'">false</ProduceReferenceAssembly>
 	</PropertyGroup>
 
+	<!--
+		By default, we produce reference assemblies in their own `ref` folder under `BuildDir`.
+		But we also want to preserve the previous way of producing a reference assembly in the `OutputPath` too!
+	-->
+	<PropertyGroup Condition="'$(ProduceReferenceAssembly)' == 'true'">
+		<ProduceReferenceAssemblyInOutputPath Condition="'$(ProduceReferenceAssemblyInOutputPath)' == ''">false</ProduceReferenceAssemblyInOutputPath>
+	</PropertyGroup>
+
+	<!-- Introduce `BaseReferenceOutputPath` and `ReferenceOutputPath` as the goto destination for reference assemblies -->
+	<PropertyGroup Condition="'$(ProduceReferenceAssembly)' == 'true' AND '$(ProduceReferenceAssemblyInOutputPath)' == 'false'">
+		<BaseReferenceOutputPath Condition="'$(BaseReferenceOutputPath)' == ''">$(BuildDir)ref\</BaseReferenceOutputPath>
+		<BaseReferenceOutputPath Condition="!HasTrailingSlash('$(BaseReferenceOutputPath)')">$(BaseReferenceOutputPath)\</BaseReferenceOutputPath>
+		<ReferenceOutputPath Condition="'$(ReferenceOutputPath)' == '' AND '$(Platform)' == 'AnyCPU'">$(BaseReferenceOutputPath)$(Configuration)\</ReferenceOutputPath>
+		<ReferenceOutputPath Condition="'$(ReferenceOutputPath)' == '' AND '$(Platform)' != 'AnyCPU'">$(BaseReferenceOutputPath)$(Platform)\$(Configuration)\</ReferenceOutputPath>
+		<ReferenceOutputPath Condition="!HasTrailingSlash('$(ReferenceOutputPath)')">$(ReferenceOutputPath)\</ReferenceOutputPath>
+	</PropertyGroup>
+
 	<!--
 		For Legacy projects that define properties per Configuration/Platform combination, the validity of an
 		invalid combination is determined by the non-empty value of the 'OutputPath' property specified under
@@ -239,8 +256,13 @@
 		<TargetDir Condition="'$(OutDir)' != ''">$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)', '$(OutDir)'))</TargetDir>
 		<!-- Example, C:\MyProjects\MyProject\bin\Debug\MyAssembly.dll -->
 		<TargetPath Condition="'$(TargetPath)' == ''">$(TargetDir)$(TargetFileName)</TargetPath>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(TargetRefPath)' == '' AND '$(ProduceReferenceAssembly)' == 'true'">
 		<!-- Example, C:\MyProjects\MyProject\bin\Debug\ref\MyAssembly.dll -->
-		<TargetRefPath Condition="'$(TargetRefPath)' == '' AND '$(ProduceReferenceAssembly)' == 'true'">$([MSBuild]::NormalizePath('$(TargetDir)', 'ref', '$(TargetFileName)'))</TargetRefPath>
+		<TargetRefPath Condition="'$(ProduceReferenceAssemblyInOutputPath)' != 'false'">$([MSBuild]::NormalizePath('$(TargetDir)', 'ref', '$(TargetFileName)'))</TargetRefPath>
+		<!-- Example, C:\MyProjects\MyProject\ref\Debug\MyAssembly.dll -->
+		<TargetRefPath Condition="'$(ProduceReferenceAssemblyInOutputPath)' == 'false'">$([MSBuild]::NormalizePath('$(ReferenceOutputPath)', '$(TargetFileName)'))</TargetRefPath>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -361,7 +383,8 @@
 	<ItemGroup Condition="'$(ProduceReferenceAssembly)' == 'true'">
 		<IntermediateRefAssembly Include="$(IntermediateOutputPath)ref\$(TargetName)$(TargetExt)" Condition="@(IntermediateRefAssembly->Count()) == 0"/>
 		<CreateDirectory Include="@(IntermediateRefAssembly->'%(RootDir)%(Directory)')"/>
-		<CreateDirectory Include="$(OutDir)ref"/>
+		<CreateDirectory Include="$(OutDir)ref" Condition="'$(ProduceReferenceAssemblyInOutputPath)' != 'false'"/>
+		<CreateDirectory Include="$(ReferenceOutputPath)" Condition="'$(ProduceReferenceAssemblyInOutputPath)' == 'false'"/>
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(_DebugSymbolsProduced)' == 'true'">

From e1ec30060d819d674154d8cc902dd150f0fd9c54 Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Wed, 8 Dec 2021 09:02:34 +0530
Subject: [PATCH 2/4] Check and De-Duplicate NuGet Items

- Check, Warn and De-Duplicate NuGet Items
  This applies to `PackageReference`, `PackageVersion` and `PackageDownload` item types.
---
 .../Core/NuGet.Restore.targets                | 91 +++++++++++++++++--
 .../NuGet.Build.Sdk/Tasks/NuGet.Restore.tasks |  1 +
 2 files changed, 84 insertions(+), 8 deletions(-)

diff --git a/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets b/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets
index 70d1a24..2ce4df2 100644
--- a/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets
+++ b/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets
@@ -174,33 +174,108 @@
 					CollectPackageReferences
 
 		Gathers all PackageReference items from the project.
-		This target may be used as an extension point to modify
-		package references before NuGet reads them.
+		This target may be used as a pivot point for 'BeforeTargets'
+		extension point (do not use 'AfterTargets') to modify
+		package downloads before NuGet reads them.
 	============================================================
 	-->
-	<Target Name="CollectPackageReferences" Returns="@(PackageReference)"/>
+	<Target Name="CollectPackageReferences" Returns="@(PackageReference)">
+
+		<!-- Design-Time builds should not produce a build error. So, we need to ensure that we continue on error -->
+		<PropertyGroup>
+			<CollectPackageReferencesContinueOnError>$([MSBuild]::ValueOrDefault($(ContinueOnError), 'false'))</CollectPackageReferencesContinueOnError>
+		</PropertyGroup>
+
+		<CheckForDuplicateNuGetItemsTask
+			LogCode="NU1504"
+			NoWarn="$(NoWarn)"
+			Items="@(PackageReference)"
+			ItemName="PackageReference"
+			WarningsAsErrors="$(WarningsAsErrors)"
+			TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
+			MSBuildProjectFullPath="$(MSBuildProjectFullPath)"
+			ContinueOnError="$(CollectPackageReferencesContinueOnError)"
+			Condition="'$(DisableCheckingDuplicateNuGetItems)' != 'true'">
+			<Output TaskParameter="DeduplicatedItems" ItemName="DeduplicatedPackageReference"/>
+		</CheckForDuplicateNuGetItemsTask>
+
+		<ItemGroup Condition="'@(DeduplicatedPackageReference)' != ''">
+			<PackageReference Remove="@(PackageReference)"/>
+			<PackageReference Include="@(DeduplicatedPackageReference)"/>
+		</ItemGroup>
+	</Target>
 
 	<!--
 	============================================================
 					CollectCentralPackageVersions
 
 		Gathers all PackageVersion items from the central package versions file.
-		This target may be used as an extension point to modify
-		package versions before NuGet reads them.
+		This target may be used as a pivot point for 'BeforeTargets'
+		extension point (do not use 'AfterTargets') to modify
+		package downloads before NuGet reads them.
 	============================================================
 	-->
-	<Target Name="CollectCentralPackageVersions" Returns="@(PackageVersion)"/>
+	<Target Name="CollectCentralPackageVersions" Returns="@(PackageVersion)">
+
+		<!-- Design-Time builds should not produce a build error. So, we need to ensure that we continue on error -->
+		<PropertyGroup>
+			<CollectCentralPackageVersionsContinueOnError>$([MSBuild]::ValueOrDefault($(ContinueOnError), 'false'))</CollectCentralPackageVersionsContinueOnError>
+		</PropertyGroup>
+
+		<CheckForDuplicateNuGetItemsTask
+			LogCode="NU1505"
+			NoWarn="$(NoWarn)"
+			Items="@(PackageVersion)"
+			ItemName="PackageVersion"
+			WarningsAsErrors="$(WarningsAsErrors)"
+			TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
+			MSBuildProjectFullPath="$(MSBuildProjectFullPath)"
+			ContinueOnError="$(CollectCentralPackageVersionsContinueOnError)"
+			Condition="'$(DisableCheckingDuplicateNuGetItems)' != 'true'">
+			<Output TaskParameter="DeduplicatedItems" ItemName="DeduplicatedPackageVersion"/>
+		</CheckForDuplicateNuGetItemsTask>
+
+		<ItemGroup Condition="'@(DeduplicatedPackageVersion)' != ''">
+			<PackageVersion Remove="@(PackageVersion)"/>
+			<PackageVersion Include="@(DeduplicatedPackageVersion)"/>
+		</ItemGroup>
+	</Target>
 
 	<!--
 	============================================================
 					CollectPackageDownloads
 
 		Gathers all PackageDownload items from the project.
-		This target may be used as an extension point to modify
+		This target may be used as a pivot point for 'BeforeTargets'
+		extension point (do not use 'AfterTargets') to modify
 		package downloads before NuGet reads them.
 	============================================================
 	-->
-	<Target Name="CollectPackageDownloads" Returns="@(PackageDownload)"/>
+	<Target Name="CollectPackageDownloads" Returns="@(PackageDownload)">
+
+		<!-- Design-Time builds should not produce a build error. So, we need to ensure that we continue on error -->
+		<PropertyGroup>
+			<CollectPackageDownloadsContinueOnError>$([MSBuild]::ValueOrDefault($(ContinueOnError), 'false'))</CollectPackageDownloadsContinueOnError>
+		</PropertyGroup>
+
+		<CheckForDuplicateNuGetItemsTask
+			LogCode="NU1505"
+			NoWarn="$(NoWarn)"
+			Items="@(PackageDownload)"
+			ItemName="PackageDownload"
+			WarningsAsErrors="$(WarningsAsErrors)"
+			TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
+			MSBuildProjectFullPath="$(MSBuildProjectFullPath)"
+			ContinueOnError="$(CollectPackageDownloadsContinueOnError)"
+			Condition="'$(DisableCheckingDuplicateNuGetItems)' != 'true'">
+			<Output TaskParameter="DeduplicatedItems" ItemName="DeduplicatedPackageDownload"/>
+		</CheckForDuplicateNuGetItemsTask>
+
+		<ItemGroup Condition="'@(DeduplicatedPackageDownload)' != ''">
+			<PackageDownload Remove="@(PackageDownload)"/>
+			<PackageDownload Include="@(DeduplicatedPackageDownload)"/>
+		</ItemGroup>
+	</Target>
 
 	<!--
 	============================================================
diff --git a/Sources/NuGet.Build.Sdk/Tasks/NuGet.Restore.tasks b/Sources/NuGet.Build.Sdk/Tasks/NuGet.Restore.tasks
index 193147b..105790a 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.CheckForDuplicateNuGetItemsTask"/>
 	<UsingTask AssemblyFile="$(NuGetRestoreTasksAssemblyFile)" TaskName="NuGet.Build.Tasks.WarnForInvalidProjectsTask"/>
 	<UsingTask AssemblyFile="$(NuGetRestoreTasksAssemblyFile)" TaskName="NuGet.Build.Tasks.GetCentralPackageVersionsTask"/>
 	<UsingTask AssemblyFile="$(NuGetRestoreTasksAssemblyFile)" TaskName="NuGet.Build.Tasks.GetProjectTargetFrameworksTask"/>

From 8f08ac329ba95a81d20823faefabceb3b25ccbcd Mon Sep 17 00:00:00 2001
From: Nirmal Guru <Nirmal4G@gmail.com>
Date: Wed, 8 Dec 2021 09:05:27 +0530
Subject: [PATCH 3/4] Allow overrides for Restore properties

- Allow overrides for properties such as
  1. `ManagePackageVersionsCentrally`
  2. `RestoreEnableGlobalPackageReference`
  3. `DisableCheckingDuplicatePackage(Download|Reference|Version)s`
---
 Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets       | 9 ++++++---
 .../NuGet.Build.Sdk/Extensions/Directory.Packages.props  | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets b/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets
index 2ce4df2..558e6d3 100644
--- a/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets
+++ b/Sources/NuGet.Build.Sdk/Core/NuGet.Restore.targets
@@ -184,6 +184,7 @@
 		<!-- Design-Time builds should not produce a build error. So, we need to ensure that we continue on error -->
 		<PropertyGroup>
 			<CollectPackageReferencesContinueOnError>$([MSBuild]::ValueOrDefault($(ContinueOnError), 'false'))</CollectPackageReferencesContinueOnError>
+			<DisableCheckingDuplicatePackageReferences>$([MSBuild]::ValueOrDefault($(DisableCheckingDuplicateNuGetItems), $(DisableCheckingDuplicatePackageReferences)))</DisableCheckingDuplicatePackageReferences>
 		</PropertyGroup>
 
 		<CheckForDuplicateNuGetItemsTask
@@ -195,7 +196,7 @@
 			TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
 			MSBuildProjectFullPath="$(MSBuildProjectFullPath)"
 			ContinueOnError="$(CollectPackageReferencesContinueOnError)"
-			Condition="'$(DisableCheckingDuplicateNuGetItems)' != 'true'">
+			Condition="'$(DisableCheckingDuplicatePackageReferences)' != 'true'">
 			<Output TaskParameter="DeduplicatedItems" ItemName="DeduplicatedPackageReference"/>
 		</CheckForDuplicateNuGetItemsTask>
 
@@ -220,6 +221,7 @@
 		<!-- Design-Time builds should not produce a build error. So, we need to ensure that we continue on error -->
 		<PropertyGroup>
 			<CollectCentralPackageVersionsContinueOnError>$([MSBuild]::ValueOrDefault($(ContinueOnError), 'false'))</CollectCentralPackageVersionsContinueOnError>
+			<DisableCheckingDuplicatePackageVersions>$([MSBuild]::ValueOrDefault($(DisableCheckingDuplicateNuGetItems), $(DisableCheckingDuplicatePackageVersions)))</DisableCheckingDuplicatePackageVersions>
 		</PropertyGroup>
 
 		<CheckForDuplicateNuGetItemsTask
@@ -231,7 +233,7 @@
 			TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
 			MSBuildProjectFullPath="$(MSBuildProjectFullPath)"
 			ContinueOnError="$(CollectCentralPackageVersionsContinueOnError)"
-			Condition="'$(DisableCheckingDuplicateNuGetItems)' != 'true'">
+			Condition="'$(DisableCheckingDuplicatePackageVersions)' != 'true'">
 			<Output TaskParameter="DeduplicatedItems" ItemName="DeduplicatedPackageVersion"/>
 		</CheckForDuplicateNuGetItemsTask>
 
@@ -256,6 +258,7 @@
 		<!-- Design-Time builds should not produce a build error. So, we need to ensure that we continue on error -->
 		<PropertyGroup>
 			<CollectPackageDownloadsContinueOnError>$([MSBuild]::ValueOrDefault($(ContinueOnError), 'false'))</CollectPackageDownloadsContinueOnError>
+			<DisableCheckingDuplicatePackageDownloads>$([MSBuild]::ValueOrDefault($(DisableCheckingDuplicateNuGetItems), $(DisableCheckingDuplicatePackageDownloads)))</DisableCheckingDuplicatePackageDownloads>
 		</PropertyGroup>
 
 		<CheckForDuplicateNuGetItemsTask
@@ -267,7 +270,7 @@
 			TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
 			MSBuildProjectFullPath="$(MSBuildProjectFullPath)"
 			ContinueOnError="$(CollectPackageDownloadsContinueOnError)"
-			Condition="'$(DisableCheckingDuplicateNuGetItems)' != 'true'">
+			Condition="'$(DisableCheckingDuplicatePackageDownloads)' != 'true'">
 			<Output TaskParameter="DeduplicatedItems" ItemName="DeduplicatedPackageDownload"/>
 		</CheckForDuplicateNuGetItemsTask>
 
diff --git a/Sources/NuGet.Build.Sdk/Extensions/Directory.Packages.props b/Sources/NuGet.Build.Sdk/Extensions/Directory.Packages.props
index 7e17724..2716743 100644
--- a/Sources/NuGet.Build.Sdk/Extensions/Directory.Packages.props
+++ b/Sources/NuGet.Build.Sdk/Extensions/Directory.Packages.props
@@ -45,9 +45,9 @@
 	<Import Project="$(DirectoryPackagesProps)" Condition="Exists('$(DirectoryPackagesProps)')"/>
 
 	<PropertyGroup Condition="Exists('$(DirectoryPackagesProps)')">
-		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 		<CentralPackageVersionsFileImported>true</CentralPackageVersionsFileImported>
-		<RestoreEnableGlobalPackageReference>true</RestoreEnableGlobalPackageReference>
+		<ManagePackageVersionsCentrally Condition="'$(ManagePackageVersionsCentrally)' == ''">true</ManagePackageVersionsCentrally>
+		<RestoreEnableGlobalPackageReference Condition="'$(RestoreEnableGlobalPackageReference)' == ''">true</RestoreEnableGlobalPackageReference>
 	</PropertyGroup>
 
 </Project>
\ No newline at end of file

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 4/4] 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"/>