* xbuild/Microsoft.Common.targets (DeployOutputFiles): Copy only

if the source file exists.

svn path=/trunk/mcs/; revision=155186

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index a46e0dbcdcfbea9e4209d972829b54c88c4394c9..12a0a45955217e08a1eacb4135823c5a70f0798c 100644 (file)
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-10  Ankit Jain  <jankit@novell.com>
+
+       * xbuild/Microsoft.Common.targets (DeployOutputFiles): Copy only
+       if the source file exists.
+
 2010-04-10  Ankit Jain  <jankit@novell.com>
 
        * xbuild/3.5/Microsoft.Common.tasks:

diff --git a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
index 3fb08e25e44e333d4f95020aeadc6c658ee8c0c3..adff33b0c2f300a924b7a0b37893913632c993ee 100644 (file)
--- a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
@@ -464,7 +464,7 @@
                        <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
                </Copy>
 
-               <Copy SourceFiles="@(IntermediateAssembly)" Condition="'$(OutDir)' != ''" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true">
+               <Copy SourceFiles="@(IntermediateAssembly)" Condition="'$(OutDir)' != '' and Exists ('@(IntermediateAssembly)')" DestinationFolder="$(OutDir)" SkipUnchangedFiles="true">
                        <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
                </Copy>