Skip to content
This repository has been archived by the owner on Nov 20, 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
Suhas Joshi committed May 12, 2015
1 parent 4415a36 commit 81bbfd0
Show file tree
Hide file tree
Showing 38 changed files with 33,188 additions and 151 deletions.
1 change: 1 addition & 0 deletions NuGet.Config
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
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
18 changes: 9 additions & 9 deletions src/Microsoft.AspNet.FeatureModel/project.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"version": "1.0.0-*",
"version": "1.0.0-beta4",
"description": "ASP.NET 5 HTTP feature infrastructure.",
"dependencies": {
"Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-*" }
"Microsoft.Framework.NotNullAttribute.Internal": { "type": "build", "version": "1.0.0-beta4" }
},
"frameworks": {
"dnx451": {},
"dnxcore50": {
"dependencies": {
"System.Collections": "4.0.10-beta-*",
"System.Linq": "4.0.0-beta-*",
"System.Reflection": "4.0.10-beta-*",
"System.Reflection.TypeExtensions": "4.0.0-beta-*",
"System.Runtime": "4.0.20-beta-*",
"System.Runtime.InteropServices": "4.0.20-beta-*",
"System.Threading": "4.0.10-beta-*"
"System.Collections": "4.0.10-beta-22816",
"System.Linq": "4.0.0-beta-22816",
"System.Reflection": "4.0.10-beta-22816",
"System.Reflection.TypeExtensions": "4.0.0-beta-22816",
"System.Runtime": "4.0.20-beta-22816",
"System.Runtime.InteropServices": "4.0.20-beta-22816",
"System.Threading": "4.0.10-beta-22816"
}
}
}
Expand Down
Loading

0 comments on commit 81bbfd0

Please sign in to comment.