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 multi-targeting from runtime.depproj #41666

Merged
merged 3 commits into from
Sep 7, 2020

Conversation

ViktorHofer
Copy link
Member

@ViktorHofer ViktorHofer commented Sep 1, 2020

and convert it to a csproj and use the NoBuild msbuild sdk. Simplify the
project logic in relation to IL vs native code as well.

Fixes #40778
Fixes #20321
Contributes to #38034

also fixes a reported issue when updating to a newer SDK >= RC1:

C:\Program Files\dotnet\sdk\5.0.100-preview.8.20417.9\NuGet.RestoreEx.targets(10,5): error : Invalid restore input. Invalid target framework 'unsupported'. Input files: F:\dotnet\runtime\src\libraries\restore\runtime\runtime.depproj. [F:\dotnet\runtime\Build.proj]

This the short term fix which removes the depproj infrastructure. The long term fix will remove externals.csproj entirely and use live built assets for the host assets.

and convert it to a csproj and use the NoBuild msbuild sdk. Simplify the
project logic in relation to IL vs native code as well.
@ViktorHofer ViktorHofer requested a review from ericstj September 1, 2020 11:23
@ViktorHofer ViktorHofer self-assigned this Sep 1, 2020
@Dotnet-GitSync-Bot
Copy link
Collaborator

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@ghost
Copy link

ghost commented Sep 1, 2020

Tagging subscribers to this area: @safern, @ViktorHofer
See info in area-owners.md if you want to be subscribed.

src/libraries/Directory.Build.targets Outdated Show resolved Hide resolved
<SwapNativeForIL Condition="'$(SwapNativeForIL)' == '' and ('$(Configuration)' == 'Debug' or '$(Coverage)' == 'true') and '$(RuntimeFlavor)' != 'Mono'">true</SwapNativeForIL>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
Copy link
Member

Choose a reason for hiding this comment

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

Will we run into clashing when folks run different vertical builds? Like building for browser and unix from same clone?

Copy link
Member Author

Choose a reason for hiding this comment

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

I just verified this scenario, the outputs aren't clashing:

image

The Browser leaf contains the mono aot stuff and the Linux leaf contians the host and other stuff that isn't present on wasm.

@ericstj ericstj requested a review from jkoritzinsky September 1, 2020 14:05
@ViktorHofer
Copy link
Member Author

ViktorHofer commented Sep 7, 2020

Merging to unblock the planned SDK update. Verified that what @ericstj pointed out isn't a concern.

@ViktorHofer
Copy link
Member Author

/azp run runtime

@ViktorHofer
Copy link
Member Author

/azp run runtime-live-build

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

1 similar comment
@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Member

@trylek trylek left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

@ViktorHofer ViktorHofer merged commit 5f56a50 into dotnet:master Sep 7, 2020
@ViktorHofer ViktorHofer deleted the RuntimeDepproj branch September 7, 2020 19:53
ViktorHofer added a commit to ViktorHofer/runtime that referenced this pull request Sep 15, 2020
* Remove multi-targeting from runtime.depproj

and convert it to a csproj and use the NoBuild msbuild sdk. Simplify the
project logic in relation to IL vs native code as well.
@ghost ghost locked as resolved and limited conversation to collaborators Dec 7, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
4 participants