Skip to content

Enable runtime closure verification #41698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NikolaMilosavljevic merged 8 commits into from
Sep 3, 2020
Merged

Enable runtime closure verification #41698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
65656e7
Enable closure validation
NikolaMilosavljevic Aug 31, 2020
58cf696
Ensure dependency graph directory exists
NikolaMilosavljevic Sep 1, 2020
d4395af
Netstandard should not be ignored
NikolaMilosavljevic Sep 2, 2020
7a42449
Ensure Reports dir exists; VerifyClosure change moved to Arcade
NikolaMilosavljevic Sep 2, 2020
d184666
Merge branch 'verify.closure' of https://github.com/nikolamilosavljev…
NikolaMilosavljevic Sep 2, 2020
52d24f5
Upgrade SharedFramework.SDK package to pick up a change for VerifyClo…
NikolaMilosavljevic Sep 3, 2020
2df9482
Merge branch 'master' into verify.closure
NikolaMilosavljevic Sep 3, 2020
47aeaf8
Merge branch 'master' into verify.closure
NikolaMilosavljevic Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6baa6d3c20effeee3631eb33e9e08bcf698a799c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20431.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20452.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6baa6d3c20effeee3631eb33e9e08bcf698a799c</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>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20431.4",
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20431.4",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20452.6",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.4",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
Expand Down
9 changes: 9 additions & 0 deletions src/installer/pkg/projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,15 @@
</ItemGroup>
</Target>

<!--
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="EnsureDepenedencyGraphDir" BeforeTargets="VerifyClosure">
<MakeDir Directories="$(PackageReportDir)" />
</Target>

<!--
Finds symbol files and injects them into the package build.
-->
Expand Down
20 changes: 20 additions & 0 deletions src/installer/pkg/projects/netcoreapp/pkg/legacy/Microsoft.NETCore.App.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,28 @@
-->
<BuildLineupPackage>false</BuildLineupPackage>

<ShouldVerifyClosure>true</ShouldVerifyClosure>

<FrameworkListTargetPath>data/</FrameworkListTargetPath>
<SkipBuildOnRuntimePackOnlyOS>true</SkipBuildOnRuntimePackOnlyOS>
</PropertyGroup>

<ItemGroup>
<!-- 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>