Skip to content

Commit 7b4c6e9

Browse files
committed
NH-3943 - Use NuGet packages instead of local copies of dependencies
1 parent b08e2b9 commit 7b4c6e9

33 files changed

+97
-45026
lines changed

Tools/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nuget.exe

Tools/NuGet.exe

-1.53 MB
Binary file not shown.

build-common/common-project.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,22 @@
4444

4545
<include buildfile="common.xml" />
4646

47-
<target name="common.compile-all" depends="common.generate-assemblyinfo">
47+
<target name="common.download-nuget" depends="common.init">
48+
<get
49+
src="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
50+
dest="${tools.dir}/nuget.exe"
51+
usetimestamp="true"
52+
/>
53+
</target>
54+
55+
<target name="common.nuget-restore" depends="common.init common.download-nuget">
56+
<exec basedir="${tools.dir}" workingdir="${root.dir}/src" program="NuGet.exe">
57+
<arg value="restore" />
58+
<arg value="NHibernate.sln" />
59+
</exec>
60+
</target>
61+
62+
<target name="common.compile-all" depends="common.generate-assemblyinfo common.nuget-restore">
4863
<!--property name="msbuild.cmd" value="${cmd.sln} ${cmd.out} ${cmd.platform} ${cmd.debug} ${cmd.optimize} ${cmd.doc} /t:Rebuild /v:q /m" /-->
4964
<readregistry property="MSBuildToolsPath" key="SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0\MSBuildToolsPath" hive="LocalMachine" />
5065

default.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
<echo message="Created a '${project.config}' package in ${build.dir}" />
229229
</target>
230230

231-
<target name="visual-studio" depends="init common.init common.generate-assemblyinfo" description="Generates SharedAssemblyInfo.cs files to work with Visual Studio">
231+
<target name="visual-studio" depends="init common.init common.nuget-restore common.generate-assemblyinfo" description="Generates SharedAssemblyInfo.cs files to work with Visual Studio">
232232
</target>
233233

234234
<target name="cleanall" description="Deletes every build configuration">
@@ -271,7 +271,7 @@
271271
</move>
272272
</target>
273273

274-
<target name="nugetpushbat" depends="init binaries nuget.set-properties nuspec nuget"
274+
<target name="nugetpushbat" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
275275
description="Creates files for the release on nuget gallery.">
276276

277277
<copy file="${tools.dir}/NuGet.exe" todir="${nuget.nupackages.dir}"/>
@@ -289,7 +289,7 @@
289289
</foreach>
290290
</target>
291291

292-
<target name="nugetpush" depends="init binaries nuget.set-properties nuspec nuget"
292+
<target name="nugetpush" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
293293
description="Push packages on nuget gallery.">
294294
<!-- In order to use this task you have to be sure you have executed 'nuget SetApiKey' -->
295295
<foreach item="File" property="filename">

lib/mono/1.0/log4net.dll

-236 KB
Binary file not shown.

lib/mono/1.0/nunit.framework.dll

-44 KB
Binary file not shown.

lib/net/3.5/.gitignore

Whitespace-only changes.

lib/net/4.0/Iesi.Collections.dll

-13.5 KB
Binary file not shown.

lib/net/4.0/Iesi.Collections.license.txt

Lines changed: 0 additions & 460 deletions
This file was deleted.

lib/net/4.0/Iesi.Collections.pdb

-37.5 KB
Binary file not shown.

lib/net/4.0/Iesi.Collections.xml

Lines changed: 0 additions & 541 deletions
This file was deleted.

lib/net/Antlr3.Runtime.dll

-101 KB
Binary file not shown.

lib/net/Remotion.Linq.dll

-203 KB
Binary file not shown.

lib/net/Remotion.Linq.xml

Lines changed: 0 additions & 4236 deletions
This file was deleted.

lib/net/System.Linq.Dynamic.dll

-44.5 KB
Binary file not shown.

lib/net/log4net.dll

-264 KB
Binary file not shown.

lib/net/log4net.license.txt

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)