From b182624ed44cc93f4ff8e6e6d5e3291b0d04fc5f Mon Sep 17 00:00:00 2001
From: "Brandon Waterloo [MSFT]"
 <36966225+bwateratmsft@users.noreply.github.com>
Date: Thu, 11 Jan 2024 08:33:40 -0500
Subject: [PATCH] Update targets to work correctly with 8.0.100-rc2 and up
 (#4201)

* Update targets to work correctly with 8.0.100-rc2 and up

* Update resources/netCore/GetProjectProperties.targets

Co-authored-by: Chet Husk <baronfel@users.noreply.github.com>

---------

Co-authored-by: Chet Husk <baronfel@users.noreply.github.com>
---
 resources/netCore/GetProjectProperties.targets | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/netCore/GetProjectProperties.targets b/resources/netCore/GetProjectProperties.targets
index c0176c2126..49059f8efc 100644
--- a/resources/netCore/GetProjectProperties.targets
+++ b/resources/netCore/GetProjectProperties.targets
@@ -1,6 +1,12 @@
 <Project>
     <PropertyGroup>
-        <GetProjectPropertiesDependsOn Condition=" '$(SDKContainerSupportEnabled)' == 'true' ">$(GetProjectPropertiesDependsOn);ComputeContainerConfig;</GetProjectPropertiesDependsOn>
+        <!-- Handle the varying properties across the SDK version/PackageReference methods for enabling containerization.
+             For the PackageReference, SDKContainerSupportEnabled is present. For the SDK built-in version,  EnableSdkContainerSupport is the primary flag. 
+             Certain project types have it set automatically, while others require users to manually set the property.
+             So for compat, we need to make sure and be responsive to both flags to check if a project supports containerization.  -->
+        <EnableSdkContainerSupport Condition=" '$(EnableSdkContainerSupport)' == '' ">$(SDKContainerSupportEnabled)</EnableSdkContainerSupport>
+        <GetProjectPropertiesDependsOn Condition=" '$(EnableSdkContainerSupport)' == 'true' ">$(GetProjectPropertiesDependsOn);ComputeContainerConfig;</GetProjectPropertiesDependsOn>
+
     </PropertyGroup>
 
     <Target Name="GetProjectProperties" DependsOnTargets="$(GetProjectPropertiesDependsOn)">
@@ -14,7 +20,7 @@
 $(TargetFramework)$(TargetFrameworks.Split(';')[0])
 $(OutputPath)$(AssemblyName).dll
 $(ContainerWorkingDirectory)/$(AssemblyName).dll
-$(SDKContainerSupportEnabled)
+$(EnableSdkContainerSupport)
 $(InferImageName)"
             Overwrite="True" />
     </Target>