huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release' into dev

This commit is contained in:
Pranav K 2015-01-28 18:00:24 -08:00
parent f015f3c0b3 ed2bf6cee9
commit 4db95e198f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.cmd
View File

@ -19,10 +19,10 @@ IF EXIST packages\KoreBuild goto run
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
IF "%SKIP_DOTNET_INSTALL%"=="1" goto run
CALL packages\KoreBuild\build\dotnetsdk upgrade -runtime CLR -x86
CALL packages\KoreBuild\build\dotnetsdk install default -runtime CoreCLR -x86
IF "%SKIP_KRE_INSTALL%"=="1" goto run
CALL packages\KoreBuild\build\kvm upgrade -runtime CLR -x86
CALL packages\KoreBuild\build\kvm install default -runtime CoreCLR -x86
:run
CALL packages\KoreBuild\build\dotnetsdk use default -runtime CLR -x86
CALL packages\KoreBuild\build\kvm use default -runtime CLR -x86
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*

4
build.sh
View File

@ -28,11 +28,11 @@ if test ! -d packages/KoreBuild; then
fi
if ! type k > /dev/null 2>&1; then
source packages/KoreBuild/build/dotnetsdk.sh
source packages/KoreBuild/build/kvm.sh
fi
if ! type k > /dev/null 2>&1; then
dotnetsdk upgrade
kvm upgrade
fi
mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"

2
src/Microsoft.AspNet.Diagnostics/RuntimeInfoMiddleware.cs
View File

@ -65,7 +65,7 @@ namespace Microsoft.AspNet.Diagnostics
private static string GetRuntimeVersion()
{
var klr = Assembly.Load(new AssemblyName("dotnet.host"));
var klr = Assembly.Load(new AssemblyName("kre.host"));
var version = klr.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
return version?.InformationalVersion;
}