From 35ea3e65066110d5a81debc98d6c4dee7b470b07 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Mon, 1 Jun 2020 13:12:08 -0700
Subject: [PATCH 1/4] Don't explicitly import Arcade SDK in
 AfterSigning.targets

---
 eng/AfterSigning.targets | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets
index 4bbb0dcf0380..f66646d1aae7 100644
--- a/eng/AfterSigning.targets
+++ b/eng/AfterSigning.targets
@@ -1,7 +1,4 @@
 <Project>
-
-  <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(GenerateChecksums)' == 'true'" />
-
   <PropertyGroup Condition="'$(GenerateChecksums)' == 'true'">
     <!-- The one use of ArtifactsDir in Publish.proj adds an additional slash, confusing itself. -->
     <ArtifactsDir Condition=" HasTrailingSlash('$(ArtifactsDir)') ">$(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1))))</ArtifactsDir>
@@ -27,7 +24,4 @@
     </ItemGroup>
 
   </Target>
-
-  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(GenerateChecksums)' == 'true'" />
-
 </Project>

From 9b8db8cf30477a37f8b4e930fdfbc045f240889b Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Mon, 1 Jun 2020 14:46:10 -0700
Subject: [PATCH 2/4] Only import sdk.targets

---
 eng/AfterSigning.targets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets
index f66646d1aae7..03107ead176e 100644
--- a/eng/AfterSigning.targets
+++ b/eng/AfterSigning.targets
@@ -24,4 +24,7 @@
     </ItemGroup>
 
   </Target>
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(GenerateChecksums)' == 'true'" />
+  
 </Project>

From 23d0ad720efae43b84aeaa62cb912cf3e966edeb Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Tue, 2 Jun 2020 09:38:27 -0700
Subject: [PATCH 3/4] Set _SuppressSdkImports

---
 eng/AfterSigning.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets
index 03107ead176e..5217c9403a55 100644
--- a/eng/AfterSigning.targets
+++ b/eng/AfterSigning.targets
@@ -4,6 +4,7 @@
     <ArtifactsDir Condition=" HasTrailingSlash('$(ArtifactsDir)') ">$(ArtifactsDir.Substring(0, $([MSBuild]::Subtract($(ArtifactsDir.Length), 1))))</ArtifactsDir>
     <!-- $(InstallersOutputPath) is not defined. Root Directory.Build.props is not imported. -->
     <InstallersOutputPath>$(ArtifactsDir)\installers\</InstallersOutputPath>
+    <_SuppressSdkImports>false</_SuppressSdkImports>
   </PropertyGroup>
 
   <Target Name="PopulateGenerateChecksumItems"

From e2c251d0a777e2c0f3f4175ae217e83345616efe Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Tue, 2 Jun 2020 13:12:05 -0700
Subject: [PATCH 4/4] Undo whitespace

---
 eng/AfterSigning.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets
index 5217c9403a55..3b11f7394193 100644
--- a/eng/AfterSigning.targets
+++ b/eng/AfterSigning.targets
@@ -27,5 +27,5 @@
   </Target>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(GenerateChecksums)' == 'true'" />
-  
+
 </Project>