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

Commit 83f9259

Browse files
committed
Updating json files to pin versions and build.cmd to pin KoreBuild and DNX
1 parent 50dfcd0 commit 83f9259

File tree

77 files changed

+40963
-264
lines changed

Some content is hidden

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

77 files changed

+40963
-264
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-beta5",
33
"dependencies": {
4-
"LibraryAlpha": "1.0.0-*"
4+
"LibraryAlpha": "1.0.0-beta5"
55
},
66
"commands": {
77
"run" : "run"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-beta5",
33
"dependencies": {
4-
"LibraryBeta": "1.0.0-*"
4+
"LibraryBeta": "1.0.0-beta5"
55
},
66

77
"frameworks" : {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-beta5",
33
"dependencies": {
44
},
55

misc/LockFileTestProjects/src/Dnx451AppReferencingNet40Lib/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{
2-
"version": "1.0.0-*",
1+
{
2+
"version": "1.0.0-beta5",
33
"dependencies": {
44
"Net40Lib": ""
55
},

misc/LockFileTestProjects/src/Net40Lib/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{
2-
"version": "1.0.0-*",
1+
{
2+
"version": "1.0.0-beta5",
33
"dependencies": {
44
"Newtonsoft.Json": "6.0.6"
55
},

misc/ResourcesTestProjects/testproject/project.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{
2-
"version": "1.0.0-*",
1+
{
2+
"version": "1.0.0-beta5",
33
"dependencies": {
44
},
55

@@ -10,9 +10,9 @@
1010
},
1111
"dnxcore50": {
1212
"dependencies": {
13-
"System.Runtime": "4.0.20-beta-*",
14-
"System.Reflection": "4.0.0-beta-*",
15-
"System.Console": "4.0.0-beta-*"
13+
"System.Runtime": "4.0.20-beta-23019",
14+
"System.Reflection": "4.0.0-beta-23019",
15+
"System.Console": "4.0.0-beta-23019"
1616
}
1717
}
1818
},

misc/ServicingTestProjects/ServiceableLib1/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"version": "1.0.0",
33

44
"frameworks" : {

misc/ServicingTestProjects/UnserviceableLib1/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"version": "1.0.0",
33

44
"frameworks" : {

misc/ServicingTestProjects/UnserviceableLib2/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"version": "1.0.0",
33

44
"frameworks" : {

0 commit comments

Comments
 (0)