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

Commit 070fc81

Browse files
author
Suhas Joshi
committed
Updating json files to pin versions and build.cmd to pin KoreBuild and DNX
1 parent 9c19439 commit 070fc81

File tree

73 files changed

+44341
-339
lines changed

Some content is hidden

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

73 files changed

+44341
-339
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: 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-beta4",
33
"dependencies": {
4-
"LibraryAlpha": "1.0.0-*"
4+
"LibraryAlpha": "1.0.0-beta4"
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-beta4",
33
"dependencies": {
4-
"LibraryBeta": "1.0.0-*"
4+
"LibraryBeta": "1.0.0-beta4"
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-beta4",
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-beta4",
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-beta4",
33
"dependencies": {
44
"Newtonsoft.Json": "6.0.6"
55
},

‎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" : {

‎misc/XreTestApps/DependentProject/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
"dnx451": {},
99
"dnxcore50": {}
1010
}
11-
}
11+
}

‎samples/HelloShared/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"version": "0.1-beta-*",
2+
"version": "0.1-beta-beta4",
33
"dependencies": { },
44
"shared": "*.cs",
55
"frameworks": {
66
"dnx451": { },
77
"dnxcore50": {
88
"dependencies": {
9-
"System.Linq": "4.0.0-beta-*",
10-
"System.Runtime": "4.0.20-beta-*"
9+
"System.Linq": "4.0.0-beta-22816",
10+
"System.Runtime": "4.0.20-beta-22816"
1111
}
1212
}
1313
}

‎samples/HelloWorld/project.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"version": "0.1-beta-*",
2+
"version": "0.1-beta-beta4",
33
"exclude": "more/*.cs",
44
"dependencies": {
5-
"HelloShared": { "version": "0.1-beta-*", "type": "build" },
6-
"Microsoft.Framework.Runtime.Roslyn.Interfaces": "1.0.0-*"
5+
"HelloShared": { "version": "0.1-beta-beta4", "type": "build" },
6+
"Microsoft.Framework.Runtime.Roslyn.Interfaces": "1.0.0-beta4"
77
},
88
"commands": {
99
"hi": "HelloWorld --mode amazing",
@@ -23,13 +23,13 @@
2323
},
2424
"dnxcore50": {
2525
"dependencies": {
26-
"System.IO": "4.0.10-beta-*",
27-
"System.Console": "4.0.0-beta-*",
28-
"System.Linq": "4.0.0-beta-*",
29-
"System.Reflection": "4.0.10-beta-*",
30-
"System.Runtime": "4.0.20-beta-*",
31-
"System.Threading.Tasks": "4.0.10-beta-*",
32-
"System.ComponentModel": "4.0.0-beta-*"
26+
"System.IO": "4.0.10-beta-22816",
27+
"System.Console": "4.0.0-beta-22816",
28+
"System.Linq": "4.0.0-beta-22816",
29+
"System.Reflection": "4.0.10-beta-22816",
30+
"System.Runtime": "4.0.20-beta-22816",
31+
"System.Threading.Tasks": "4.0.10-beta-22816",
32+
"System.ComponentModel": "4.0.0-beta-22816"
3333
}
3434
}
3535
}

‎src/Microsoft.Framework.ApplicationHost/project.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"version": "1.0.0-*",
2+
"version": "1.0.0-beta4",
33
"compilationOptions": { "define": [ "TRACE" ], "warningsAsErrors": true },
44
"dependencies": {
5-
"Microsoft.Framework.CommandLineUtils": { "version": "1.0.0-*", "type": "build" },
6-
"Microsoft.Framework.Runtime": "1.0.0-*",
7-
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-*", "type": "build" },
8-
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
5+
"Microsoft.Framework.CommandLineUtils": { "version": "1.0.0-beta4", "type": "build" },
6+
"Microsoft.Framework.Runtime": "1.0.0-beta4",
7+
"Microsoft.Framework.Runtime.Common": { "version": "1.0.0-beta4", "type": "build" },
8+
"Microsoft.Framework.Runtime.Interfaces": "1.0.0-beta4"
99
},
1010
"frameworks": {
1111
"dnx451": { },
1212
"dnxcore50": {
1313
"dependencies": {
14-
"System.Collections": "4.0.10-beta-*",
15-
"System.ComponentModel": "4.0.0-beta-*",
16-
"System.Console": "4.0.0-beta-*",
17-
"System.Diagnostics.Debug": "4.0.10-beta-*",
18-
"System.Linq": "4.0.0-beta-*",
19-
"System.Reflection": "4.0.10-beta-*",
20-
"System.Runtime": "4.0.20-beta-*",
21-
"System.Runtime.Extensions": "4.0.10-beta-*",
22-
"System.Runtime.InteropServices": "4.0.20-beta-*",
23-
"System.Threading.Tasks": "4.0.10-beta-*"
14+
"System.Collections": "4.0.10-beta-22816",
15+
"System.ComponentModel": "4.0.0-beta-22816",
16+
"System.Console": "4.0.0-beta-22816",
17+
"System.Diagnostics.Debug": "4.0.10-beta-22816",
18+
"System.Linq": "4.0.0-beta-22816",
19+
"System.Reflection": "4.0.10-beta-22816",
20+
"System.Runtime": "4.0.20-beta-22816",
21+
"System.Runtime.Extensions": "4.0.10-beta-22816",
22+
"System.Runtime.InteropServices": "4.0.20-beta-22816",
23+
"System.Threading.Tasks": "4.0.10-beta-22816"
2424
}
2525
}
2626
},

0 commit comments

Comments
 (0)