2010-06-07 Jonathan Chambers <joncham@gmail.com>

	* Copy *.dll.sources to *.dll.msbuild.sources during build to change '/' to '\' for Windows.

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

diff --git a/mcs/build/msbuild/Mono.Common.targets b/mcs/build/msbuild/Mono.Common.targets
index 2a5c53bccb00d5cb8d372c55f094d531a51efcb5..761132b52a0c4c8adc06b13c98a791c194e34438 100644 (file)
--- a/mcs/build/msbuild/Mono.Common.targets
+++ b/mcs/build/msbuild/Mono.Common.targets
@@ -12,7 +12,11 @@
     <OutputPath>$(MSBuildProjectDirectory)\..\lib\net_2_0_bootstrap\</OutputPath>\r
   </PropertyGroup>\r
   <Target Name="SetupProject">\r
-         <MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="/" Replacement="\" Files="$(MSBuildProjectName).dll.sources"/>\r
+    <Copy SourceFiles="$(MSBuildProjectName).dll.sources" DestinationFiles="$(MSBuildProjectName).dll.msbuild.sources"/>\r
+         <MSBuild.ExtensionPack.FileSystem.File TaskAction="Replace" RegexPattern="/" Replacement="\" Files="$(MSBuildProjectName).dll.msbuild.sources"/>\r
          <MakeDir Directories="$(OutputDirectory)"/>\r
   </Target>\r
+  <ItemGroup>\r
+    <ResponseFile Include="$(MSBuildProjectName).dll.msbuild.sources"/>\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
index f2c0d225a07f4a06545270802d7761a483e77e56..f6d5eac033da287b8ee201c5f124267fa2984922 100644 (file)
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
-  <ItemGroup>
-    <ResponseFile Include="$(MSBuildProjectName).dll.sources"/>
-  </ItemGroup>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>

diff --git a/mcs/class/Mono.Security/Mono.Security.csproj b/mcs/class/Mono.Security/Mono.Security.csproj
index e936d571d7c5ef76787da3f11ba783f8017b0084..df70ba87465ddd564f3de20e097b28e534e7b347 100644 (file)
--- a/mcs/class/Mono.Security/Mono.Security.csproj
+++ b/mcs/class/Mono.Security/Mono.Security.csproj
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
-  <ItemGroup>
-    <ResponseFile Include="$(MSBuildProjectName).dll.sources"/>
-  </ItemGroup>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>

diff --git a/mcs/class/System.Core/System.Core.csproj b/mcs/class/System.Core/System.Core.csproj
index 1c1bf66808d3ed2a7862a0816677e23c770e550c..b061351775e5c34133dca50b41f052cfa8b88dea 100644 (file)
--- a/mcs/class/System.Core/System.Core.csproj
+++ b/mcs/class/System.Core/System.Core.csproj
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
-  <ItemGroup>
-    <ResponseFile Include="$(MSBuildProjectName).dll.sources"/>
-  </ItemGroup>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>

diff --git a/mcs/class/System.XML/System.Xml.csproj b/mcs/class/System.XML/System.Xml.csproj
index 3081bd4cc35cff5b704423a8ae3d9ee1e5d25493..18af33685602669bc34e1d0d9e9ceee9635629f9 100644 (file)
--- a/mcs/class/System.XML/System.Xml.csproj
+++ b/mcs/class/System.XML/System.Xml.csproj
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
-  <ItemGroup>
-    <ResponseFile Include="$(MSBuildProjectName).dll.sources"/>
-  </ItemGroup>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>

diff --git a/mcs/class/System/System.csproj b/mcs/class/System/System.csproj
index 2c4dd8255c1bf6d65e3a089e4523a697474a3815..62bb2ddbf444c66d5e66b9391f8f26b136f6e37a 100644 (file)
--- a/mcs/class/System/System.csproj
+++ b/mcs/class/System/System.csproj
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
-  <ItemGroup>
-    <ResponseFile Include="$(MSBuildProjectName).dll.sources"/>
-  </ItemGroup>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>

diff --git a/mcs/class/corlib/corlib.csproj b/mcs/class/corlib/corlib.csproj
index d55c4ecca32c10ad2ee0cacc23d473a9eeefcd14..7ba01d82f5f9c12d2425e7cab6f035ad72409d65 100644 (file)
--- a/mcs/class/corlib/corlib.csproj
+++ b/mcs/class/corlib/corlib.csproj
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildProjectDirectory)\..\..\build\msbuild\Mono.Common.targets"/>
-  <ItemGroup>
-    <ResponseFile Include="corlib.dll.sources"/>
-  </ItemGroup>
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>mscorlib</AssemblyName>