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

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
pranavkm committed Sep 2, 2015
1 parent fc38b52 commit 1884cd0
Show file tree
Hide file tree
Showing 23 changed files with 20,968 additions and 129 deletions.
16 changes: 7 additions & 9 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ cd %~dp0

SETLOCAL
SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
SET BUILDCMD_KOREBUILD_VERSION=""
SET BUILDCMD_DNX_VERSION=""

IF EXIST %CACHED_NUGET% goto copynuget
echo Downloading latest version of NuGet.exe...
Expand All @@ -18,21 +16,21 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul

:restore
IF EXIST packages\KoreBuild goto run
IF %BUILDCMD_KOREBUILD_VERSION%=="" (
.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 -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
.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
IF %BUILDCMD_DNX_VERSION%=="" (
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 install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86
)
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86

:run
CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
20 changes: 10 additions & 10 deletions src/Microsoft.AspNet.Testing/project.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"version": "1.0.0-*",
"version": "1.0.0-beta7",
"repository": {
"type": "git",
"url": "git://github.com/aspnet/testing"
},
"dependencies": {
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
"Microsoft.Dnx.Runtime.Abstractions": "1.0.0-beta7",
"xunit.runner.aspnet": "2.0.0-aspnet-beta7"
},
"frameworks": {
"dnx451": {
Expand All @@ -18,13 +18,13 @@
},
"dnxcore50": {
"dependencies": {
"System.Runtime": "4.0.21-beta-*",
"System.Runtime.InteropServices": "4.0.21-beta-*",
"System.Globalization": "4.0.11-beta-*",
"System.Threading.Tasks": "4.0.11-beta-*",
"System.Reflection": "4.0.11-beta-*",
"System.Threading.Thread": "4.0.0-beta-*"
"System.Runtime": "4.0.21-beta-23225",
"System.Runtime.InteropServices": "4.0.21-beta-23225",
"System.Globalization": "4.0.11-beta-23225",
"System.Threading.Tasks": "4.0.11-beta-23225",
"System.Reflection": "4.1.0-beta-23225",
"System.Threading.Thread": "4.0.0-beta-23225"
}
}
}
}
}
Loading

0 comments on commit 1884cd0

Please sign in to comment.