From 65656e7172bd6211b99a0a8fbdb547eff657afa0 Mon Sep 17 00:00:00 2001
From: "Nikola Milosavljevic (CLR)" <nikolam@microsoft.com>
Date: Mon, 31 Aug 2020 12:29:38 -0700
Subject: [PATCH 1/5] Enable closure validation

---
 .../pkg/projects/Directory.Build.targets      | 22 ++++++++++++++++++
 .../pkg/legacy/Microsoft.NETCore.App.pkgproj  | 23 +++++++++++++++++++
 2 files changed, 45 insertions(+)

diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets
index 3e307549eecc09..c9bf633520b6f8 100644
--- a/src/installer/pkg/projects/Directory.Build.targets
+++ b/src/installer/pkg/projects/Directory.Build.targets
@@ -145,6 +145,28 @@
     </ItemGroup>
   </Target>
 
+  <!--
+    Overriding VerifyClosure target to enable closure validation without other validations.
+  -->
+  <Target Name="VerifyClosure"
+          DependsOnTargets="GetClosureFiles"
+          Condition="'$(SkipValidatePackage)' != 'true' or '$(ShouldVerifyClosure)' == 'true'"
+          Inputs="%(ClosureFile.FileSet)"
+          Outputs="batching-on-FileSet-metadata">
+    <ItemGroup>
+      <_closureFileNames Include="@(ClosureFile->'%(FileName)')" Original="%(Identity)" />
+
+      <_closureFileNamesFiltered Include="@(_closureFileNames)" Exclude="@(ExcludeFromClosure)"/>
+      <_closureFileFiltered Include="@(_closureFileNamesFiltered->'%(Original)')"/>
+    </ItemGroup>
+
+    <Message Importance="High" Text="Verifying closure of $(Id) %(ClosureFile.FileSet) assemblies" />
+    <VerifyClosure
+      Sources="@(_closureFileFiltered)"
+      IgnoredReferences="@(IgnoredReference)"
+      DependencyGraphFilePath="$(PackageReportDir)$(Id)$(NuspecSuffix)-%(ClosureFile.FileSet).dgml" />
+  </Target>
+
   <!--
     Finds symbol files and injects them into the package build.
   -->
diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj
index 4ca074396a5380..3dd6ed1394345c 100644
--- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj
+++ b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj
@@ -7,8 +7,31 @@
     -->
     <BuildLineupPackage>false</BuildLineupPackage>
 
+    <ShouldVerifyClosure>true</ShouldVerifyClosure>
+
     <FrameworkListTargetPath>data/</FrameworkListTargetPath>
     <SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- netstandard will have cycles because OOB packages target netstandard and are used in netstandard closure,
+       We do ensure that netstandard inside the shared framework has no cycles, but we permit them in packages in order to allow for simpler netstandard-based builds.-->
+    <IgnoredReference Include="netstandard" />
+    <!-- windows.winmd is not part of the framework -->
+    <IgnoredReference Include="Windows" />
+
+    <!-- Exclude shims from the closure verification -->
+    <ExcludeFromClosure Include="mscorlib" />
+    <ExcludeFromClosure Include="System" />
+    <ExcludeFromClosure Include="System.Configuration" />
+    <ExcludeFromClosure Include="System.Core" />
+    <ExcludeFromClosure Include="System.Data" />
+    <ExcludeFromClosure Include="System.Drawing" />
+    <ExcludeFromClosure Include="System.Net" />
+    <ExcludeFromClosure Include="System.Security" />
+    <ExcludeFromClosure Include="System.ServiceModel.Web" />
+    <ExcludeFromClosure Include="System.ServiceProcess" />
+    <ExcludeFromClosure Include="System.Transactions" />
+    <ExcludeFromClosure Include="WindowsBase" />
+  </ItemGroup>
 </Project>

From 58cf696fc4a640c4a794c1d112bf4ad98591c63d Mon Sep 17 00:00:00 2001
From: "Nikola Milosavljevic (CLR)" <nikolam@microsoft.com>
Date: Tue, 1 Sep 2020 09:46:07 -0700
Subject: [PATCH 2/5] Ensure dependency graph directory exists

---
 src/installer/pkg/projects/Directory.Build.targets | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets
index c9bf633520b6f8..15b0e9808146b1 100644
--- a/src/installer/pkg/projects/Directory.Build.targets
+++ b/src/installer/pkg/projects/Directory.Build.targets
@@ -161,10 +161,20 @@
     </ItemGroup>
 
     <Message Importance="High" Text="Verifying closure of $(Id) %(ClosureFile.FileSet) assemblies" />
+
+    <PropertyGroup>
+      <_DependencyGraphFilePath>$(PackageReportDir)$(Id)$(NuspecSuffix)-%(ClosureFile.FileSet).dgml</_DependencyGraphFilePath>
+      <_DependencyGraphDir>$([System.IO.Path]::GetDirectoryName($(_DependencyGraphFilePath)))</_DependencyGraphDir>
+    </PropertyGroup>
+
+    <!-- Ensure directory for dependency graph file exists. -->
+    <MakeDir Condition="!Exists('$(_DependencyGraphDir')"
+             Directories="$(_DependencyGraphDir)" />
+
     <VerifyClosure
       Sources="@(_closureFileFiltered)"
       IgnoredReferences="@(IgnoredReference)"
-      DependencyGraphFilePath="$(PackageReportDir)$(Id)$(NuspecSuffix)-%(ClosureFile.FileSet).dgml" />
+      DependencyGraphFilePath="$(_DependencyGraphFilePath)" />
   </Target>
 
   <!--

From d4395afe1e56cf7972394eafe36e645a56bd6245 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Wed, 2 Sep 2020 00:28:06 +0000
Subject: [PATCH 3/5] Netstandard should not be ignored

---
 .../netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj        | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj
index 3dd6ed1394345c..5636c4b32e44cc 100644
--- a/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj
+++ b/src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj
@@ -14,9 +14,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <!-- netstandard will have cycles because OOB packages target netstandard and are used in netstandard closure,
-       We do ensure that netstandard inside the shared framework has no cycles, but we permit them in packages in order to allow for simpler netstandard-based builds.-->
-    <IgnoredReference Include="netstandard" />
     <!-- windows.winmd is not part of the framework -->
     <IgnoredReference Include="Windows" />
 

From 7a424492c9e87a4b17c7cba7a03e04bad754bcf2 Mon Sep 17 00:00:00 2001
From: "Nikola Milosavljevic (CLR)" <nikolam@microsoft.com>
Date: Wed, 2 Sep 2020 10:09:49 -0700
Subject: [PATCH 4/5] Ensure Reports dir exists; VerifyClosure change moved to
 Arcade

---
 .../pkg/projects/Directory.Build.targets      | 33 +++----------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets
index 15b0e9808146b1..383e5549c36e98 100644
--- a/src/installer/pkg/projects/Directory.Build.targets
+++ b/src/installer/pkg/projects/Directory.Build.targets
@@ -146,35 +146,12 @@
   </Target>
 
   <!--
-    Overriding VerifyClosure target to enable closure validation without other validations.
+    Ensures package reports dir exists, to work around the issue in VerifyClosure task:
+    https://github.com/dotnet/arcade/issues/6090
+    Remove this target, once the issue is fixed.
   -->
-  <Target Name="VerifyClosure"
-          DependsOnTargets="GetClosureFiles"
-          Condition="'$(SkipValidatePackage)' != 'true' or '$(ShouldVerifyClosure)' == 'true'"
-          Inputs="%(ClosureFile.FileSet)"
-          Outputs="batching-on-FileSet-metadata">
-    <ItemGroup>
-      <_closureFileNames Include="@(ClosureFile->'%(FileName)')" Original="%(Identity)" />
-
-      <_closureFileNamesFiltered Include="@(_closureFileNames)" Exclude="@(ExcludeFromClosure)"/>
-      <_closureFileFiltered Include="@(_closureFileNamesFiltered->'%(Original)')"/>
-    </ItemGroup>
-
-    <Message Importance="High" Text="Verifying closure of $(Id) %(ClosureFile.FileSet) assemblies" />
-
-    <PropertyGroup>
-      <_DependencyGraphFilePath>$(PackageReportDir)$(Id)$(NuspecSuffix)-%(ClosureFile.FileSet).dgml</_DependencyGraphFilePath>
-      <_DependencyGraphDir>$([System.IO.Path]::GetDirectoryName($(_DependencyGraphFilePath)))</_DependencyGraphDir>
-    </PropertyGroup>
-
-    <!-- Ensure directory for dependency graph file exists. -->
-    <MakeDir Condition="!Exists('$(_DependencyGraphDir')"
-             Directories="$(_DependencyGraphDir)" />
-
-    <VerifyClosure
-      Sources="@(_closureFileFiltered)"
-      IgnoredReferences="@(IgnoredReference)"
-      DependencyGraphFilePath="$(_DependencyGraphFilePath)" />
+  <Target Name="EnsureDepenedencyGraphDir" BeforeTargets="VerifyClosure">
+    <MakeDir Directories="$(PackageReportDir)" />
   </Target>
 
   <!--

From 52d24f56da0c3fc2915adcc86576a4b3e36fcfbb Mon Sep 17 00:00:00 2001
From: "Nikola Milosavljevic (CLR)" <nikolam@microsoft.com>
Date: Wed, 2 Sep 2020 22:08:28 -0700
Subject: [PATCH 5/5] Upgrade SharedFramework.SDK package to pick up a change
 for VerifyClosure target

---
 eng/Version.Details.xml | 4 ++--
 global.json             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 733f23eec608e6..08e6801fe965fa 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -62,9 +62,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20419.21">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20452.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
+      <Sha>3d3bc7c7181b6f1b4a930ef0c88a388765379c77</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
diff --git a/global.json b/global.json
index 30a1da02a1ea1d..0969ad05281fd7 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
   "msbuild-sdks": {
     "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20419.21",
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20419.21",
-    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20419.21",
+    "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20452.6",
     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20419.21",
     "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
     "Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",