From 319c39e7fc12d01dc55796d271a55d8d25318bf0 Mon Sep 17 00:00:00 2001
From: rmboggs <rmboggs@gmail.com>
Date: Sun, 25 Sep 2011 21:55:42 +0000
Subject: [PATCH] Set the NAnt.MSBuild.build file to copy the resulting dll
 file to both the 2.0 and 4.0 extensions folder. Also set the NAnt.Core.build
 to ignore 0419 warnings on the mono platform only.

---
 src/CommonAssemblyInfo.cs           | 4 ++--
 src/NAnt.Core/NAnt.Core.build       | 2 +-
 src/NAnt.MSBuild/NAnt.MSBuild.build | 9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
index 084ff9f74..68d67c9e5 100644
--- a/src/CommonAssemblyInfo.cs
+++ b/src/CommonAssemblyInfo.cs
@@ -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.
@@ -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")]
 
diff --git a/src/NAnt.Core/NAnt.Core.build b/src/NAnt.Core/NAnt.Core.build
index 756befcea..f6153c4ca 100644
--- a/src/NAnt.Core/NAnt.Core.build
+++ b/src/NAnt.Core/NAnt.Core.build
@@ -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 -->
diff --git a/src/NAnt.MSBuild/NAnt.MSBuild.build b/src/NAnt.MSBuild/NAnt.MSBuild.build
index bde498238..c2c4b7cc3 100644
--- a/src/NAnt.MSBuild/NAnt.MSBuild.build
+++ b/src/NAnt.MSBuild/NAnt.MSBuild.build
@@ -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}" />