Skip to content

Move to Microsoft.Net.Compilers.Toolset#2131

Merged
jaredpar merged 2 commits intodotnet:masterfrom
jaredpar:fix-toolset
Feb 28, 2019
Merged

Move to Microsoft.Net.Compilers.Toolset#2131
jaredpar merged 2 commits intodotnet:masterfrom
jaredpar:fix-toolset

Conversation

@jaredpar
Copy link
Copy Markdown
Member

This is a unified NuPkg for the desktop and coreclr Roslyn compilers.
Removes the need to special case based on the MSBuild runtime at restore
time. Instead there is one restore and at build time the correct
compiler task is loaded based on the runtime.

This is a unified NuPkg for the desktop and coreclr Roslyn compilers.
Removes the need to special case based on the MSBuild runtime at restore
time. Instead there is one restore and at build time the correct
compiler task is loaded based on the runtime.
@jaredpar jaredpar requested a review from tmat February 27, 2019 22:35
@markwilkie
Copy link
Copy Markdown
Member

super cool

@tmat
Copy link
Copy Markdown
Member

tmat commented Feb 27, 2019

Do we want the version to flow automatically? That is whatever version Arcade repo is using will be set as the default.

@tmat
Copy link
Copy Markdown
Member

tmat commented Feb 27, 2019

FYI: msbuild, Roslyn and CoreFX repos use MicrosoftNetCompilersVersion:

msbuild\eng\Packages.props
roslyn\eng\Versions.props
corefx\eng\Tools.props
corefx\eng\Versions.props

@jaredpar
Copy link
Copy Markdown
Member Author

@tmat yeah we'll have to update all those repositories when they take this change. I know @tannergooding is looking at CoreFX, I'm working on roslyn and I can work with @rainersigwald on msbuild

@jaredpar
Copy link
Copy Markdown
Member Author

@tmat

Do we want the version to flow automatically? That is whatever version Arcade repo is using will be set as the default.

The version of Microsoft.Net.Compilers.Toolset? Yes. That's what we did for toolsets in the previous iteration and should be doing now. Yeah the toolset is newer here but it's the .NET Core Preview3 toolset. We should all be using it.

@tmat
Copy link
Copy Markdown
Member

tmat commented Feb 27, 2019

So in order to flow the package into defaults add

<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetVersion)</MicrosoftNetCompilersToolsetVersion>

here, set the property in Arcade's eng/Versions.props and remove https://github.com/dotnet/arcade/pull/2131/files#diff-f1b1f6d246bc1f9a81d8ea1c4498e3a5R54.

That way Arcade SDK build captures the version of the package that's used to build it and flows it to all repos that will be using that Arcade SDK. Maestro will then flow the version if Arcade repo has a subscription to Roslyn.

@tannergooding
Copy link
Copy Markdown
Member

Once this goes in and is pushed through, I'll update CoreFX to get the version from here. Looks like this will just require UsingToolMicrosoftNetCompilers=true and Maestro will regularly update the version in Arcade?

@tmat
Copy link
Copy Markdown
Member

tmat commented Feb 27, 2019

@tannergooding Yes.

<MicrosoftDotNetIBCMergeVersion Condition="'$(MicrosoftDotNetIBCMergeVersion)' == ''">4.8.0-beta.19111.1</MicrosoftDotNetIBCMergeVersion>
<MicrosoftNetCompilersVersion Condition="'$(MicrosoftNetCompilersVersion)' == ''">2.8.0</MicrosoftNetCompilersVersion>
<MicrosoftNETCoreCompilersVersion Condition="'$(MicrosoftNETCoreCompilersVersion)' == ''">$(MicrosoftNetCompilersVersion)</MicrosoftNETCoreCompilersVersion>
<MicrosoftNetCompilersToolsetVersion Condition="'$(MicrosoftNetCompilersToolsetVersion)' == ''">3.1.0-beta1-19127-06</MicrosoftNetCompilersToolsetVersion>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Maybe warn users who have UsingToolMicrosoftNetCompilers=true and who also define MicrosoftNetCompilersVersion so they know to switch/update?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

We know the teams who do this and they've all been notified.

@jaredpar
Copy link
Copy Markdown
Member Author

@tmat updated

Copy link
Copy Markdown
Member

@tmat tmat left a comment

Choose a reason for hiding this comment

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

:shipit:

<Project>
<PropertyGroup>
<ArcadeSdkVersion>$(PackageVersion)</ArcadeSdkVersion>
<MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetVersion)</MicrosoftNetCompilersToolsetVersion>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Is the file rewritten as part of build?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

(I saw Tomas' comment here: #2131 (comment), not sure quite how it flows though).

@jaredpar jaredpar merged commit f393a6b into dotnet:master Feb 28, 2019
rainersigwald added a commit to dotnet/msbuild that referenced this pull request Feb 28, 2019
dotnet-maestro bot added a commit to dotnet/msbuild that referenced this pull request Mar 8, 2019
* Update dependencies from https://github.com/dotnet/arcade build 20190213.1

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19113.1

* Update dependencies from https://github.com/dotnet/arcade build 20190214.4

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19114.4

* Update dependencies from https://github.com/dotnet/arcade build 20190215.1

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19115.1

* Update dependencies from https://github.com/dotnet/arcade build 20190219.2

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19119.2

* Update dependencies from https://github.com/dotnet/arcade build 20190221.1

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19121.1

* Update dependencies from https://github.com/dotnet/arcade build 20190221.5

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19121.5

* Update dependencies from https://github.com/dotnet/arcade build 20190222.3

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19122.3

* Update dependencies from https://github.com/dotnet/arcade build 20190223.1

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19123.1

* Update dependencies from https://github.com/dotnet/arcade build 20190224.1

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19124.1

* Update dependencies from https://github.com/dotnet/arcade build 20190225.2

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19125.2

* Update dependencies from https://github.com/dotnet/arcade build 20190226.6

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19126.6

* Update dependencies from https://github.com/dotnet/arcade build 20190227.8

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19127.8

* Use Microsoft.Net.Compilers.Toolset in bootstrap

MSBuild implications of dotnet/arcade#2131.

* Disable NormalizePathBadGlobalroot test

Bug for future investigation: #4205.

* Update dependencies from https://github.com/dotnet/arcade build 20190228.3

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19128.3

* Update dependencies from https://github.com/dotnet/arcade build 20190301.5

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19151.5

* Update dependencies from https://github.com/dotnet/arcade build 20190304.14

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19154.14

* Update dependencies from https://github.com/dotnet/arcade build 20190305.29

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19155.29

* Update dependencies from https://github.com/dotnet/arcade build 20190306.20

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19156.20

* Update dependencies from https://github.com/dotnet/arcade build 20190307.23

This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19157.23
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