Skip to content

Enable prebuilt detection #8678

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
merged 3 commits into from
Apr 19, 2023
Merged

Enable prebuilt detection #8678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8aff94a
Enable prebuilt detection
mmitche Apr 11, 2023
57a29c2
Update SBRP
mmitche Apr 19, 2023
172f67b
Add exclusions
mmitche Apr 19, 2023
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
38 changes: 37 additions & 1 deletion eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
<UsageData>
<IgnorePatterns>
<UsagePattern IdentityGlob="*/*" />
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
Copy link
Member

@MichaelSimons MichaelSimons Apr 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was expecting the net7 targeting pack to be reported as a prebuilt. Do you know why it isn't?

Copy link
Member

@mthalman mthalman Apr 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because of this?

msbuild/global.json

Line 6 in 8326396

"dotnet": "7.0.203",

Copy link
Member

@MichaelSimons MichaelSimons Apr 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh sure, the 7.0 SDK is carrying the targeting pack it needs. Thanks for pointing that out.


<!-- These dependencies are a result of building for netframework TFMs. These are filtered out
in full source-build, and would be filtered out if msbuild was using an 8.0 arcade + 8.0 SDK -->
<UsagePattern IdentityGlob="Microsoft.NETFramework.ReferenceAssemblies/*1.0.3*" />
<UsagePattern IdentityGlob="Microsoft.NETFramework.ReferenceAssemblies.net472/*1.0.3*" />

<!-- Baseline 7.0 dependencies until msbuild targets net8 and uses a net8 arcade, SBRP, etc.
These cannot be added to 7.0 SBRP, because they would are produced in the 7.0 build. -->
<UsagePattern IdentityGlob="Microsoft.Bcl.AsyncInterfaces/*7.0.0*" />
<UsagePattern IdentityGlob="Microsoft.Win32.SystemEvents/*7.0.0*" />
<UsagePattern IdentityGlob="System.CodeDom/*7.0.0*" />
<UsagePattern IdentityGlob="System.Collections.Immutable/*7.0.0*" />
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*7.0.0*" />
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
<UsagePattern IdentityGlob="System.Drawing.Common/*7.0.0*" />
<UsagePattern IdentityGlob="System.Formats.Asn1/*7.0.0*" />
<UsagePattern IdentityGlob="System.Reflection.Metadata/*7.0.0*" />
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
<UsagePattern IdentityGlob="System.Resources.Extensions/*7.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/*7.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.Xml/*7.0.1*" />
<UsagePattern IdentityGlob="System.Security.Permissions/*7.0.0*" />
<UsagePattern IdentityGlob="System.Text.Encoding.CodePages/*7.0.0*" />
<UsagePattern IdentityGlob="System.Text.Encodings.Web/*7.0.0*" />
<UsagePattern IdentityGlob="System.Text.Json/*7.0.0*" />
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*7.0.0*" />
<UsagePattern IdentityGlob="System.Windows.Extensions/*7.0.0*" />

<!-- Baseline sourcelink packages until https://github.com/dotnet/arcade/pull/13204 is merged and
flowed to this repo -->
<UsagePattern IdentityGlob="Microsoft.Build.Tasks.Git/*1.1.0-beta-20206-02*" />
<UsagePattern IdentityGlob="Microsoft.SourceLink.AzureRepos.Git/*1.1.0-beta-20206-02*" />
<UsagePattern IdentityGlob="Microsoft.SourceLink.Common/*1.1.0-beta-20206-02*" />
<UsagePattern IdentityGlob="Microsoft.SourceLink.GitHub/*1.1.0-beta-20206-02*" />
Comment on lines +35 to +38
Copy link
Member

@JanKrivanek JanKrivanek Apr 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mmitche Aren't those too specific?
We are seeing errors complaining on those in the arcade update PR (https://github.com/dotnet/msbuild/pull/8658/checks?check_run_id=12897668061):

.packages/microsoft.dotnet.arcade.sdk/6.0.0-beta.23219.1/tools/SourceBuild/AfterSourceBuild.proj(65,5): error : (NETCORE_ENGINEERING_TELEMETRY=AfterSourceBuild) 4 new packages used not in baseline! See report at /__w/1/s/artifacts/source-build/self/prebuilt-report/baseline-comparison.xml for more information. Package IDs are:
Microsoft.Build.Tasks.Git.1.1.0-beta-21423-02
Microsoft.SourceLink.AzureRepos.Git.1.1.0-beta-21423-02
Microsoft.SourceLink.Common.1.1.0-beta-21423-02
Microsoft.SourceLink.GitHub.1.1.0-beta-21423-02


</IgnorePatterns>
</UsageData>
18 changes: 18 additions & 0 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.23219.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>525b6c35cc5c5c9b80b47044be2e4e77858d505a</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.23167.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>92c39a4f0bacef20812f63e2e1d3f7aa8776038d</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.1.0-beta-21480-02" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>8031e5220baf2acad991e661d8308b783d2acf3e</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.21431.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>bc3233146e1fcd393ed471d5005333c83363e0fe</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.5.0-rc.149">
<Uri>https://github.com/nuget/nuget.client</Uri>
<Sha>ca5029046d7b6e55f322c45abb7b342054543710</Sha>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-2.23171.5">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>48b13597fee9df5ecfbd0b8c0758b3f46bc1d440</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.23167.1">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down