Skip to content
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

Set PDB artifacts dir for VMR inter-build storage #46800

Merged
merged 5 commits into from
Feb 14, 2025
Merged

Set PDB artifacts dir for VMR inter-build storage #46800

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b14115e
Set PDB artifacts dir for VMR inter-build storage
mmitche Feb 12, 2025
c3de404
Update src/SourceBuild/content/repo-projects/Directory.Build.targets
mmitche Feb 13, 2025
215f188
Merge branch 'main' into set-pdb-artifacts-dir
mmitche Feb 13, 2025
e02b298
BuildArgs -> CommonArgs
mmitche Feb 13, 2025
063ef50
BuildArgs -> CommonArgs
mmitche Feb 13, 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
2 changes: 2 additions & 0 deletions src/SourceBuild/content/repo-projects/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@
<RepoArtifactsShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir)</RepoArtifactsShippingPackagesDir>
<RepoArtifactsNonShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' != 'true'">$([MSBuild]::NormalizeDirectory('$(ArtifactsNonShippingPackagesDir)', '$(RepositoryName)'))</RepoArtifactsNonShippingPackagesDir>
<RepoArtifactsNonShippingPackagesDir Condition="'$(ReferenceOnlyRepoArtifacts)' == 'true'">$(ReferencePackagesDir)</RepoArtifactsNonShippingPackagesDir>
<RepoArtifactsPdbArtifactsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsSymStoreDirectory)', '$(RepositoryName)'))</RepoArtifactsPdbArtifactsDir>

<!-- Pass location for packages -->
<BuildArgs>$(BuildArgs) /p:SourceBuiltShippingPackagesDir=$(RepoArtifactsShippingPackagesDir)</BuildArgs>
<!-- Trim the trailing slash as it breaks argument parsing on Windows if this is the last argument. -->
<BuildArgs>$(BuildArgs) /p:SourceBuiltNonShippingPackagesDir=$(RepoArtifactsNonShippingPackagesDir.TrimEnd('\'))</BuildArgs>
Copy link
Member Author

Choose a reason for hiding this comment

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

@jkoritzinsky Any idea why we trim the trailing slash on this but not the shipping packages?

Copy link
Member

Choose a reason for hiding this comment

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

It was probably the last argument at some point, which caused issues on Windows because of \". It would be more consistent to do this on the shipping packages dir property as well.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah I bet it was the last argument at the time.

<BuildArgs>$(BuildArgs) /p:SourceBuiltPdbArtifactsDir=$(RepoArtifactsPdbArtifactsDir.TrimEnd('\'))</BuildArgs>

<!-- Pass RID and Portable/non-portable information -->
<_platformIndex>$(NETCoreSdkRuntimeIdentifier.LastIndexOf('-'))</_platformIndex>
Expand Down