Skip to content

Consume cDac package and other cleanup #5482

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 24 commits into from
Jul 17, 2025
Merged

Consume cDac package and other cleanup #5482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
369d947
Consume cDac package and other cleanup
Apr 30, 2025
95e84fc
Fix linux build breaks
May 13, 2025
5747f07
Merge remote-tracking branch 'upstream/main' into use_cdac_package
steveisok Jun 6, 2025
42d80d8
Revert output control change and fix setting arch prop
steveisok Jun 9, 2025
6048ec1
PR feedback
steveisok Jul 2, 2025
ae469d4
Merge remote-tracking branch 'upstream/main' into use_cdac_package
steveisok Jul 2, 2025
11a56ab
More PR feedback
steveisok Jul 2, 2025
3a5292c
Merge remote-tracking branch 'upstream/main' into use_cdac_package
steveisok Jul 2, 2025
7378077
Move InstallNativeFiles into sos-packaging.targets
steveisok Jul 3, 2025
5d86cae
Merge remote-tracking branch 'upstream/main' into use_cdac_package
steveisok Jul 3, 2025
eec089c
Wrong version for the transport packs
steveisok Jul 3, 2025
14c55d9
Build binlog on non-windows builds
steveisok Jul 3, 2025
cf4ad31
Use __TargetRid instead of __OutputRid
steveisok Jul 3, 2025
0c220ff
Pass through -binaryLog switch on windows. Make bundling cdac optiona…
steveisok Jul 12, 2025
ca6bcee
Add -binaryLog switch inline on the build yml
steveisok Jul 12, 2025
dce253d
Only copy cdac binaries if PackageWithCdac is true
steveisok Jul 12, 2025
0b4568c
PR Feedback
steveisok Jul 15, 2025
7221378
Add yml option to bundle cdac
steveisok Jul 15, 2025
b2226f4
bad yml
steveisok Jul 15, 2025
ceec407
Even worse yml
steveisok Jul 15, 2025
48dfb28
Yml
steveisok Jul 15, 2025
d3162e5
Ugh
steveisok Jul 15, 2025
441ed07
Maybe this works
steveisok Jul 15, 2025
1fd15a1
Undo yml change
steveisok Jul 15, 2025
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
23 changes: 11 additions & 12 deletions eng/CdacPackageItems.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@
<!--
*MicrosoftDotNetCdacTransportVersion is from Versions.props. This is how we integrate the cDAC transport packs into our builds
-->
<PropertyGroup>
<_cdacPackageVersion Condition="'$(TargetRid)' == 'win-x64'">$(runtimewinx64MicrosoftDotNetCdacTransportVersion)</_cdacPackageVersion>
Copy link
Member

Choose a reason for hiding this comment

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

silly nit - do we ever foresee them being versioned separately? If not - pick one. It'd be best if we had the IL only one, but we don't yet so let's leave this for cleanup.

<_cdacPackageVersion Condition="'$(TargetRid)' == 'win-arm64'">$(runtimewinarm64MicrosoftDotNetCdacTransportVersion)</_cdacPackageVersion>
<_cdacPackageVersion Condition="'$(TargetRid)' == 'linux-x64'">$(runtimelinuxx64MicrosoftDotNetCdacTransportVersion)</_cdacPackageVersion>
<_cdacPackageVersion Condition="'$(TargetRid)' == 'linux-arm64'">$(runtimelinuxarm64MicrosoftDotNetCdacTransportVersion)</_cdacPackageVersion>
<_cdacPackageVersion Condition="'$(TargetRid)' == 'osx-x64'">$(runtimeosxx64MicrosoftDotNetCdacTransportVersion)</_cdacPackageVersion>
<_cdacPackageVersion Condition="'$(TargetRid)' == 'osx-arm64'">$(runtimeosxarm64MicrosoftDotNetCdacTransportVersion)</_cdacPackageVersion>
</PropertyGroup>

<ItemGroup>
<PackageDownload Include="runtime.win-x64.Microsoft.DotNet.Cdac.Transport" Version="[$(runtimewinx64MicrosoftDotNetCdacTransportVersion)]" Condition="'$(TargetRid)' == 'win-x64'"/>
<PackageDownload Include="runtime.win-arm64.Microsoft.DotNet.Cdac.Transport" Version="[$(runtimewinarm64MicrosoftDotNetCdacTransportVersion)]" Condition="'$(TargetRid)' == 'win-arm64'"/>
<PackageDownload Include="runtime.linux-x64.Microsoft.DotNet.Cdac.Transport" Version="[$(runtimelinuxx64MicrosoftDotNetCdacTransportVersion)]" Condition="'$(TargetRid)' == 'linux-x64'"/>
<PackageDownload Include="runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport" Version="[$(runtimelinuxarm64MicrosoftDotNetCdacTransportVersion)]" Condition="'$(TargetRid)' == 'linux-arm64'"/>
<PackageDownload Include="runtime.osx-x64.Microsoft.DotNet.Cdac.Transport" Version="[$(runtimeosxx64MicrosoftDotNetCdacTransportVersion)]" Condition="'$(TargetRid)' == 'osx-x64'"/>
<PackageDownload Include="runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport" Version="[$(runtimeosxarm64MicrosoftDotNetCdacTransportVersion)]" Condition="'$(TargetRid)' == 'osx-arm64'"/>
<PackageDownload Include="runtime.$(TargetRid).Microsoft.DotNet.Cdac.Transport" Version="[$(_cdacPackageVersion)]" />
</ItemGroup>

<ItemGroup>
<PackageSourceFiles Include="$(NuGetPackageRoot)runtime.win-x64.microsoft.dotnet.cdac.transport\$(runtimewinx64MicrosoftDotNetCdacTransportVersion)\runtimes\win-x64\native\*" Condition="'$(TargetRid)' == 'win-x64'" />
<PackageSourceFiles Include="$(NuGetPackageRoot)runtime.win-arm64.microsoft.dotnet.cdac.transport\$(runtimewinarm64MicrosoftDotNetCdacTransportVersion)\runtimes\win-arm64\native\*" Condition="'$(TargetRid)' == 'win-arm64'" />
<PackageSourceFiles Include="$(NuGetPackageRoot)runtime.linux-x64.microsoft.dotnet.cdac.transport\$(runtimelinuxx64MicrosoftDotNetCdacTransportVersion)\runtimes\linux-x64\native\*" Condition="'$(TargetRid)' == 'linux-x64'" />
<PackageSourceFiles Include="$(NuGetPackageRoot)runtime.linux-arm64.microsoft.dotnet.cdac.transport\$(runtimelinuxarm64MicrosoftDotNetCdacTransportVersion)\runtimes\linux-arm64\native\*" Condition="'$(TargetRid)' == 'linux-arm64'" />
<PackageSourceFiles Include="$(NuGetPackageRoot)runtime.osx-x64.microsoft.dotnet.cdac.transport\$(runtimeosxx64MicrosoftDotNetCdacTransportVersion)\runtimes\osx-x64\native\*" Condition="'$(TargetRid)' == 'osx-x64'" />
<PackageSourceFiles Include="$(NuGetPackageRoot)runtime.osx-arm64.microsoft.dotnet.cdac.transport\$(runtimeosxarm64MicrosoftDotNetCdacTransportVersion)\runtimes\osx-arm64\native\*" Condition="'$(TargetRid)' == 'osx-arm64'" />
<PackageSourceFiles Include="$(NuGetPackageRoot)runtime.$(TargetRid).microsoft.dotnet.cdac.transport\$(_cdacPackageVersion)\runtimes\$(TargetRid)\native\*" />
</ItemGroup>
</Project>
1 change: 0 additions & 1 deletion eng/pipelines/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ jobs:
-binaryLog
-configuration ${{ config.configuration }}
-architecture ${{ config.architecture }}
$(_buildLog)
$(_TestArgs)
$(_Cross)
$(_InternalInstallArgs)
Expand Down