summaryrefslogtreecommitdiff
path: root/build.proj
diff options
context:
space:
mode:
authorDavis Goodin <dagood@microsoft.com>2016-02-23 20:37:36 (GMT)
committerDavis Goodin <dagood@microsoft.com>2016-03-02 18:32:03 (GMT)
commit0d71a87375bfa54af10b68b74a4c8d93430ed308 (patch)
treec19ee951b6aa6bdd9be63d609e46b223ed284782 /build.proj
parent28c6b8dacf69d374a4ac5d6a49d7f67d899c0454 (diff)
downloadcoreclr-0d71a87375bfa54af10b68b74a4c8d93430ed308.zip
coreclr-0d71a87375bfa54af10b68b74a4c8d93430ed308.tar.gz
coreclr-0d71a87375bfa54af10b68b74a4c8d93430ed308.tar.bz2
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 'build.proj')
-rw-r--r--build.proj2
1 files changed, 1 insertions, 1 deletions
diff --git a/build.proj b/build.proj
index 7202143..d37eaff 100644
--- a/build.proj
+++ b/build.proj
@@ -17,7 +17,7 @@
</Target>
<Target Name="RestoreNETCorePlatforms" AfterTargets="Build">
- <Exec Command="$(DnuRestoreCommand) $(SourceDir).nuget/init/project.json --source https://www.myget.org/F/dotnet-core/" />
+ <Exec Command="$(DnuRestoreCommand) $(SourceDir).nuget/init/project.json --source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
</Target>
</Project> \ No newline at end of file