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.

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

Add option to prefer 64bit msbuild #7531

Merged
merged 1 commit into from
Jun 22, 2021
Merged

Add option to prefer 64bit msbuild #7531

merged 1 commit into from
Jun 22, 2021

Conversation

dougbu
Copy link
Member

@dougbu dougbu commented Jun 15, 2021

To double check:

I'm trying this out in dotnet/aspnetcore#33497. Starting this in parallel so I don't forget between now and dotnet/aspnetcore's next Arcade update for 3.1.x.

See also conversation in that PR about why this is worth having as an option.

@dougbu dougbu force-pushed the dougbu/prefer64bit branch from 2a4a6b9 to 3c54936 Compare June 16, 2021 01:50
@dougbu
Copy link
Member Author

dougbu commented Jun 16, 2021

This fix, included in dotnet/aspnetcore#33497, built successfully in https://dev.azure.com/dnceng/public/_build/results?buildId=1189546&view=results. We seem to need this fix to build release/3.1 -- at least until we reach VS v16.9.7 or v16.10.0 (better if v16.10.2) in the regular VS2019 queues.

Copy link
Member

@MattGal MattGal left a comment

Choose a reason for hiding this comment

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

LGTM

@dougbu
Copy link
Member Author

dougbu commented Jun 21, 2021

@MattGal do I need to do anything special because this is targeting release/3.x❔ The change can't break anything but I'm unsure about servicing rules in this repo.

Copy link
Member

@rainersigwald rainersigwald left a comment

Choose a reason for hiding this comment

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

LGTM and I would think about going so far as to flip the default in Arcade 6; VS2022 will generally use 64-bit MSBuild so it'd be nice if Arcade was consistent. We'd still need an opt-out though for tasks that are 32-bit only but don't say so correctly.

@dougbu
Copy link
Member Author

dougbu commented Jun 22, 2021

Oops this is a protected branch and I can only push to 'main'. @mmitche or @MattGal please squish 'n merge

Once that's done, I don't see a backport action in this repo yet. But
https://github.com/dotnet/versions/blob/d36bff5dea12f26cb57978f5db76a0adb37d3a95/Maestro/subscriptions.json#L1157-L1166
means a subsequent merge into 'main' will contain this fix. Will just need to manually cherry-pick this change or the final 'main' one into 'release/5.0'.

@mmitche
Copy link
Member

mmitche commented Jun 22, 2021

Once that's done, I don't see a backport action in this repo yet. But
https://github.com/dotnet/versions/blob/d36bff5dea12f26cb57978f5db76a0adb37d3a95/Maestro/subscriptions.json#L1157-L1166
means a subsequent merge into 'main' will contain this fix. Will just need to manually cherry-pick this change or the final 'main' one into 'release/5.0'.

We just removed that (the common scripts don't merge cleanly at all), so it will need to be backported to main.

@mmitche mmitche merged commit 1e5713e into release/3.x Jun 22, 2021
@dougbu dougbu deleted the dougbu/prefer64bit branch June 22, 2021 22:53
@dougbu
Copy link
Member Author

dougbu commented Jun 22, 2021

it will need to be backported to main

I'll get right on it.

dougbu added a commit that referenced this pull request Jun 24, 2021
dougbu added a commit that referenced this pull request Jun 24, 2021
mmitche pushed a commit that referenced this pull request Jun 24, 2021
dougbu added a commit that referenced this pull request Jun 24, 2021
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