diff options
| author | Davis Goodin <dagood@microsoft.com> | 2016-02-23 14:37:36 -0600 |
|---|---|---|
| committer | Davis Goodin <dagood@microsoft.com> | 2016-03-02 12:32:03 -0600 |
| commit | 0d71a87375bfa54af10b68b74a4c8d93430ed308 (patch) | |
| tree | c19ee951b6aa6bdd9be63d609e46b223ed284782 /dir.props | |
| parent | 28c6b8dacf69d374a4ac5d6a49d7f67d899c0454 (diff) | |
| download | coreclr-0d71a87375bfa54af10b68b74a4c8d93430ed308.tar.gz coreclr-0d71a87375bfa54af10b68b74a4c8d93430ed308.tar.bz2 coreclr-0d71a87375bfa54af10b68b74a4c8d93430ed308.zip | |
Upgrade CLI version and buildtools, and make build file changes.
Unset CORE_ROOT in environment on Windows before doing restore so that dotnet CLI doesn't try to run using binaries from the test CORE_ROOT.
Restore the xunit wrapper projects in a batch rather than individually to save a lot of time.
Work around xunit.runner.msbuild not having compatible package layout by ignoring errors and adding import so that a future fix will work.
Hard-code C# language for generated wrapper projects: the $(Language) property wasn't set.
Also Change www.myget.org to dotnet.myget.org, as we switched to enterprise myget.
Add System.ObjectModel to tests\src\JIT\config\benchmark+serialize\project.json to manually upgrade it to a version that doesn't require lifting for runtime. This fixes System.ObjectModel.dll being missing from CORE_ROOT and causing the test to fail.
Switch to v3 nuget feeds and sync NuGet.Configs.
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -95,10 +95,12 @@ <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'!='Unix'">$(DotnetCliPath)dotnet.exe</DotnetToolCommand> <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'=='Unix'">$(DotnetCliPath)dotnet</DotnetToolCommand> - <DnuRestoreCommand>"$(DotnetToolCommand)"</DnuRestoreCommand> + <!-- If CORE_ROOT is set on Windows, the dotnet CLI tool tries to use it. This results in DLL resolution errors. Unset CORE_ROOT during restore. --> + <DnuRestoreCommand Condition="'$(OsEnvironment)'!='Unix'">(set CORE_ROOT=) &</DnuRestoreCommand> + + <DnuRestoreCommand>$(DnuRestoreCommand) "$(DotnetToolCommand)"</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))"</DnuRestoreCommand> - <DnuRestoreCommand Condition="'$(LockDependencies)' == 'true'">$(DnuRestoreCommand) --lock</DnuRestoreCommand> </PropertyGroup> <!-- Setup Nuget properties --> |