From 3cb672225a4ea847ea6e4081dabea021bc846c01 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Thu, 25 Aug 2022 11:17:15 -0500
Subject: [PATCH 1/2] guardrail to prevent use from unsupported SDK

---
 .../build/Microsoft.NET.Build.Containers.targets          | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Microsoft.NET.Build.Containers/build/Microsoft.NET.Build.Containers.targets b/Microsoft.NET.Build.Containers/build/Microsoft.NET.Build.Containers.targets
index d27e5687..c292cef6 100644
--- a/Microsoft.NET.Build.Containers/build/Microsoft.NET.Build.Containers.targets
+++ b/Microsoft.NET.Build.Containers/build/Microsoft.NET.Build.Containers.targets
@@ -1,4 +1,11 @@
 <Project>
+    <Target Name="_ContainerVerifySDKVersion">
+        <PropertyGroup>
+            <_IsAllowedVersion Condition="$(NETCoreSdkVersion.StartsWith('7.0.100-preview.7')) or $(NETCoreSdkVersion.StartsWith('7.0.100-rc')) or $(NETCoreSdkVersion.StartsWith('7.0.100'))">true</_IsAllowedVersion>
+        </PropertyGroup>
+        <Error Code="CONTAINER002" Text="The current .NET SDK \($(NETCoreSdkVersion)\) doesn't support containerization. Please use version 7.0.100-preview.7 or higher." />
+    </Target>
+
     <Target Name="ComputeContainerConfig">
         <!-- Reference data about this project -->
         <PropertyGroup>
@@ -58,6 +65,7 @@
 
     <PropertyGroup>
         <PublishContainerDependsOn>
+            _ContainerVerifySDKVersion;
             ComputeContainerConfig
         </PublishContainerDependsOn>
     </PropertyGroup>

From 7363854ce5030435d47e2776d9d52d63b161ce3b Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Thu, 25 Aug 2022 12:31:15 -0500
Subject: [PATCH 2/2] add an error that prevents usage on unsupported SDKs

---
 .../build/Microsoft.NET.Build.Containers.targets    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Microsoft.NET.Build.Containers/build/Microsoft.NET.Build.Containers.targets b/Microsoft.NET.Build.Containers/build/Microsoft.NET.Build.Containers.targets
index c292cef6..398967bd 100644
--- a/Microsoft.NET.Build.Containers/build/Microsoft.NET.Build.Containers.targets
+++ b/Microsoft.NET.Build.Containers/build/Microsoft.NET.Build.Containers.targets
@@ -1,9 +1,16 @@
 <Project>
-    <Target Name="_ContainerVerifySDKVersion">
+    <Target Name="_ContainerVerifySDKVersion"
+        Condition="'$(WebPublishMethod)' == 'Container' or '$(PublishProfile)' == 'DefaultContainer'"
+        BeforeTargets="AfterPublish">
+        <!-- If the user has opted into container publishing via their own profile (WebPublishMethod = Container) or
+            via the default Profile (PublishProfile = DefaultContainer), make sure they're on a supported SDK version.
+            We do the explicit profile name check here because for preview6 for example the profile didn't exist, so we
+            can't rely only on the WebPublishMethod. -->
         <PropertyGroup>
-            <_IsAllowedVersion Condition="$(NETCoreSdkVersion.StartsWith('7.0.100-preview.7')) or $(NETCoreSdkVersion.StartsWith('7.0.100-rc')) or $(NETCoreSdkVersion.StartsWith('7.0.100'))">true</_IsAllowedVersion>
+            <!-- Allow preview 7, any RC, or any stable version of 7 -->
+            <_IsAllowedVersion Condition="$(NETCoreSdkVersion.StartsWith('7.0.100-preview.7')) or $(NETCoreSdkVersion.StartsWith('7.0.100-rc')) or ($(NETCoreSdkVersion.StartsWith('7.0.10')) and $(NETCoreSdkVersion.Contains('-')) == false)">true</_IsAllowedVersion>
         </PropertyGroup>
-        <Error Code="CONTAINER002" Text="The current .NET SDK \($(NETCoreSdkVersion)\) doesn't support containerization. Please use version 7.0.100-preview.7 or higher." />
+        <Error Condition="'$(_IsAllowedVersion)' != 'true'" Code="CONTAINER002" Text="The current .NET SDK ($(NETCoreSdkVersion)) doesn't support containerization. Please use version 7.0.100-preview.7 or higher." />
     </Target>
 
     <Target Name="ComputeContainerConfig">