huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

React to aspnet/Universe#290 fix 

- pick up latest `build.cmd` and `build.sh` files
- oops, this shouldn't be using a volatile feed
This commit is contained in:
Doug Bunting 2015-10-11 00:50:01 -07:00
parent df66c60e24
commit 3d61bbf357
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NuGet.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources> <packageSources>
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetvolatiledev/api/v3/index.json" /> <add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" /> <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources> </packageSources>
</configuration> </configuration>

25
build.cmd
View File

@ -18,22 +18,23 @@ md .nuget
copy %CACHED_NUGET% .nuget\nuget.exe > nul copy %CACHED_NUGET% .nuget\nuget.exe > nul
:restore :restore
IF EXIST packages\KoreBuild goto run IF EXIST packages\Sake goto getdnx
IF %BUILDCMD_KOREBUILD_VERSION%=="" ( IF %BUILDCMD_KOREBUILD_VERSION%=="" (
.nuget\nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre .nuget\nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
) ELSE ( ) ELSE (
.nuget\nuget.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre .nuget\nuget.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
) )
.nuget\nuget.exe install Sake -ExcludeVersion -Out packages .nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
IF "%SKIP_DNX_INSTALL%"=="1" goto run :getdnx
IF %BUILDCMD_DNX_VERSION%=="" ( IF "%SKIP_DNX_INSTALL%"=="" (
CALL packages\KoreBuild\build\dnvm upgrade -runtime CLR -arch x86 IF "%BUILDCMD_DNX_VERSION%"=="" (
BUILDCMD_DNX_VERSION=latest
)
CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CoreCLR -arch x86 -alias default
CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x86 -alias default
) ELSE ( ) ELSE (
CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CLR -arch x86 -a default CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
) )
CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x86
:run packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*

12
build.sh
View File

@ -24,18 +24,20 @@ if test ! -e .nuget; then
cp $cachePath .nuget/nuget.exe cp $cachePath .nuget/nuget.exe
fi fi
if test ! -d packages/KoreBuild; then if test ! -d packages/Sake; then
mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
mono .nuget/nuget.exe install Sake -ExcludeVersion -Out packages mono .nuget/nuget.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
fi fi
if ! type dnvm > /dev/null 2>&1; then if ! type dnvm > /dev/null 2>&1; then
source packages/KoreBuild/build/dnvm.sh source packages/KoreBuild/build/dnvm.sh
fi fi
if ! type dnx > /dev/null 2>&1; then if ! type dnx > /dev/null 2>&1 || [ -z "$SKIP_DNX_INSTALL" ]; then
dnvm upgrade dnvm install latest -runtime coreclr -alias default
dnvm install default -runtime mono -alias default
else
dnvm use default -runtime mono
fi fi
mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@" mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"