Skip to content

Commit 5008e03

Browse files
committed
Updating json files to pin versions and build.cmd to pin KoreBuild and DNX
1 parent f4fa33c commit 5008e03

File tree

15 files changed

+16752
-70
lines changed

15 files changed

+16752
-70
lines changed

build.cmd

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ cd %~dp0
33

44
SETLOCAL
55
SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
6-
SET BUILDCMD_KOREBUILD_VERSION=""
7-
SET BUILDCMD_DNX_VERSION=""
86

97
IF EXIST %CACHED_NUGET% goto copynuget
108
echo Downloading latest version of NuGet.exe...
@@ -18,21 +16,21 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul
1816

1917
:restore
2018
IF EXIST packages\KoreBuild goto run
21-
IF %BUILDCMD_KOREBUILD_VERSION%=="" (
22-
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
19+
IF DEFINED BUILDCMD_RELEASE (
20+
.nuget\NuGet.exe install KoreBuild -version 0.2.1-%BUILDCMD_RELEASE% -ExcludeVersion -o packages -nocache -pre
2321
) ELSE (
24-
.nuget\NuGet.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
22+
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
2523
)
2624
.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
2725

2826
IF "%SKIP_DNX_INSTALL%"=="1" goto run
29-
IF %BUILDCMD_DNX_VERSION%=="" (
30-
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
27+
IF DEFINED BUILDCMD_RELEASE (
28+
CALL packages\KoreBuild\build\dnvm install 1.0.0-%BUILDCMD_RELEASE% -runtime CLR -arch x86 -a default
3129
) ELSE (
32-
CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default
30+
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
3331
)
3432
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
3533

3634
:run
3735
CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
38-
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
36+
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*

src/Microsoft.AspNet.Hosting.Abstractions/project.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-beta7",
33
"description": "ASP.NET 5 Hosting abstractions.",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/aspnet/hosting"
77
},
88
"dependencies": {
9-
"Microsoft.AspNet.Http.Abstractions": "1.0.0-*",
10-
"Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-*",
11-
"Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
9+
"Microsoft.AspNet.Http.Abstractions": "1.0.0-beta7",
10+
"Microsoft.AspNet.FileProviders.Abstractions": "1.0.0-beta7",
11+
"Microsoft.Framework.NotNullAttribute.Sources": {
12+
"type": "build",
13+
"version": "1.0.0-beta7"
14+
}
1215
},
1316
"frameworks": {
1417
"dnx451": {},

0 commit comments

Comments
 (0)