Skip to content

NH-3943 - Use NuGet packages instead of local copies of dependencies #549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Tools/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nuget.exe
Binary file removed Tools/NuGet.exe
Binary file not shown.
17 changes: 16 additions & 1 deletion build-common/common-project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,22 @@

<include buildfile="common.xml" />

<target name="common.compile-all" depends="common.generate-assemblyinfo">
<target name="common.download-nuget" depends="common.init">
<get
src="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
dest="${tools.dir}/nuget.exe"
usetimestamp="true"
/>
</target>

<target name="common.nuget-restore" depends="common.init common.download-nuget">
<exec basedir="${tools.dir}" workingdir="${root.dir}/src" program="NuGet.exe">
<arg value="restore" />
<arg value="NHibernate.sln" />
</exec>
</target>

<target name="common.compile-all" depends="common.generate-assemblyinfo common.nuget-restore">
<!--property name="msbuild.cmd" value="${cmd.sln} ${cmd.out} ${cmd.platform} ${cmd.debug} ${cmd.optimize} ${cmd.doc} /t:Rebuild /v:q /m" /-->
<readregistry property="MSBuildToolsPath" key="SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0\MSBuildToolsPath" hive="LocalMachine" />

Expand Down
6 changes: 3 additions & 3 deletions default.build
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
<echo message="Created a '${project.config}' package in ${build.dir}" />
</target>

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

<target name="cleanall" description="Deletes every build configuration">
Expand Down Expand Up @@ -271,7 +271,7 @@
</move>
</target>

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

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

<target name="nugetpush" depends="init binaries nuget.set-properties nuspec nuget"
<target name="nugetpush" depends="init binaries common.download-nuget nuget.set-properties nuspec nuget"
description="Push packages on nuget gallery.">
<!-- In order to use this task you have to be sure you have executed 'nuget SetApiKey' -->
<foreach item="File" property="filename">
Expand Down
Binary file removed lib/mono/1.0/log4net.dll
Binary file not shown.
Binary file removed lib/mono/1.0/nunit.framework.dll
Binary file not shown.
Empty file removed lib/net/3.5/.gitignore
Empty file.
Binary file removed lib/net/4.0/Iesi.Collections.dll
Binary file not shown.
460 changes: 0 additions & 460 deletions lib/net/4.0/Iesi.Collections.license.txt

This file was deleted.

Binary file removed lib/net/4.0/Iesi.Collections.pdb
Binary file not shown.
541 changes: 0 additions & 541 deletions lib/net/4.0/Iesi.Collections.xml

This file was deleted.

Binary file removed lib/net/Antlr3.Runtime.dll
Binary file not shown.
Binary file removed lib/net/Remotion.Linq.dll
Binary file not shown.
4,236 changes: 0 additions & 4,236 deletions lib/net/Remotion.Linq.xml

This file was deleted.

Binary file removed lib/net/System.Linq.Dynamic.dll
Binary file not shown.
Binary file removed lib/net/log4net.dll
Binary file not shown.
201 changes: 0 additions & 201 deletions lib/net/log4net.license.txt

This file was deleted.

Loading