Update the repo to support VS2019 and to use C# 8.0 #7015

tannergooding · 2019-02-13T16:57:17Z

buildscripts/buildvars-setup.cmd

jkotas

Awesome. Thanks a lot!

Hope the CI won't hit problems with this ... this looks too easy to be true.

tannergooding · 2019-02-13T17:25:23Z

Looks like jobs are failing with Unhandled Exception: System.IO.FileNotFoundException: Could not load file or assembly 'System.Runtime, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a' or one of its dependencies. The system cannot find the file specified.

tannergooding · 2019-02-13T18:47:28Z

Failure looks to be because of ~~BuildTools update also updated~~ xunit.console, which depends on System.Runtime, Version=4.2.0.0.

Still trying to determine why it is failing now....

tannergooding · 2019-02-13T19:23:07Z

Looks like RunTests.cmd changed from:

call %RUNTIME_PATH%\dotnet.exe xunit.console.dll ILCompiler.Compiler.Tests.dll  -xml testResults.xml -notrait category=nontests -notrait category=nonwindowstests  -notrait category=OuterLoop -notrait category=failing

to:

call xunit.console.dll ILCompiler.Compiler.Tests.dll  -xml testResults.xml -notrait category=nontests -notrait category=nonwindowstests  -notrait category=OuterLoop -notrait category=failing

tannergooding · 2019-02-13T19:37:29Z

CC. @ViktorHofer who made most of the relevant changes to BuildTools here: dotnet/buildtools#2168.

What is the appropriate fix here? It looks like we are hitting: https://github.com/dotnet/buildtools/blob/master/src/Microsoft.DotNet.Build.Tasks/PackageFiles/tests.targets#L82

ViktorHofer · 2019-02-13T19:40:19Z

@tannergooding We don't tests.targets anymore in corefx. I don't think anyone besides coreclr is using buildtools/master. You can apply whatever fix works for you. Do you need help?

tannergooding · 2019-02-13T21:03:57Z

Do you need help?

No, I think a workaround should be trivial enough. Looks like this might require another update to BuildTools, however (I didn't see any hooks that would allow me to fix this just locally).

tannergooding · 2019-02-13T21:14:34Z

Actually, @ViktorHofer. It looks like just setting BuildingNETCoreAppVertical would do the trick. Would there be any concerns (or negative impact) from doing so?

It looks like it is only consumed from within the BuildTools tests.targets file.

ViktorHofer · 2019-02-13T21:16:46Z

Yeah I had the same discussion with @trylek some months ago who tried to use the tests.targets in corert. Yes setting BuildingNETCoreAppVertical should do it as you tell the script that you want to use the .NET Core test profile.

trylek · 2019-02-13T21:39:20Z

FWIW, this is my PR from the end of last year where I tried to enable CoreRT build under VS2019:

#6617

I however didn't manage to make it fully work before I had to switch over to other work.

tannergooding · 2019-02-13T23:32:14Z

dir.props

+    <BuildingNETCoreAppVertical>true</BuildingNETCoreAppVertical>
+    <IncludeVSTestReferences>false</IncludeVSTestReferences>
+    <CopyConfigurationFiles>false</CopyConfigurationFiles>
+    <RuntimeConfigPath>$(PackagesDir)/xunit.runner.console/$(XUnitPackageVersion)/tools/netcoreapp2.0/xunit.console.runtimeconfig.json</RuntimeConfigPath>


These four (BuildingNETCoreAppVertical, IncludeVSTestReferences, CopyConfigurationFiles, and RuntimeConfigPath) are working around the test.targets from BuildTools.

It ensures that:

RunTests.cmd is generated to use dotnet.exe xunit.console.dll

xunit.console.runtimeconfig.json stays targeting netcoreapp2.0 (rather than v9.9.9)

Yeah sorry for all that stuff which isn't really needed outside of corefx. I guess at some point corert should either migrate away from tests.targets or clean it up...

tannergooding · 2019-02-14T00:41:46Z

No changes, just modified the timestamp on the last commit to try and retrigger the jobs. There were none actually pending in CI.

tannergooding · 2019-02-14T06:08:36Z

Looks like some of the projects tried to use the desktop compiler and caused the "Requires net472" dialog box to show.

tannergooding · 2019-02-15T06:05:09Z

The CoreCLR tests jobs are failing because tests.targets is using xunit.runner.msbuild, which is Desktop only. However, LangVersion=8 requires net472 on Desktop.

I did try setting up just the CoreCLR tests to skip the toolset compiler and use the Desktop msbuild. That, however, fails with:

D:\j\w\corert\tests\CoreCLR\runtest\tests.targets(42,5): error : System.ArgumentNullException: Value cannot be null. [D:\j\w\corert\tests\CoreCLR\runtest\runtest.proj]
D:\j\w\corert\tests\CoreCLR\runtest\tests.targets(42,5): error : Parameter name: type [D:\j\w\corert\tests\CoreCLR\runtest\runtest.proj]

tannergooding · 2019-02-15T16:23:32Z

Looks like the failures are because BuildTools significantly rewrote how the test logic works (and most of it is specific to CoreFX).

I'm trying a workaround that keeps the BuildTools version the same but adds a step to our own init-tools.cmd (the one that calls the build-tools init-tools.cmd) that restores the needed Toolset Compiler versions.

tannergooding · 2019-02-15T16:49:27Z

dir.props

@@ -268,6 +270,14 @@
    <IlasmToolPath Condition="'$(OSEnvironment)'=='Windows_NT'">%WINDIR%\Microsoft.NET\Framework\v4.0.30319\ilasm.exe</IlasmToolPath>
  </PropertyGroup>

+  <PropertyGroup>


This is needed since we are no longer updating the BuildTools version. It configures the various roslyn toolset properties as appropriate.

tannergooding · 2019-02-15T16:50:05Z

init-tools.cmd

@@ -81,6 +81,36 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] (
  goto :error
 )

+:: Restore a custom RoslynToolset since we can't trivially update the BuildTools dependency in CoreRT
+echo Configurating RoslynToolset...


This is basically a clone of the logic in "%BUILD_TOOLS_PATH%\init-tools.cmd", but restoring the required roslyn toolset version.

need to the corresponding logic to init-tools.sh as well...

tannergooding · 2019-02-15T16:52:24Z

tests/CoreCLR/runtest/dir.props

@@ -1,17 +1,14 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>


This is needed because the tests/CoreCLR/runtests/tests.targets file uses xunit.runner.msbuild which is Desktop only.

The roslyn toolset we are restoring requires net472 for the desktop toolset, which is not installed on all the Jenkins build-machines.

…ropriate RoslynToolset

tannergooding · 2019-02-15T17:52:04Z

I believe this should be good now as well (only the Wasm jobs are left).

It would be great if people who have already signed-off could give this a second glance, given it required a few more iterations to get correct and has a "hack" to get the toolset compiler down, rather than pulling it in via BuildTools.

If people are okay with the above approach, I will log a bug tracking removal of the workaround and actually updating the BuildTools dependency (or maybe just dealing with it in the Arcade transition).

tannergooding · 2019-02-15T18:51:22Z

Logged #7032 to track removal of the workaround once we can remove the desktop dependency from tests/CoreCLR/runtests/tests.targets.

tannergooding mentioned this pull request Feb 13, 2019

Manually update the dependencies.props and move S.P.Corelib to use LangVersion=8.0 dotnet/coreclr#22452

Merged

jkotas reviewed Feb 13, 2019

View reviewed changes

buildscripts/buildvars-setup.cmd Show resolved Hide resolved

jkotas approved these changes Feb 13, 2019

View reviewed changes

tannergooding commented Feb 13, 2019

View reviewed changes

jkotas closed this Feb 13, 2019

jkotas reopened this Feb 13, 2019

tannergooding added 8 commits February 15, 2019 08:42

Updating the build scripts to support VS2019

7c4a608

Updating the BuildToolsVersion to 3.0.0-preview1-03713-01

a4135e6

Updating LangVersion to 8.0

8b7abf4

Adding some notes about VS2019 support to prerequisites-for-building.md

97db6cd

Setting UseSharedCompilation=true and BuildingNETCoreAppVertical=true

38af365

Use _VSCOMNTOOLS and workaround some BuildTools test.target checks

7c85476

Fixing up some remaining cmd scripts to use dotnet msbuild

78d7f11

Reverting CoreCLR tests to using desktop msbuild.

086e987

tannergooding commented Feb 15, 2019

View reviewed changes

Reverting the build-tools version and adding logic to restore the app…

1cb2480

…ropriate RoslynToolset

jkotas merged commit 1deaab5 into dotnet:master Feb 15, 2019

tannergooding mentioned this pull request Feb 15, 2019

Consume RoslynToolset via the appropriate mechanism #7032

Open

jkotas mentioned this pull request Feb 16, 2019

build error #7036

Closed

jkotas mentioned this pull request Feb 27, 2019

Bump build tools to support vs 2019 #7084

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update the repo to support VS2019 and to use C# 8.0 #7015

Update the repo to support VS2019 and to use C# 8.0 #7015

tannergooding commented Feb 13, 2019

jkotas left a comment

tannergooding commented Feb 13, 2019

tannergooding commented Feb 13, 2019 •

edited

Loading

tannergooding commented Feb 13, 2019

tannergooding commented Feb 13, 2019

ViktorHofer commented Feb 13, 2019 •

edited

Loading

tannergooding commented Feb 13, 2019

tannergooding commented Feb 13, 2019

ViktorHofer commented Feb 13, 2019

trylek commented Feb 13, 2019

tannergooding Feb 13, 2019

ViktorHofer Feb 13, 2019

tannergooding commented Feb 14, 2019

tannergooding commented Feb 14, 2019

tannergooding commented Feb 15, 2019 •

edited

Loading

tannergooding commented Feb 15, 2019

tannergooding Feb 15, 2019

tannergooding Feb 15, 2019

tannergooding Feb 15, 2019

tannergooding Feb 15, 2019

tannergooding Feb 15, 2019

tannergooding commented Feb 15, 2019

tannergooding commented Feb 15, 2019

		@@ -1,17 +1,14 @@
		<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
		<PropertyGroup>

Update the repo to support VS2019 and to use C# 8.0 #7015

Update the repo to support VS2019 and to use C# 8.0 #7015

Conversation

tannergooding commented Feb 13, 2019

jkotas left a comment

Choose a reason for hiding this comment

tannergooding commented Feb 13, 2019

tannergooding commented Feb 13, 2019 • edited Loading

tannergooding commented Feb 13, 2019

tannergooding commented Feb 13, 2019

ViktorHofer commented Feb 13, 2019 • edited Loading

tannergooding commented Feb 13, 2019

tannergooding commented Feb 13, 2019

ViktorHofer commented Feb 13, 2019

trylek commented Feb 13, 2019

tannergooding Feb 13, 2019

Choose a reason for hiding this comment

ViktorHofer Feb 13, 2019

Choose a reason for hiding this comment

tannergooding commented Feb 14, 2019

tannergooding commented Feb 14, 2019

tannergooding commented Feb 15, 2019 • edited Loading

tannergooding commented Feb 15, 2019

tannergooding Feb 15, 2019

Choose a reason for hiding this comment

tannergooding Feb 15, 2019

Choose a reason for hiding this comment

tannergooding Feb 15, 2019

Choose a reason for hiding this comment

tannergooding Feb 15, 2019

Choose a reason for hiding this comment

tannergooding Feb 15, 2019

Choose a reason for hiding this comment

tannergooding commented Feb 15, 2019

tannergooding commented Feb 15, 2019

tannergooding commented Feb 13, 2019 •

edited

Loading

ViktorHofer commented Feb 13, 2019 •

edited

Loading

tannergooding commented Feb 15, 2019 •

edited

Loading