summaryrefslogtreecommitdiff
path: root/build.cmd
diff options
context:
space:
mode:
authorJeremy Koritzinsky <jekoritz@microsoft.com>2019-04-29 09:27:10 -0700
committerGitHub <noreply@github.com>2019-04-29 09:27:10 -0700
commit9cf8b4b5c7d43c4352823ad57493dc91640a4fe2 (patch)
tree661de1ce059bd3515008ce7f4cad7a9c99427b85 /build.cmd
parent64b5ddd69e979c84e54c1fe278c94feaee3fbabf (diff)
downloadcoreclr-9cf8b4b5c7d43c4352823ad57493dc91640a4fe2.tar.gz
coreclr-9cf8b4b5c7d43c4352823ad57493dc91640a4fe2.tar.bz2
coreclr-9cf8b4b5c7d43c4352823ad57493dc91640a4fe2.zip
Restore IBCMerge using an authenticated service connection (#24284)
* Add separate build steps to do the IBCMerge restore. * Attempt 1 to get config picked up. * Attempt 2 getting ibcmerge restore working. * Fix invalid MSBuild syntax. * Fix getting IBC package version.
Diffstat (limited to 'build.cmd')
-rw-r--r--build.cmd8
1 files changed, 2 insertions, 6 deletions
diff --git a/build.cmd b/build.cmd
index 3d9a27a99f..bd6d355fd9 100644
--- a/build.cmd
+++ b/build.cmd
@@ -670,11 +670,7 @@ if %__BuildCoreLib% EQU 1 (
for /f "tokens=*" %%s in ('call "%__ProjectDir%\dotnet.cmd" msbuild "!IbcMergeProjectFilePath!" /t:DumpIbcMergePackageVersion /nologo') do @(
set __IbcMergeVersion=%%s
)
-
- echo Restoring IBCMerge version !__IbcMergeVersion!...
- echo Running: %__ProjectDir%\dotnet.cmd restore src/.nuget/optdata/ibcmerge.csproj --no-cache --packages "%__PackagesDir%" --source "https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json"
- call %__ProjectDir%\dotnet.cmd restore src/.nuget/optdata/ibcmerge.csproj --no-cache --packages "%__PackagesDir%" --source "https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json"
-
+
set IbcMergePath=%__PackagesDir%\microsoft.dotnet.ibcmerge\!__IbcMergeVersion!\tools\netcoreapp2.0\ibcmerge.dll
if exist !IbcMergePath! (
echo %__MsgPrefix%Optimizing using IBC training data
@@ -754,7 +750,7 @@ if %__BuildCoreLib% EQU 1 (
goto CrossgenFailure
)
) else (
- echo Could not find IBCMerge at !IbcMergePath!
+ echo Could not find IBCMerge at !IbcMergePath!. Have you restored src/.nuget/optdata/ibcmerge.csproj?
goto CrossgenFailure
)
)