Skip to content

Allow override of build tool framework version #2283

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.

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 3 commits into from
Nov 13, 2023

Conversation

NikolaMilosavljevic
Copy link
Member

Contributes to: dotnet/source-build#3171

This is required for full product source-build. We've been making this change dynamically at every build. Our goal in 9.0 is to not make any source changes during source-build.

@NikolaMilosavljevic
Copy link
Member Author

Copy link
Member

Choose a reason for hiding this comment

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

This file is provided by arcade. It shouldn't be modified here. Instead, the change should be applied to https://github.com/dotnet/arcade/blob/main/eng/common/tools.sh which will cause it to flow to consuming repos.

Copy link
Member

Choose a reason for hiding this comment

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

@mthalman is correct here.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I'm aware of that. The reason for this change is to modify the file in the repo, to have the correct version until they pick up new Arcade. This repo is usually behind on Arcade updates.

@mmitche do you think this change should be applied to Arcade as well? It does seem that it would allow us to cover any new repo in the future that gets behind on Arcade updates.

cc @MichaelSimons

Copy link
Member

Choose a reason for hiding this comment

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

It has to be applied to Arcade. Otherwise, it'll get overwritten on the next Arcade update.

There's an Arcade flow that @ViktorHofer appears to be working on #2228.

Copy link
Member

Choose a reason for hiding this comment

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

I would apply to arcade first, then to this repo.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sounds good. We were not concerned with overwriting this by new Arcade, as the goal was to get this repo to behave properly in source-build, while on old Arcade. Overwriting with new Arcade would update it to be the same as all other repos, which do not need this type of customization. That said, there is a value in having the ability to override build tool framework version in all repos, so I'll make the change in Arcade as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

Arcade PR: dotnet/arcade#14181

@NikolaMilosavljevic
Copy link
Member Author

@jonsequitur @adamsitnik this is a backport of dotnet/installer#17664. Can you take a look and approve/merge it?

@MichaelSimons
Copy link
Member

@NikolaMilosavljevic - Is this necessary now that the arcade version was upgraded to 8.0 in #2228?

@NikolaMilosavljevic
Copy link
Member Author

NikolaMilosavljevic commented Nov 2, 2023

@NikolaMilosavljevic - Is this necessary now that the arcade version was upgraded to 8.0 in #2228?

Oh, that's great - Arcade PR was just merged. The concern is for 9.0 and if this repo stays on 8.0 while most of the others move to 9.0 (including source-build). 9.0 Arcade implements this same override.

I'm going to resolve the merge conflict and leave this open. We still want this merged - @jonsequitur @adamsitnik all checks are passing, this has no impact to the repo, and only guards from potential future build breaks in source-build.

@NikolaMilosavljevic
Copy link
Member Author

@jonsequitur @adamsitnik this is ready to be merged. I do not have merge permissions.

@NikolaMilosavljevic
Copy link
Member Author

cc @mmitche

@mmitche mmitche merged commit 28da3a9 into dotnet:main Nov 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants