Skip to content
This repository was archived by the owner on Nov 29, 2018. It is now read-only.

Commit d729d6f

Browse files
committed
Updating json files to pin versions and build.cmd to pin KoreBuild and DNX
1 parent 32fc731 commit d729d6f

File tree

15 files changed

+14541
-111
lines changed

15 files changed

+14541
-111
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 %*
Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,34 @@
11
{
2-
"webroot": "wwwroot",
3-
"version": "1.0.0-*",
4-
5-
"dependencies": {
6-
"Microsoft.AspNet.Localization": "1.0.0-*",
7-
"Microsoft.AspNet.Server.IIS": "1.0.0-*",
8-
"Microsoft.AspNet.Server.WebListener": "1.0.0-*",
9-
"Microsoft.Framework.Localization": "1.0.0-*"
10-
},
11-
12-
"commands": {
13-
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000"
14-
},
15-
16-
"frameworks": {
17-
"dnx451": { },
18-
"dnxcore50": {
19-
"dependencies": {
20-
"System.Globalization": "4.0.11-beta-*",
21-
"System.Globalization.Extensions": "4.0.1-beta-*"
22-
}
23-
}
24-
},
25-
26-
"publishExclude": [
27-
"node_modules",
28-
"bower_components",
29-
"**.xproj",
30-
"**.user",
31-
"**.vspscc"
32-
],
33-
"exclude": [
34-
"wwwroot",
35-
"node_modules",
36-
"bower_components"
37-
]
38-
}
2+
"webroot": "wwwroot",
3+
"version": "1.0.0-*",
4+
"dependencies": {
5+
"Microsoft.AspNet.Localization": "1.0.0-beta7",
6+
"Microsoft.AspNet.Server.IIS": "1.0.0-beta7",
7+
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta7",
8+
"Microsoft.Framework.Localization": "1.0.0-beta7"
9+
},
10+
"commands": {
11+
"web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000"
12+
},
13+
"frameworks": {
14+
"dnx451": {},
15+
"dnxcore50": {
16+
"dependencies": {
17+
"System.Globalization": "4.0.11-beta-23225",
18+
"System.Globalization.Extensions": "4.0.1-beta-23225"
19+
}
20+
}
21+
},
22+
"publishExclude": [
23+
"node_modules",
24+
"bower_components",
25+
"**.xproj",
26+
"**.user",
27+
"**.vspscc"
28+
],
29+
"exclude": [
30+
"wwwroot",
31+
"node_modules",
32+
"bower_components"
33+
]
34+
}

0 commit comments

Comments
 (0)