Fix installer package versioning #60457
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request.
Files not reviewed (3)
- Directory.Build.props: Language not supported
- src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj: Language not supported
- src/Tools/Directory.Build.targets: Language not supported
ghost
added
the
area-infrastructure
NikolaMilosavljevic
requested review from
a team,
ViktorHofer,
jkoritzinsky and
mmitche
NikolaMilosavljevic
changed the title
jkoritzinsky
approved these changes
Feb 18, 2025
ViktorHofer
approved these changes
Feb 18, 2025
Member
Author
|
Some checks are timing out. Will rerun them. cc @wtgodbe |
mmitche
approved these changes
Feb 18, 2025
wtgodbe
approved these changes
Feb 18, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: dotnet/source-build#4895
Changes in
src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxprojare fixing package dependency versions.Changes in
Directory.Build.propsare fixing package versions, to allow inclusion of prerelease version suffix.VersionSuffixis used in packaging infra: https://github.com/dotnet/arcade/blob/ae3c938af5df4a2db45ded37dd05608ce59d8e5e/src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.build.targets#L36However due to a bug in
Directory.Build.Props, arcade'sBeforeCommonTargets.targetsare not imported early enough - see dotnet/source-build#4895 (comment). The fix is to preserve the existing values ofCustomBeforeMicrosoftCommonTargetsandCustomBeforeMicrosoftCommonCrossTargetingTargetsproperties, and prepend the custom targets used by this repo.Due to the above change in
Directory.Build.Propssome projects are only now evaluating all arcade properties correctly, which caused a build issue in two shipping tools projects (Microsoft.dotnet-openapi.csproj and dotnet-sql-cache.csproj), due toPackAsToolShimRuntimeIdentifierbeing assigned Windows runtime identifiers in Linux builds - which of course won't work.Therefore I have also had to make a third change, in
src/Tools/Directory.Build.targetsto fix the evaluation ofPackAsToolShimRuntimeIdentifiersin tools projects.