mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix Windows AppDep, bump ILCompiler Version to fix cache issue

Browse source
This commit is contained in:
Bryan 2015-11-18 01:19:06 -08:00
parent ebe108c69b
commit 8768b873bd
3 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/build/build_appdeps.cmd
View file

@ -7,8 +7,6 @@ set __ScriptDir=%~dp0
set __RepoRoot=%__ScriptDir%\..\.. set __RepoRoot=%__ScriptDir%\..\..
set __AppDepsProjectDir=%__RepoRoot%\src\Microsoft.DotNet.Tools.Compiler.Native\appdep set __AppDepsProjectDir=%__RepoRoot%\src\Microsoft.DotNet.Tools.Compiler.Native\appdep
set PATH=%RepoRoot%\artifacts\win7-x64\stage0\bin;%PATH%
REM Get absolute path REM Get absolute path
pushd %1 pushd %1
set __OutputPath=%CD%\bin set __OutputPath=%CD%\bin

2
scripts/compile.ps1
View file

@ -95,11 +95,11 @@ Download it from https://www.cmake.org
cp "$PSScriptRoot\dotnet-restore.cmd" "$Stage2Dir\bin\dotnet-restore.cmd" cp "$PSScriptRoot\dotnet-restore.cmd" "$Stage2Dir\bin\dotnet-restore.cmd"
# Copy in AppDeps # Copy in AppDeps
$env:PATH = "$Stage2Dir\bin;$StartPath"
header "Acquiring Native App Dependencies" header "Acquiring Native App Dependencies"
cmd /c "$PSScriptRoot\build\build_appdeps.cmd" "$Stage2Dir" cmd /c "$PSScriptRoot\build\build_appdeps.cmd" "$Stage2Dir"
# Smoke test stage2 # Smoke test stage2
$env:PATH = "$Stage2Dir\bin;$StartPath"
$env:DOTNET_HOME = "$Stage2Dir" $env:DOTNET_HOME = "$Stage2Dir"
& "$PSScriptRoot\test\smoke-test.ps1" & "$PSScriptRoot\test\smoke-test.ps1"
} finally { } finally {

2
src/Microsoft.DotNet.Tools.Compiler.Native/project.json
View file

@ -23,7 +23,7 @@
"type": "build", "type": "build",
"version": "1.0.0-*" "version": "1.0.0-*"
}, },
"Microsoft.DotNet.ILCompiler": "1.0.0-*", "Microsoft.DotNet.ILCompiler": "1.0.1-*",
"Microsoft.DotNet.ObjectWriter": "1.0.2-*", "Microsoft.DotNet.ObjectWriter": "1.0.2-*",
"Microsoft.DotNet.RyuJit": "1.0.0-*" "Microsoft.DotNet.RyuJit": "1.0.0-*"
}, },