Consume cDac package and other cleanup #5482

mikem8361 · 2025-05-13T19:01:22Z

Create a InstallNativePackages.proj that downloads the native diasymreader and cdac packages

Add InstallNativePackages to native-prereqs.proj

Move the native binary copies out of the build.sh/build-native.cmd scripts to the appropriate managed project

Move the rest of the binary copying from the cmake files to the managed projects

Switch the Windows native builds to use ninja. Add the -msbuild/-ninja build-native.cmd options.

mikem8361 · 2025-05-19T17:02:16Z

@hoyosjs I'll still except and apply any feedback you have for this PR.

mikem8361 · 2025-05-19T22:57:16Z

I can't see the failure details anymore. How do other outside dev's figure out the failure details?

Create a InstallNativePackages.proj that downloads the native diasymreader and cdac packages Add InstallNativePackages to native-prereqs.proj Move the native binary copies out of the build.sh/build-native.cmd scripts to the appropriate managed project Move the rest of the binary copying from the cmake files to the managed projects Switch the Windows native builds to use ninja. Add the -msbuild/-ninja build-native.cmd options.

CMakeLists.txt

Directory.Build.props

hoyosjs · 2025-05-14T20:57:51Z

CMakeLists.txt

@@ -5,6 +5,9 @@
 cmake_minimum_required(VERSION 3.15)

 cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH is enabled by default.
+if(CLR_CMAKE_HOST_WIN32)
+  cmake_policy(SET CMP0177 NEW) # install() paths are normalized


nit: Any reason no to normalize everywhere

This is just to stop the warning on Windows. It is fine on other build platforms

I've seen it in newer linux versions of the containers.

hoyosjs · 2025-06-19T06:07:56Z

Directory.Build.props

+  <PropertyGroup Condition="'$(TargetRid)' == ''">
+    <TargetRidOS>$(TargetOS)</TargetRidOS>
+    <TargetRidOS Condition="'$(TargetOS)' == 'Windows_NT'">win</TargetRidOS>
+    <TargetRid>$(TargetRidOS)-$(TargetArch)</TargetRid>


Won't this give us linux-x64 on musl? I remember mike having to use this for a case, but not sure if it's doing what's expected.

This won't apparently break obviously since it gets funneled down from buildnative. This does mean something like dotnet build <project> won't work in linux-musl

TargetRid is set by the build native script so yes dotnet build <project> doesn't work. This does assume everything is built with our build.sh/build.ps1 scripts.

CMakeLists.txt

eng/build.sh

src/Tools/dotnet-sos/dotnet-sos.csproj

eng/Version.Details.xml

eng/native-prereqs.proj

src/Tools/dotnet-sos/dotnet-sos.csproj

hoyosjs · 2025-07-03T21:44:22Z

eng/pipelines/build.yml

@@ -133,6 +133,9 @@ jobs:
      - _TestArgs: '-test'
      - _Cross: ''

+      - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
+        - _buildLog: '-binaryLog'


Let's just inline this to the call after CI unconditionally. It's arguably a bug in arcade (win always produces unless we exclude, and linux only if you include)

eng/build.sh

hoyosjs · 2025-07-04T02:46:27Z

Looking at the official build - we are not carrying the cDAC for musl. Also, this increases install size from ~21mb to ~84mb. Each linux cDAC is 12mb. Is this expected?

hoyosjs · 2025-07-04T02:52:00Z

There's also none for win-x86, linux-arm

-rw-r--r--@ 1 juhoyosa  staff   3.3M Jul  4  2025 ./tools/net8.0/any/win-x64/mscordaccore_universal.dll
-rw-r--r--@ 1 juhoyosa  staff   3.3M Jul  4  2025 ./tools/net8.0/any/win-arm64/mscordaccore_universal.dll
-rw-r--r--@ 1 juhoyosa  staff    17M Jul  4  2025 ./tools/net8.0/any/osx-x64/libmscordaccore_universal.dylib
-rw-r--r--@ 1 juhoyosa  staff    16M Jul  4  2025 ./tools/net8.0/any/osx-arm64/libmscordaccore_universal.dylib
-rw-r--r--@ 1 juhoyosa  staff    12M Jul  4  2025 ./tools/net8.0/any/linux-x64/libmscordaccore_universal.so
-rw-r--r--@ 1 juhoyosa  staff    12M Jul  4  2025 ./tools/net8.0/any/linux-arm64/libmscordaccore_universal.so

So we are still missing about 50mb of payload, effectively 6x of what was there.

hoyosjs · 2025-07-04T02:54:58Z

Also - we probably also want these in the SOS transport packages. Like sos.installhelpers

steveisok · 2025-07-04T14:21:01Z

There's also none for win-x86, linux-arm

It wasn't ready back when this PR was created. They are now and dotnet/runtime#117321 will fix that.

…l with a PackageWithCDac property

steveisok · 2025-07-12T15:18:20Z

Also - we probably also want these in the SOS transport packages. Like sos.installhelpers

Correct me if I'm wrong, but as long as it's bundled with SOS, it should be ok.

hoyosjs · 2025-07-14T20:03:04Z

Also - we probably also want these in the SOS transport packages. Like sos.installhelpers

Correct me if I'm wrong, but as long as it's bundled with SOS, it should be ok.

you'll need it for some payloads (like windbg) and I didn't see it there.

eng/CdacPackageItems.props

eng/pipelines/build.yml

hoyosjs

Looks good at code level. Haven't checked the packages produced.

hoyosjs · 2025-07-17T03:25:09Z

eng/CdacPackageItems.props

@@ -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>


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.

mikem8361 requested a review from hoyosjs May 13, 2025 19:01

mikem8361 self-assigned this May 13, 2025

mikem8361 requested a review from a team as a code owner May 13, 2025 19:01

mikem8361 force-pushed the use_cdac_package branch from d383025 to a14c784 Compare May 19, 2025 17:00

Mike McLaughlin added 2 commits May 29, 2025 09:38

Fix linux build breaks

95e84fc

mikem8361 force-pushed the use_cdac_package branch from a14c784 to 95e84fc Compare May 29, 2025 16:45

steveisok reviewed Jun 6, 2025

View reviewed changes

CMakeLists.txt Show resolved Hide resolved

steveisok reviewed Jun 6, 2025

View reviewed changes

Directory.Build.props Show resolved Hide resolved

Merge remote-tracking branch 'upstream/main' into use_cdac_package

5747f07

hoyosjs reviewed Jun 6, 2025

View reviewed changes

Revert output control change and fix setting arch prop

42d80d8

steveisok force-pushed the use_cdac_package branch from fdee73e to 42d80d8 Compare June 9, 2025 12:56

hoyosjs closed this Jun 18, 2025

hoyosjs reopened this Jun 18, 2025

hoyosjs reviewed Jun 20, 2025

View reviewed changes

steveisok added 8 commits July 2, 2025 18:15

PR feedback

6048ec1

Merge remote-tracking branch 'upstream/main' into use_cdac_package

ae469d4

More PR feedback

11a56ab

Merge remote-tracking branch 'upstream/main' into use_cdac_package

3a5292c

Move InstallNativeFiles into sos-packaging.targets

7378077

Merge remote-tracking branch 'upstream/main' into use_cdac_package

5d86cae

Wrong version for the transport packs

eec089c

Build binlog on non-windows builds

14c55d9

hoyosjs reviewed Jul 3, 2025

View reviewed changes

eng/build.sh Outdated Show resolved Hide resolved

Use __TargetRid instead of __OutputRid

cf4ad31

hoyosjs enabled auto-merge (squash) July 4, 2025 02:13

hoyosjs disabled auto-merge July 4, 2025 02:43

steveisok added 2 commits July 12, 2025 11:07

Pass through -binaryLog switch on windows. Make bundling cdac optiona…

0c220ff

…l with a PackageWithCDac property

Add -binaryLog switch inline on the build yml

ca6bcee

Only copy cdac binaries if PackageWithCdac is true

dce253d

hoyosjs reviewed Jul 14, 2025

View reviewed changes

eng/CdacPackageItems.props Outdated Show resolved Hide resolved

hoyosjs reviewed Jul 14, 2025

View reviewed changes

eng/pipelines/build.yml Outdated Show resolved Hide resolved

steveisok added 8 commits July 15, 2025 13:56

PR Feedback

0b4568c

Add yml option to bundle cdac

7221378

bad yml

b2226f4

Even worse yml

ceec407

Yml

48dfb28

Ugh

d3162e5

Maybe this works

441ed07

Undo yml change

1fd15a1

hoyosjs approved these changes Jul 17, 2025

View reviewed changes

Consume cDac package and other cleanup #5482

Are you sure you want to change the base?

Consume cDac package and other cleanup #5482

Conversation

mikem8361 commented May 13, 2025

Uh oh!

mikem8361 commented May 19, 2025

Uh oh!

mikem8361 commented May 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hoyosjs commented Jul 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hoyosjs commented Jul 4, 2025

Uh oh!

hoyosjs commented Jul 4, 2025

Uh oh!

steveisok commented Jul 4, 2025

Uh oh!

steveisok commented Jul 12, 2025

Uh oh!

hoyosjs commented Jul 14, 2025

Uh oh!

Uh oh!

Uh oh!

hoyosjs left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mikem8361 commented May 19, 2025 •

edited

Loading

hoyosjs commented Jul 4, 2025 •

edited

Loading