From 8768b873bd35a4696326384e29f406583f99abc3 Mon Sep 17 00:00:00 2001 From: Bryan Date: Wed, 18 Nov 2015 01:19:06 -0800 Subject: [PATCH] Fix Windows AppDep, bump ILCompiler Version to fix cache issue --- scripts/build/build_appdeps.cmd | 2 -- scripts/compile.ps1 | 2 +- src/Microsoft.DotNet.Tools.Compiler.Native/project.json | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/build/build_appdeps.cmd b/scripts/build/build_appdeps.cmd index aa1f1ee75..18a2fcfed 100644 --- a/scripts/build/build_appdeps.cmd +++ b/scripts/build/build_appdeps.cmd @@ -7,8 +7,6 @@ set __ScriptDir=%~dp0 set __RepoRoot=%__ScriptDir%\..\.. set __AppDepsProjectDir=%__RepoRoot%\src\Microsoft.DotNet.Tools.Compiler.Native\appdep -set PATH=%RepoRoot%\artifacts\win7-x64\stage0\bin;%PATH% - REM Get absolute path pushd %1 set __OutputPath=%CD%\bin diff --git a/scripts/compile.ps1 b/scripts/compile.ps1 index 0eeb2cc47..a43c7ac73 100644 --- a/scripts/compile.ps1 +++ b/scripts/compile.ps1 @@ -95,11 +95,11 @@ Download it from https://www.cmake.org cp "$PSScriptRoot\dotnet-restore.cmd" "$Stage2Dir\bin\dotnet-restore.cmd" # Copy in AppDeps + $env:PATH = "$Stage2Dir\bin;$StartPath" header "Acquiring Native App Dependencies" cmd /c "$PSScriptRoot\build\build_appdeps.cmd" "$Stage2Dir" # Smoke test stage2 - $env:PATH = "$Stage2Dir\bin;$StartPath" $env:DOTNET_HOME = "$Stage2Dir" & "$PSScriptRoot\test\smoke-test.ps1" } finally { diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/project.json b/src/Microsoft.DotNet.Tools.Compiler.Native/project.json index 0a6ad1bee..b1592ead0 100644 --- a/src/Microsoft.DotNet.Tools.Compiler.Native/project.json +++ b/src/Microsoft.DotNet.Tools.Compiler.Native/project.json @@ -23,7 +23,7 @@ "type": "build", "version": "1.0.0-*" }, - "Microsoft.DotNet.ILCompiler": "1.0.0-*", + "Microsoft.DotNet.ILCompiler": "1.0.1-*", "Microsoft.DotNet.ObjectWriter": "1.0.2-*", "Microsoft.DotNet.RyuJit": "1.0.0-*" },