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

Commit 0a43101

Browse files
author
Suhas Joshi
committed
Updating json files to pin versions and build.cmd to pin KoreBuild and DNX
1 parent 1cda9bf commit 0a43101

File tree

18 files changed

+15366
-38
lines changed

18 files changed

+15366
-38
lines changed

NuGet.Config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<packageSources>
4+
<clear />
45
<add key="NuGet" value="https://nuget.org/api/v2/" />
56
<add key="AspNetMaster" value="https://www.myget.org/F/aspnetmaster/api/v2" />
67
</packageSources>

build.cmd

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,19 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul
1616

1717
:restore
1818
IF EXIST packages\KoreBuild goto run
19-
.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
21+
) ELSE (
22+
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
23+
)
2024
.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
2125

2226
IF "%SKIP_DNX_INSTALL%"=="1" goto run
23-
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
29+
) ELSE (
30+
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
31+
)
2432
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
2533

2634
:run

src/Microsoft.AspNet.Testing/project.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-beta4",
33
"dependencies": {
4-
"xunit.runner.aspnet": "2.0.0-aspnet-*"
4+
"xunit.runner.aspnet": "2.0.0-aspnet-beta4"
55
},
66
"frameworks": {
77
"dnx451": {
@@ -13,12 +13,12 @@
1313
},
1414
"dnxcore50": {
1515
"dependencies": {
16-
"System.Runtime": "4.0.20-beta-*",
17-
"System.Runtime.InteropServices": "4.0.20-beta-*",
18-
"System.Globalization": "4.0.10-beta-*",
19-
"System.Threading.Tasks": "4.0.10-beta-*",
20-
"System.Reflection": "4.0.10-beta-*",
21-
"System.Threading.Thread": "4.0.0-beta-*"
16+
"System.Runtime": "4.0.20-beta-22816",
17+
"System.Runtime.InteropServices": "4.0.20-beta-22816",
18+
"System.Globalization": "4.0.10-beta-22816",
19+
"System.Threading.Tasks": "4.0.10-beta-22816",
20+
"System.Reflection": "4.0.10-beta-22816",
21+
"System.Threading.Thread": "4.0.0-beta-22816"
2222
}
2323
}
2424
}

0 commit comments

Comments
 (0)