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

Remove downlevel runtimes from global.json #40393

Merged
merged 2 commits into from
Mar 14, 2022
Merged

Remove downlevel runtimes from global.json #40393

merged 2 commits into from
Mar 14, 2022

Conversation

wtgodbe
Copy link
Member

@wtgodbe wtgodbe commented Feb 24, 2022

Instead rely on the implicit versions in the SDK, which stay up-to-date anyways (see https://github.com/dotnet/installer/blob/b6c29ddce6f3d0472e3449bb65fef6c08b9bd644/src/redist/targets/GenerateBundledVersions.targets#L27-L32). Allows for building on platforms that weren't supported on older runtimes, like Apple M1 Silicon (see #40109)

@wtgodbe wtgodbe requested review from a team and dougbu as code owners February 24, 2022 17:11
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Feb 24, 2022
global.json Outdated
@@ -6,14 +6,10 @@
"dotnet": "7.0.100-preview.2.22114.1",
"runtimes": {
"dotnet": [
"2.1.30",
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
],
"dotnet/x86": [
Copy link
Member

Choose a reason for hiding this comment

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

@wtgodbe may want to move this section above "dotnet" so eng/scripts/prepare-sourcebuild-globaljson.sh works as expected.

@MichaelSimons the alternative would be to stop using eng/scripts/prepare-sourcebuild-globaljson.sh. Will that work correctly now❔

Copy link
Member

Choose a reason for hiding this comment

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

It looks to me like we will still need eng/scripts/prepare-sourcebuild-globaljson.sh because of the dotnet/x86 entry.

@wtgodbe wtgodbe enabled auto-merge (squash) March 11, 2022 17:08
@wtgodbe wtgodbe merged commit 547621d into main Mar 14, 2022
@wtgodbe wtgodbe deleted the wtgodbe/Silicon branch March 14, 2022 17:10
@ghost ghost added this to the 7.0-preview3 milestone Mar 14, 2022
wtgodbe added a commit that referenced this pull request Mar 14, 2022
wtgodbe added a commit that referenced this pull request Mar 14, 2022
wtgodbe added a commit that referenced this pull request Mar 14, 2022
wtgodbe added a commit that referenced this pull request Mar 15, 2022
* Revert "Revert "Remove downlevel runtimes from global.json (#40393)" (#40699)"

This reverts commit 74e885a.

* Restore 3.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants