Skip to content

Incorporate source-build TargetFramework update patch#6841

Merged
dagood merged 1 commit intodotnet:masterfrom
dagood:apsb-incorporate
Jan 29, 2021
Merged

Incorporate source-build TargetFramework update patch#6841
dagood merged 1 commit intodotnet:masterfrom
dagood:apsb-incorporate

Conversation

@dagood
Copy link
Member

@dagood dagood commented Jan 22, 2021

Fixes #6879

The initial arcade-powered source-build PR (#6837) introduced a .patch file to handle building for net5.0 rather than netcoreapp2.1. This PR incorporates the patch into the source (as much as possible).

Even though we're building for 6.0, dotnet/arcade still uses a 5.0.100 SDK to build, so this PR still targets net5.0 for now.

https://github.com/dotnet/source-build/blob/master/Documentation/planning/arcade-powered-source-build/implementation-plan.md

@MattGal
Copy link
Member

MattGal commented Jan 29, 2021

Seems fine, let's make sure it works with SourceBuild enabled then I'll sign off.

@dagood dagood merged commit 64a7baf into dotnet:master Jan 29, 2021
@dagood dagood deleted the apsb-incorporate branch January 29, 2021 21:55
akoeplinger pushed a commit to akoeplinger/arcade that referenced this pull request Apr 12, 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.

Incorporate source-build patch into repo (arcade-powered source-build stage 2 async step)

2 participants