Skip to content

add source-build pre-built detection #933

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 11 commits into from
May 16, 2023
Merged

add source-build pre-built detection #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8ce220b
add pre-build detection
oleksandr-didyk Jan 2, 2023
bcc159d
downgrade MSBuild to 16.8
oleksandr-didyk Jan 3, 2023
583813e
add clarifying comments; move source-build RID prop in CI
oleksandr-didyk Jan 10, 2023
8218b06
fixup sbrp definition; fixup invalid msbuild version prop
oleksandr-didyk Jan 11, 2023
db472d5
update changes made
oleksandr-didyk Apr 11, 2023
05bc0df
remove redundant CI arg
oleksandr-didyk Apr 11, 2023
89694bc
add missing sb attribute; bump arcade dep versions
oleksandr-didyk Apr 13, 2023
b8fef1f
remove obsolete pre-built exclusions; fixup dep versions
oleksandr-didyk May 4, 2023
81716f5
remove obsolete nuget source; fixup sourcebuild metadata
oleksandr-didyk May 4, 2023
c6ba833
fixup duplicate dependency declaration
oleksandr-didyk May 15, 2023
0b09480
add explanation for dotnet-sourcelink exclusion
oleksandr-didyk May 16, 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
2 changes: 2 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<!-- Feeds for source-build command-line-api intermediate -->
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
5 changes: 3 additions & 2 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!-- 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>
</UsageData>
24 changes: 20 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,32 @@
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>209b724a3c843253d3071e8348c353b297b0b8b5</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.327201">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>209b724a3c843253d3071e8348c353b297b0b8b5</Sha>
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23262.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>d76c30028584fb1d02d9b27dc48e65ad87f4ecfe</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23262.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1aff4eb33aa7cbf26ccd9fc43c17cb609a14dad4</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23262.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>d76c30028584fb1d02d9b27dc48e65ad87f4ecfe</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
<Dependency Name="Microsoft.SourceLink.GitHub" Version="8.0.0-beta.23218.3" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/sourcelink</Uri>
<Sha>759f344923a0859f3fae83431d0ba1cc62108118</Sha>
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23261.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>519d565b45c46ac452fe5a77ab63295138992e07</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 2 additions & 0 deletions src/dotnet-sourcelink/dotnet-sourcelink.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
<TargetFrameworks>$(NetCurrent)</TargetFrameworks>
<!-- Allow tool to roll forward to a newer major version. -->
<RollForward>Major</RollForward>
<!-- Will be removed by https://github.com/dotnet/sourcelink/issues/1028 -->
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
Copy link
Member

@ViktorHofer ViktorHofer May 4, 2023

Choose a reason for hiding this comment

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

Why does this tool need to be excluded from source build? Please add a comment as it isn't clear just from reading the code.

Copy link
Contributor Author

@oleksandr-didyk oleksandr-didyk May 4, 2023

Choose a reason for hiding this comment

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

I did it based on the project's description:

<Description>Command line tool for SourceLink testing.</Description>

Since I thought it is a tool used for testing, but reading it again I might be wrong here. Maybe @tmat can clarify it

Additionally

<PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>

causes some additional packages to get pulled in that are marked as pre-builts:

    <Usage Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="8.0.0-preview.3.23177.8" />
    <Usage Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.3.23177.8" />
    <Usage Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="8.0.0-preview.3.23177.8" />
    <Usage Id="Microsoft.NETCore.App.Host.osx-x64" Version="8.0.0-preview.3.23174.8" />
    <Usage Id="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.3.23174.8" />
    <Usage Id="Microsoft.NETCore.App.Host.win-x86" Version="8.0.0-preview.3.23174.8" />
    <Usage Id="Microsoft.NETCore.App.Runtime.osx-x64" Version="8.0.0-preview.3.23174.8" />
    <Usage Id="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.3.23174.8" />
    <Usage Id="Microsoft.NETCore.App.Runtime.win-x86" Version="8.0.0-preview.3.23174.8" />

Copy link
Member

@tmat tmat May 15, 2023

Choose a reason for hiding this comment

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

It should be included. This is not a shipping product yet but it is meant to be. It's for customers to test that their binaries have correct Source Link.

Copy link
Contributor Author

@oleksandr-didyk oleksandr-didyk May 15, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

This is not a shipping product yet

Can this be done as a separate issue to not block this PR? Or it being excluded for some time is a no-go?
Specifically since the assets pulled in by PackAsToolShimRuntimeIdentifiers are non-Linux; or can this property be simply excluded? (as source-build is Linux-only for now)

Copy link
Member

@ViktorHofer ViktorHofer May 15, 2023

Choose a reason for hiding this comment

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

IMO if source build repositories currently don't depend on the tool, it shouldn't be an issue to exclude it for now and track enabling it.

Copy link
Contributor Author

@oleksandr-didyk oleksandr-didyk May 16, 2023

Choose a reason for hiding this comment

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

Created an issue for it -> #1028


<!-- NuGet -->
<IsPackable>true</IsPackable>
Expand Down