From 0d71a87375bfa54af10b68b74a4c8d93430ed308 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Tue, 23 Feb 2016 14:37:36 -0600 Subject: [PATCH] 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. --- DotnetCLIVersion.txt | 2 +- build.proj | 2 +- dir.props | 6 +++-- init-tools.cmd | 2 +- init-tools.sh | 2 +- src/NuGet.Config | 3 +-- tests/build.proj | 12 +++++++--- tests/dir.props | 15 ++++++------- tests/runtest.proj | 26 +++++++++++++++++----- .../JIT/config/benchmark+serialize/project.json | 1 + tests/src/NuGet.Config | 4 ++-- 11 files changed, 48 insertions(+), 27 deletions(-) diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index 8e793ae..c916191 100644 --- a/DotnetCLIVersion.txt +++ b/DotnetCLIVersion.txt @@ -1 +1 @@ -1.0.0.000973 \ No newline at end of file +1.0.0.001504 \ No newline at end of file diff --git a/build.proj b/build.proj index 7202143..d37eaff 100644 --- a/build.proj +++ b/build.proj @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/dir.props b/dir.props index d9aeee8..018adc4 100644 --- a/dir.props +++ b/dir.props @@ -95,10 +95,12 @@ $(DotnetCliPath)dotnet.exe $(DotnetCliPath)dotnet - "$(DotnetToolCommand)" + + (set CORE_ROOT=) & + + $(DnuRestoreCommand) "$(DotnetToolCommand)" $(DnuRestoreCommand) restore $(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('\\'))" - $(DnuRestoreCommand) --lock diff --git a/init-tools.cmd b/init-tools.cmd index 0d41e3b..af77c7b 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -47,7 +47,7 @@ echo Installing dotnet cli... if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%" set /p DOTNET_VERSION=< %~dp0DotnetCLIVersion.txt set DOTNET_ZIP_NAME=dotnet-win-x64.%DOTNET_VERSION%.zip -set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% +set DOTNET_REMOTE_PATH=https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME% echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> %INIT_TOOLS_LOG% powershell -NoProfile -ExecutionPolicy unrestricted -Command "(New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> %INIT_TOOLS_LOG% diff --git a/init-tools.sh b/init-tools.sh index 8a3d1a8..f57991e 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -73,7 +73,7 @@ if [ "$__DistroName" == "rhel" ]; then __DOTNET_PKG=dotnet-centos-x64 fi -__CLIDownloadURL=https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz +__CLIDownloadURL=https://dotnetcli.blob.core.windows.net/dotnet/beta/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz echo ".NET CLI will be downloaded from $__CLIDownloadURL" if [ ! -e $__PROJECT_JSON_FILE ]; then diff --git a/src/NuGet.Config b/src/NuGet.Config index e821d14..0054b49 100644 --- a/src/NuGet.Config +++ b/src/NuGet.Config @@ -4,9 +4,8 @@ - + - diff --git a/tests/build.proj b/tests/build.proj index 0130c5e..ca3896d 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -18,9 +18,15 @@ - - - + + + + + + diff --git a/tests/dir.props b/tests/dir.props index 2697ba1..d0f3e35 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -51,11 +51,9 @@ - - - - - + + + @@ -76,11 +74,12 @@ @(DnuSourceList -> '--source %(Identity)', ' ') @(DnuRestoreDir -> '%(Identity)', ' ') - "$(DotnetToolCommand)" + + (set CORE_ROOT=) & + + $(DnuRestoreCommand) "$(DotnetToolCommand)" $(DnuRestoreCommand) restore $(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource) - $(DnuRestoreCommand) --lock - + + + + @@ -312,7 +325,8 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). + Targets="CopyDependecyToCoreRoot" + Properties="Language=C#" />