Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Updating init-tools.cmd to also restore Microsoft.NETCore.Compilers #2222

Merged
merged 1 commit into from
Feb 13, 2019
Merged

Updating init-tools.cmd to also restore Microsoft.NETCore.Compilers #2222

merged 1 commit into from
Feb 13, 2019

Conversation

tannergooding
Copy link
Member

This updates init-tools.cmd to also restore Microsoft.NETCore.Compilers which allows CoreCLR to be compiled using dotnet msbuild on Windows.

@tannergooding
Copy link
Member Author

CC. @jkotas, @sbomer, @jashook

@tannergooding
Copy link
Member Author

As per dotnet/coreclr#22452 (comment)

@@ -26,6 +26,7 @@ set MSBUILD_PROJECT_CONTENT= ^
^^^<ItemGroup^^^> ^
^^^<PackageReference Include=^"MicroBuild.Core^" Version=^"%MICROBUILD_VERSION%^" /^^^> ^
^^^<PackageReference Include=^"Microsoft.Net.Compilers^" Version=^"%ROSLYNCOMPILERS_VERSION%^" /^^^> ^
^^^<PackageReference Include=^"Microsoft.NETCore.Compilers^" Version=^"%ROSLYNCOMPILERS_VERSION%^" /^^^> ^
Copy link
Member

Choose a reason for hiding this comment

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

Do we also need to copy this over to somewhere? (look for "Copy Roslyn Compilers Over to ToolRuntime" later in this file)

Copy link
Member Author

Choose a reason for hiding this comment

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

No, we can just reference it directly from the packages folder as is done on Unix systems.

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'll double check I didnt miss something, however.

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. Looks like this is fine. Unix (init-tools.sh) does no such copying and everything looks to work correctly locally.

I imagine it would be possible to not copy for the desktop case (and just reference the files directly) as well (it might make some logic simpler), but that would be a separate PR.

@tannergooding tannergooding merged commit 2b83856 into dotnet:master Feb 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants