Skip to content

add source-build pre-built detection #82300

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

Closed
wants to merge 2 commits into from
+42 −4
Closed

add source-build pre-built detection #82300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff6e59b
add source-build pre-built detection
oleksandr-didyk Feb 17, 2023
2729014
simplify ref assemblies exclusion; fixup externals dependency type
oleksandr-didyk Feb 20, 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
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
Copy link
Member

@ViktorHofer ViktorHofer Feb 17, 2023

Choose a reason for hiding this comment

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

Why do we need this feed?

Copy link
Contributor Author

@oleksandr-didyk oleksandr-didyk Feb 20, 2023

Choose a reason for hiding this comment

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

For System.CommandLine source-build intermediate

<!-- TODO: Remove dotnet7 feeds when dependencies publish into dotnet8 feeds: https://github.com/dotnet/runtime/issues/63375. -->
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
Expand Down
1 change: 1 addition & 0 deletions eng/SourceBuild.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<InnerBuildArgs>$(InnerBuildArgs) --nodereuse false</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --warnAsError false</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) --outputrid $(TargetRid)</InnerBuildArgs>
<InnerBuildArgs>$(InnerBuildArgs) /p:ArcadeBuildFromSource=true</InnerBuildArgs>
Copy link
Member

@MichaelSimons MichaelSimons Feb 17, 2023

Choose a reason for hiding this comment

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

Why is this being specified. This does not seem correct. Only ArcadeInnerBuildFromSource=true should be used in this context.

Copy link
Contributor Author

@oleksandr-didyk oleksandr-didyk Feb 20, 2023

Choose a reason for hiding this comment

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

Due to runtime overriding BaseInnerSourceBuildCommand in SourceBuild.props. This is the issue we talked about in the beginning of this work, when runtime's inner build would not restore intermediate packages

<InnerBuildArgs>$(InnerBuildArgs) /p:RuntimeOS=$(RuntimeOS)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(OfficialBuildId)' != ''">$(InnerBuildArgs) /p:OfficialBuildId=$(OfficialBuildId)</InnerBuildArgs>
<InnerBuildArgs Condition="'$(ContinuousIntegrationBuild)' != ''">$(InnerBuildArgs) /p:ContinuousIntegrationBuild=$(ContinuousIntegrationBuild)</InnerBuildArgs>
Expand Down
12 changes: 10 additions & 2 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<!-- See aka.ms/dotnet/prebuilts for guidance on what pre-builts are and how to eliminate them. -->
<UsageData>
<IgnorePatterns>
<UsagePattern IdentityGlob="*/*" />
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*" />
</IgnorePatterns>
</UsageData>
<Usages>
<!-- Allowed and pinned to major version due to https://github.com/dotnet/source-build/issues/3228 -->
<Usage Id="Microsoft.NETCore.App.Crossgen2.linux-x64" Version="8.*" />
<Usage Id="Microsoft.NETCore.App.Runtime.linux-x64" Version="8.*" />
<!-- Should be removed as part of https://github.com/dotnet/runtime/issues/82298 -->
<Usage Id="Microsoft.NETFramework.ReferenceAssemblies*" Version="1.0.3" />
</Usages>
</UsageData>
32 changes: 30 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="8.0.0-preview.2.23113.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.22616.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>31f422237eabbd5c89ecbd0f4a6f53e2c495422f</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23053.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>cec4a8acb52c92bae0425385016df5ac957fe616</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="8.0.0-preview.2.23113.1">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>71423dd665d17bd333d0028ce9c6f169f88ab59b</Sha>
</Dependency>
Expand Down Expand Up @@ -76,7 +86,12 @@
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>76f334f354eb653a7b409a5319b591ea09df5a43</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.22355.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.356401">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta4.22564.1">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>5618b2d243ccdeb5c7e50a298b33b13036b4351b</Sha>
</Dependency>
Expand All @@ -103,6 +118,17 @@
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>83284ab08840fe5f429ecd9fa935e81527023553</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceLink.GitHub" Version="1.2.0-beta-23066-01" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>d047202874ad79d72c75b6354c0f8a9a12d1b054</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23066.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>ca611a68bb48cedf72a782d41622453cb2dab100</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23115.1">
<Uri>https://github.com/dotnet/arcade</Uri>
Expand Down Expand Up @@ -279,6 +305,7 @@
<Dependency Name="System.Text.Json" Version="8.0.0-preview.2.23112.4">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>252018c3d3fffdb592413cf61d5b80cf751e0a59</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23112.4">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -331,6 +358,7 @@
<Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-1.23073.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6acaa7b7c0efea8ea292ca26888c0346fbf8b0c1</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-1.23073.4">
<Uri>https://github.com/dotnet/roslyn</Uri>
Expand Down