Skip to content

Add sourcelink support for SOS native libraries #5703

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

Open
hoyosjs wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add sourcelink support for SOS native libraries #5703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 deletions eng/native-prereqs.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<NativeVersionFile Condition="$([MSBuild]::IsOsPlatform(Windows))">$(ArtifactsObjDir)_version.h</NativeVersionFile>
<NativeVersionFile Condition="!$([MSBuild]::IsOsPlatform(Windows))">$(ArtifactsObjDir)_version.c</NativeVersionFile>
<RuntimeVersionFile>$(ArtifactsObjDir)runtime_version.h</RuntimeVersionFile>
<NativeSourceLinkFile>$(ArtifactsObjDir)native.sourcelink.json</NativeSourceLinkFile>
<VerifySourceLinkFileExists>false</VerifySourceLinkFileExists>
<VerifySourceLinkFileExists Condition="'$(ContinuousIntegrationBuild)' == 'true' AND '$(EnableSourceControlManagerQueries)' == 'true'">true</VerifySourceLinkFileExists>
<AssemblyName>.NET Diagnostics</AssemblyName>
</PropertyGroup>

Expand Down Expand Up @@ -73,7 +76,15 @@
<Import Project="$(RepositoryEngineeringDir)InstallNativePackages.targets" />

<Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" />
<!--
This is relatively ugly. The NoTargets SDK sets DebugType=None, but that makes it such that the sourcelink targets
don't run, and we wouldn't generate the sourcelink file for native compilation. It would be better if we could call
the target directly and have it generate the file, but it's guarded by this property anyway...
-->
<PropertyGroup>
<DebugType>Portable</DebugType>
</PropertyGroup>

<Target Name="Build"
DependsOnTargets="GenerateRuntimeVersionFile;InstallNativePackages" />
<Target Name="BuildPrereqs" BeforeTargets="Build"
DependsOnTargets="GenerateNativeSourcelinkFile;GenerateRuntimeVersionFile;InstallNativePackages" />
</Project>
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26066.3"
}
Expand Down