Skip to content
This repository was archived by the owner on Dec 18, 2017. It is now read-only.

Commit 39546e4

Browse files
pranavkmpranavkm
committed
Updating json files to pin versions and build.cmd to pin KoreBuild and DNX
1 parent adc9d38 commit 39546e4

File tree

91 files changed

+52979
-454
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+52979
-454
lines changed

‎build.cmd‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,21 @@ 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

22-
IF "%1" == "rebuild-package" goto run
23-
24-
IF "%SKIP_DNX_INSTALL%"=="1" (
25-
REM On the CI, don't upgrade since the previous installed DNVM is already there.
26-
CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
26+
IF "%SKIP_DNX_INSTALL%"=="1" goto run
27+
IF DEFINED BUILDCMD_RELEASE (
28+
CALL packages\KoreBuild\build\dnvm install 1.0.0-%BUILDCMD_RELEASE% -runtime CLR -arch x86 -a default
2729
) ELSE (
28-
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
30+
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
2931
)
32+
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
3033

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

‎misc/DnuWrapTestSolutions/ConsoleApp1/src/ConsoleApp1/project.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"dependencies": {
44
"LibraryAlpha": "1.0.0-*"
55
},
6-
"commands": {
7-
"run" : "run"
6+
"commands": {
7+
"run": "run"
88
},
9-
"frameworks" : {
10-
"dnx451" : { }
9+
"frameworks": {
10+
"dnx451": {}
1111
}
12-
}
12+
}

‎misc/DnuWrapTestSolutions/ConsoleApp1/src/LibraryAlpha/project.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
"dependencies": {
44
"LibraryBeta": "1.0.0-*"
55
},
6-
7-
"frameworks" : {
8-
"dnx451" : {
9-
"dependencies": {
10-
}
6+
"frameworks": {
7+
"dnx451": {
8+
"dependencies": {}
119
}
1210
}
13-
}
11+
}

‎misc/DnuWrapTestSolutions/ConsoleApp1/src/LibraryBeta/project.json‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
{
22
"version": "1.0.0-*",
3-
"dependencies": {
4-
},
5-
6-
"frameworks" : {
7-
}
8-
}
3+
"dependencies": {},
4+
"frameworks": {}
5+
}

‎misc/LockFileTestProjects/src/Dnx451AppReferencingNet40Lib/project.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
{
1+
{
22
"version": "1.0.0-*",
33
"dependencies": {
44
"Net40Lib": ""
55
},
66
"commands": {
77
"run": "run"
88
},
9-
"frameworks" : {
10-
"dnx451" : { }
9+
"frameworks": {
10+
"dnx451": {}
1111
}
12-
}
12+
}

‎misc/LockFileTestProjects/src/Net40Lib/project.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
{
1+
{
22
"version": "1.0.0-*",
33
"dependencies": {
44
"Newtonsoft.Json": "6.0.6"
55
},
6-
7-
"frameworks" : {
8-
"net40": { }
6+
"frameworks": {
7+
"net40": {}
98
}
10-
}
9+
}

‎misc/ResourcesTestProjects/testproject/project.json‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
1-
{
1+
{
22
"version": "1.0.0-*",
3-
"dependencies": {
4-
},
5-
3+
"dependencies": {},
64
"frameworks": {
75
"dnx451": {
8-
"dependencies": {
9-
}
6+
"dependencies": {}
107
},
118
"dnxcore50": {
129
"dependencies": {
13-
"System.Runtime": "4.0.20-beta-*",
14-
"System.Reflection": "4.0.0-beta-*",
15-
"System.Console": "4.0.0-beta-*"
10+
"System.Runtime": "4.0.20-beta-23109",
11+
"System.Reflection": "4.0.10-beta-23109",
12+
"System.Console": "4.0.0-beta-23109"
1613
}
1714
}
1815
},
@@ -24,4 +21,4 @@
2421
"../someresources/*.resx",
2522
"../someresources/*.txt"
2623
]
27-
}
24+
}

‎misc/ServicingTestProjects/ServiceableLib1/project.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
{
1+
{
22
"version": "1.0.0",
3-
4-
"frameworks" : {
5-
"dnx451" : {}
3+
"frameworks": {
4+
"dnx451": {}
65
}
7-
}
6+
}

‎misc/ServicingTestProjects/UnserviceableLib1/project.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
{
1+
{
22
"version": "1.0.0",
3-
4-
"frameworks" : {
5-
"dnx451" : {}
3+
"frameworks": {
4+
"dnx451": {}
65
}
7-
}
6+
}

‎misc/ServicingTestProjects/UnserviceableLib2/project.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
{
1+
{
22
"version": "1.0.0",
3-
4-
"frameworks" : {
5-
"dnx451" : {}
3+
"frameworks": {
4+
"dnx451": {}
65
}
7-
}
6+
}

0 commit comments

Comments
 (0)