Skip to content

Commit

Permalink
Updating json files to pin versions and build.cmd to pin KoreBuild an…
Browse files Browse the repository at this point in the history
…d DNX
  • Loading branch information
Suhas Joshi committed May 12, 2015
1 parent 9f71410 commit cab0eb4
Show file tree
Hide file tree
Showing 28 changed files with 36,337 additions and 62 deletions.
1 change: 1 addition & 0 deletions NuGet.Config
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="NuGet" value="https://nuget.org/api/v2/" />
<add key="AspNetMaster" value="https://www.myget.org/F/aspnetmaster/api/v2" />
</packageSources>
Expand Down
12 changes: 10 additions & 2 deletions build.cmd
Expand Up @@ -16,11 +16,19 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul

:restore
IF EXIST packages\KoreBuild goto run
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
IF DEFINED BUILDCMD_RELEASE (
.nuget\NuGet.exe install KoreBuild -version 0.2.1-%BUILDCMD_RELEASE% -ExcludeVersion -o packages -nocache -pre
) ELSE (
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
)
.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion

IF "%SKIP_DNX_INSTALL%"=="1" goto run
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
IF DEFINED BUILDCMD_RELEASE (
CALL packages\KoreBuild\build\dnvm install 1.0.0-%BUILDCMD_RELEASE% -runtime CLR -arch x86 -a default
) ELSE (
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
)
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86

:run
Expand Down
10 changes: 5 additions & 5 deletions src/Microsoft.Framework.CodeGeneration.Common/project.json
@@ -1,14 +1,14 @@
{
"version": "1.0.0-*",
"version": "1.0.0-beta4",
"shared": "*.cs",
"frameworks": {
"dnx451": { },
"dnxcore50": {
"dependencies": {
"System.Linq": "4.0.0-beta-*",
"System.Reflection": "4.0.10-beta-*",
"System.Runtime": "4.0.20-beta-*",
"System.Diagnostics.Contracts": "4.0.0-beta-*"
"System.Linq": "4.0.0-beta-22816",
"System.Reflection": "4.0.10-beta-22816",
"System.Runtime": "4.0.20-beta-22816",
"System.Diagnostics.Contracts": "4.0.0-beta-22816"
}
}
}
Expand Down

0 comments on commit cab0eb4

Please sign in to comment.