Resolve source-built prebuilts #69900
Conversation
Allows for source-build to override the version
dotnet-issue-labeler
bot
added
Area-Infrastructure
untriaged
Co-authored-by: Michael Simons <[email protected]>
mthalman
changed the title
eng/SourceBuildPrebuiltBaseline.xml
Outdated
|
|
||
| <!-- The repo has a dependency on this package that shows up as a prebuilt in the repo's CI but in full | ||
| source-build this will be overridden. --> | ||
| <UsagePattern IdentityGlob="System.CommandLine/2.0.0*" /> |
There was a problem hiding this comment.
Per conversation with @mmitche - the System.CommandLine and Microsoft.DiaSymReader dependencies in Version.Details.xml should be adorned with the sourcebuild attribute. The value in this is two fold. First, it will remove the need to baseline these because the intermediate will get loaded (if this version exists) and eliminate the prebuilt. Second, as a result of the previous, it will build with the SB variant of the dependency which may be slightly different than the MSFT version.
There was a problem hiding this comment.
Looks like the System.CommandLine 2.0.0-beta4.23307.1 intermediate doesn't exist so we will still need this exclusion.
There was a problem hiding this comment.
There was a problem hiding this comment.
dotnet-libraries-transport, and note different version number for the SB intermediate
There was a problem hiding this comment.
So how is the intermediate version supposed to be referenced in the source?
There was a problem hiding this comment.
Add a Version.Details.xml dependency directly on the intermediate package. example - https://github.com/dotnet/sdk/blob/main/eng/Version.Details.xml#L328
|
@MichaelSimons...dotnet-libraries-transport feed I think |
| <!-- Roslyn's source-build CI builds both NetPrevious and NetCurrent. This 7.0 ref pack shows up as | ||
| prebuilt only for the repo CI build but not full source-build. --> | ||
| <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0*" /> |
There was a problem hiding this comment.
Just curious, where does roslyn use the aspnetcore targeting pack?
There was a problem hiding this comment.
It stems from this -
roslyn/eng/targets/Settings.props
Line 79 in d080175
There was a problem hiding this comment.
Looks like maybe some stuff for Razor? src/Tools/ExternalAccess/AspNetCore/Microsoft.CodeAnalysis.ExternalAccess.AspNetCore.csproj
|
Per my inspection, prebuilt report looks good for the prebuilts intended to be fixed by this PR. |
| @@ -11,6 +11,15 @@ | |||
| <Sha>01850f2b7bff23e118d1faecb941d770c8e626f2</Sha> | |||
| <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" /> | |||
| </Dependency> | |||
| <Dependency Name="System.CommandLine" Version="2.0.0-beta4.23307.1"> | |||
There was a problem hiding this comment.
Does we need to ensure this version always matches the version in Versions.props - https://github.com/dotnet/roslyn/blob/main/eng/Versions.props#L234 ?
There was a problem hiding this comment.
dependency flow takes care of that. Those versions aren't updated manually... usually.
|
@dotnet/roslyn-infrastructure - This is hitting seemingly known test failures that I believe are unrelated to these changes. PTAL and merge if good. This helps to unblock dependency flow: dotnet/installer#17319 |
| @@ -12,6 +12,7 @@ | |||
| <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" /> | |||
| <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/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" /> | |||
There was a problem hiding this comment.
Why do we have so many NuGet feeds?
There was a problem hiding this comment.
My guess is that these aren't all needed. I would bet that dotnet6* and dotnet7* can be eliminated. Maybe nuget-build too.
ghost
added this to the 
Contributes to #69847
System.CommandLine is showing up as a source-build prebuilt after the introduction of the BuildHost project:
roslyn/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
Line 28 in bc41e82
This is because the build is loading the version specified by
SystemCommandLineVersionand not using the current version ofSystem.CommandLineproduced by source-build. This is fixed by ensuring thatSystem.CommandLineis defined in Version.Details. This allows source-build to override that version with the current version.Other packages have also been added to the prebuilt baseline as they are only prebuilts in the repo's CI build.