Use nuget -restore functionality

- Download nuget.exe from its official home
- Remove beta nuget.exe from monad-ext
- Specify dependencies in packages.config and use nuget.exe -restore
- Add prepare dependency to package libraries
- No more manual prepare step
- Update .gitignore
This commit is contained in:
Andrew Schwartzmeyer
2015-10-06 21:55:21 -07:00
parent 0c6a7616fc
commit bbdc3de691
4 changed files with 18 additions and 13 deletions
+2 -3
View File
@@ -1,12 +1,11 @@
.idea
.config/
.nuget\\packages\\/
.local/
CMakeCache.txt
CMakeFiles/
Makefile
!scripts/Makefile
cmake_install.cmake
externals
scripts/xunittests.xml
/scripts/powershell.inc
scripts/powershell.inc
.bash_history
+9 -9
View File
@@ -76,11 +76,11 @@ dotnetlibs/$(ASSEMBLY_LOAD_CONTEXT_TARGET): $(ASSEMBLY_LOAD_CONTEXT_SRCS)
$(CSC) -out:$@ $(CSCOPTS_LIB_PS) $(PRODUCT_BASE_REFS) $(ASSEMBLY_LOAD_CONTEXT_SRCS)
# this will copy whatever the first version of the dll in the globber is
buildtemp/System.Reflection.Metadata.dll: buildtemp/System.Reflection.Metadata.*/lib/portable-net45+win8/System.Reflection.Metadata.dll
buildtemp/System.Reflection.Metadata.dll: buildtemp/System.Reflection.Metadata.*/lib/*/System.Reflection.Metadata.dll prepare
cp -f $< $@
# this will copy whatever the first version of the dll in the globber is
buildtemp/System.Collections.Immutable.dll: buildtemp/System.Collections.Immutable.*/lib/portable-net45+win8+wp8+wpa81/System.Collections.Immutable.dll
buildtemp/System.Collections.Immutable.dll: buildtemp/System.Collections.Immutable.*/lib/*/System.Collections.Immutable.dll prepare
cp -f $< $@
# this one is built from stubs
@@ -136,14 +136,14 @@ dotnetlibs/api-ms-win-core-registry-l1-1-0.dll: ../src/win-dll/lib-api-ms-win-co
# this is the manual step that will install some stuff using nuget and do other things that can't be dependency
# tracked that easily
NUGET_INSTALL=cd buildtemp && mono nuget.exe install -Source 'https://api.nuget.org/v3/index.json' -Version
nuget.exe:
wget 'https://nuget.org/nuget.exe'
prepare: cleanall
mkdir -p buildtemp dotnetlibs
cp $(MONAD_EXT)/nuget/nuget.exe buildtemp/nuget.exe
$(NUGET_INSTALL) 1.0.21 System.Reflection.Metadata
$(NUGET_INSTALL) 1.1.36 System.Collections.Immutable
$(NUGET_INSTALL) 1.0.0 Microsoft.Net.Compilers
NUGET_INSTALL=cd buildtemp && mono nuget.exe install
prepare: nuget.exe
mkdir -p buildtemp
mono nuget.exe restore -PackagesDirectory buildtemp
# this is the execution environment from which all managed code is run
APP_BASE=exec_env/app_base
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.Reflection.Metadata" version="1.0.21" />
<package id="System.Collections.Immutable" version="1.1.36" />
<package id="Microsoft.Net.Compilers" version="1.0.0" />
</packages>