Skip to content

Commit

Permalink
Set the NAnt.MSBuild.build file to copy the resulting dll file to bot…
Browse files Browse the repository at this point in the history
…h the 2.0 and 4.0 extensions folder. Also set the NAnt.Core.build to ignore 0419 warnings on the mono platform only.
  • Loading branch information
rmboggs committed Sep 25, 2011
1 parent 0184826 commit 319c39e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.225
// Runtime Version:4.0.30319.235
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
Expand All @@ -22,6 +22,6 @@
[assembly: AssemblyCopyrightAttribute("Copyright (C) 2001-2011 Gerry Shaw")]
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyCultureAttribute("")]
[assembly: AssemblyVersionAttribute("0.91.4205.0")]
[assembly: AssemblyVersionAttribute("0.91.4285.0")]
[assembly: AssemblyInformationalVersionAttribute("0.91")]

2 changes: 1 addition & 1 deletion src/NAnt.Core/NAnt.Core.build
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<csc target="library" define="${current.build.defines}" warnaserror="${build.warnaserror}" debug="${build.debug}" output="${build.dir}/bin/${project::get-name()}.dll" doc="${build.dir}/bin/${project::get-name()}.xml">
<nowarn>
<!-- do not report compiler warnings for ambiguous crefs -->
<warning number="0419" />
<warning number="0419" if="${string::contains(framework::get-runtime-framework(), 'mono')}" />
<!-- do not report warnings for missing XML comments -->
<warning number="1591" />
<!-- do not report deprecation warnings -->
Expand Down
9 changes: 8 additions & 1 deletion src/NAnt.MSBuild/NAnt.MSBuild.build
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@
<resources prefix="NAnt.MSBuild" dynamicprefix="true">
<include name="Resources/**/*" />
</resources>
</csc>
</csc>

<!-- copy NAnt.MSBuild.dll to extensions/common/4.0 -->
<copy todir="${build.dir}/bin/extensions/common/4.0/">
<fileset basedir="${build.dir}/bin/extensions/common/2.0">
<include name="${project::get-name()}.*" />
</fileset>
</copy>

<!-- restore original target framework -->
<property name="nant.settings.currentframework" value="${original.targetframework}" />
Expand Down

0 comments on commit 319c39e

Please sign in to comment.