Update xbuild and Microsoft.Build.* from trunk.

In tools/xbuild:
	* xbuild/Microsoft.Common.targets: Don't get list of files
	to deploy, for 'Private' project references.
	Fix target named for *CopyDeploy*.

2009-10-08  Ankit Jain  <jankit@novell.com>

In tools/xbuild/tests:
2009-10-08  Ankit Jain  <jankit@novell.com>

	* standalone/Project1: Add a new Lib5 project, and add
	private references to various projects.
	Update final-outputs.txt .
	* standalone/Project01/Lib5/*: New.

In class/Microsoft.Build.Tasks/Microsoft.Build.Tasks:
	* ResolveAssemblyReference.cs: Don't resolve any dependencies for
	assemblies resolved from {PkgConfig}. Honor parent's CopyLocal for
	dependencies.

2009-10-08  Ankit Jain  <jankit@novell.com>


svn path=/branches/mono-2-6/mcs/; revision=143741

24 files changed, 632 insertions, 9 deletions

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index 30ab5120df7..903ab24e0d2 100644
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,5 +1,11 @@
 2009-10-08  Ankit Jain  <jankit@novell.com>
 
+	* xbuild/Microsoft.Common.targets: Don't get list of files
+	to deploy, for 'Private' project references.
+	Fix target named for *CopyDeploy*.
+
+2009-10-08  Ankit Jain  <jankit@novell.com>
+
 	* xbuild/Microsoft.Common.tasks: Add RemoveDuplicates task.
 
 2009-10-03  Ankit Jain  <jankit@novell.com>
diff --git a/mcs/tools/xbuild/tests/ChangeLog b/mcs/tools/xbuild/tests/ChangeLog
index 3833537c431..40d6f28af18 100644
--- a/mcs/tools/xbuild/tests/ChangeLog
+++ b/mcs/tools/xbuild/tests/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-08  Ankit Jain  <jankit@novell.com>
+
+	* standalone/Project1: Add a new Lib5 project, and add
+	private references to various projects.
+	Update final-outputs.txt .
+	* standalone/Project01/Lib5/*: New.
+
 2009-09-25  Ankit Jain  <jankit@novell.com>
 
 	* standalone/Project01: Add app.config to project Lib1.
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib2/Class1.cs b/mcs/tools/xbuild/tests/standalone/Project01/Lib2/Class1.cs
index 470bbb7bb42..c8f285f2ca9 100644
--- a/mcs/tools/xbuild/tests/standalone/Project01/Lib2/Class1.cs
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib2/Class1.cs
@@ -8,10 +8,12 @@ namespace Lib2
 	{
 		string name;
 		Lib4.Class1 c1;
+		Lib5.Book b;
 
 		public Book ()
 		{
 			name = GetDefaultName ();
+			b = new Lib5.Book ();
 		}
 
 		public string Name {
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib2/Lib2.csproj b/mcs/tools/xbuild/tests/standalone/Project01/Lib2/Lib2.csproj
index afd51c9be8d..5a0cd769caa 100644
--- a/mcs/tools/xbuild/tests/standalone/Project01/Lib2/Lib2.csproj
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib2/Lib2.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -69,6 +69,13 @@
       <Project>{23F291D9-78DF-4133-8CF2-78CE104DDE63}</Project>
       <Name>Lib4</Name>
     </ProjectReference>
+    
+    <ProjectReference Include="..\Lib5\Lib5.csproj">
+      <Project>{23F291D9-78DF-4133-8CF2-78CE104DABCD}</Project>
+      <Name>Lib4</Name>
+      <Private>False</Private>
+    </ProjectReference>
+
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
@@ -78,4 +85,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Book.en-US.resx b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Book.en-US.resx
new file mode 100644
index 00000000000..16c74b26727
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Book.en-US.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="defaultName" xml:space="preserve">
+    <value>Default Book [en-US]</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Book.fr-CA.resx b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Book.fr-CA.resx
new file mode 100644
index 00000000000..af8f6ca8a01
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Book.fr-CA.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="defaultName">
+		<value>Default Book [fr-CA]</value>
+	</data>
+</root>
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Book.resx b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Book.resx
new file mode 100644
index 00000000000..86744d364ce
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Book.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="defaultName">
+		<value>Default Book</value>
+	</data>
+</root>
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Choco.foo.resx b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Choco.foo.resx
new file mode 100644
index 00000000000..e4c81620c95
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Choco.foo.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="defaultName">
+		<value>Foo</value>
+	</data>
+</root>
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Class1.cs b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Class1.cs
new file mode 100644
index 00000000000..d0f5cddb18a
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Class1.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Resources;
+using System.Reflection;
+
+namespace Lib5
+{
+	public class Book
+	{
+		string name;
+
+		public Book ()
+		{
+			name = GetDefaultName ();
+		}
+
+		public string Name {
+			get { return name; }
+			set { name = value; }
+		}
+
+		static string GetDefaultName ()
+		{
+			return new ResourceManager (
+				"Lib5.Book", Assembly.GetExecutingAssembly ())
+				.GetString ("defaultName");
+		}
+	}
+
+	public class Publisher
+	{
+		string name;
+
+		public Publisher ()
+		{
+			name = GetDefaultName ();
+		}
+
+		public string Name
+		{
+			get { return name; }
+			set { name = value; }
+		}
+
+		static string GetDefaultName ()
+		{
+			return new ResourceManager (
+				"Lib5.Publisher", Assembly.GetExecutingAssembly ())
+				.GetString ("defaultName");
+		}
+	}
+
+
+}
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/InvalidCulture.foo.txt b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/InvalidCulture.foo.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/InvalidCulture.foo.txt
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Lib5.csproj b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Lib5.csproj
new file mode 100644
index 00000000000..d439c8acfdc
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Lib5.csproj
@@ -0,0 +1,83 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{041F1C17-D792-499B-973E-512E45122B4A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Lib5</RootNamespace>
+    <AssemblyName>Lib5</AssemblyName>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Class1.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <None Include="app.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Book.en-US.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Book.fr-CA.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Book.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Choco.foo.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Publisher.fr-CA.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Publisher.fr-FR.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Publisher.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="InvalidCulture.foo.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Lib5.foo.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Lib5.deploy.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Lib5.deploy.txt b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Lib5.deploy.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Lib5.deploy.txt
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Lib5.foo.txt b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Lib5.foo.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Lib5.foo.txt
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Properties/AssemblyInfo.cs b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..7a190fd3465
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle ("Lib1")]
+[assembly: AssemblyDescription ("")]
+[assembly: AssemblyConfiguration ("")]
+[assembly: AssemblyCompany ("")]
+[assembly: AssemblyProduct ("Lib1")]
+[assembly: AssemblyCopyright ("Copyright ©  2009")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyCulture ("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible (false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid ("ebe43a7f-a1c3-48fc-a710-aaa73ab9cce0")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+[assembly: AssemblyVersion ("1.0.0.0")]
+[assembly: AssemblyFileVersion ("1.0.0.0")]
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Publisher.fr-CA.resx b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Publisher.fr-CA.resx
new file mode 100644
index 00000000000..0c43782cff0
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Publisher.fr-CA.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="defaultName">
+		<value>Default Publisher [fr-CA]</value>
+	</data>
+</root>
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Publisher.fr-FR.resx b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Publisher.fr-FR.resx
new file mode 100644
index 00000000000..f9ba22bfd50
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Publisher.fr-FR.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="defaultName">
+		<value>Default Publisher [fr-FR]</value>
+	</data>
+</root>
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Publisher.resx b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Publisher.resx
new file mode 100644
index 00000000000..adadb3dc4dc
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/Publisher.resx
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" />
+							<xsd:attribute name="type" type="xsd:string" />
+							<xsd:attribute name="mimetype" type="xsd:string" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="ResMimeType">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="Version">
+		<value>1.0.0.0</value>
+	</resheader>
+	<resheader name="Reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="Writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<data name="defaultName">
+		<value>Default Publisher</value>
+	</data>
+</root>
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/app.config b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/app.config
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/app.config
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Lib5/templates/foo.template b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/templates/foo.template
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Lib5/templates/foo.template
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Project01.sln b/mcs/tools/xbuild/tests/standalone/Project01/Project01.sln
index c7672882c4c..63e31649820 100644
--- a/mcs/tools/xbuild/tests/standalone/Project01/Project01.sln
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Project01.sln
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib3", "Lib3\Lib3.csproj",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib4", "Lib4\Lib4.csproj", "{23F291D9-78DF-4133-8CF2-78CE104DDE63}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lib5", "Lib5\Lib5.csproj", "{23F291D9-78DF-4133-8CF2-78CE104DABCD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -25,6 +27,10 @@ Global
 		{23F291D9-78DF-4133-8CF2-78CE104DDE63}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23F291D9-78DF-4133-8CF2-78CE104DDE63}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23F291D9-78DF-4133-8CF2-78CE104DDE63}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23F291D9-78DF-4133-8CF2-78CE104DABCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23F291D9-78DF-4133-8CF2-78CE104DABCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23F291D9-78DF-4133-8CF2-78CE104DABCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23F291D9-78DF-4133-8CF2-78CE104DABCD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3653C4D3-60C0-4657-8289-3922D0DFB933}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3653C4D3-60C0-4657-8289-3922D0DFB933}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3653C4D3-60C0-4657-8289-3922D0DFB933}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Project01/Main.csproj b/mcs/tools/xbuild/tests/standalone/Project01/Project01/Main.csproj
index d3126c5070d..73cd15b5e2f 100644
--- a/mcs/tools/xbuild/tests/standalone/Project01/Project01/Main.csproj
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Project01/Main.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -47,6 +47,12 @@
       <Project>{23F291D9-78DF-4133-8CF2-78CE104DDE63}</Project>
       <Name>Lib4</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Lib5\Lib5.csproj">
+      <Project>{23F291D9-78DF-4133-8CF2-78CE104DABCD}</Project>
+      <Name>Lib5</Name>
+      <Private>False</Private>
+    </ProjectReference>
+
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/Project01/Program.cs b/mcs/tools/xbuild/tests/standalone/Project01/Project01/Program.cs
index 1a8aa9a7224..d9b6afe62ce 100644
--- a/mcs/tools/xbuild/tests/standalone/Project01/Project01/Program.cs
+++ b/mcs/tools/xbuild/tests/standalone/Project01/Project01/Program.cs
@@ -7,6 +7,7 @@ namespace Project01
 {
 	class Program
 	{
+		static Lib5.Book b;
 		static void Main (string [] args)
 		{
 			//FIXME: reqd?
diff --git a/mcs/tools/xbuild/tests/standalone/Project01/final-outputs.txt b/mcs/tools/xbuild/tests/standalone/Project01/final-outputs.txt
index d1cded45744..d2045e0b720 100644
--- a/mcs/tools/xbuild/tests/standalone/Project01/final-outputs.txt
+++ b/mcs/tools/xbuild/tests/standalone/Project01/final-outputs.txt
@@ -54,6 +54,28 @@
 ./Lib4/obj/Debug/Lib4.dll
 ./Lib4/obj/Debug/Lib4.dll.mdb
 ./Lib4/obj/Lib4.csproj.FilesWrittenAbsolute.txt
+./Lib5/bin/Debug/en-US/Lib5.resources.dll
+./Lib5/bin/Debug/fr-CA/Lib5.resources.dll
+./Lib5/bin/Debug/fr-FR/Lib5.resources.dll
+./Lib5/bin/Debug/Lib5.deploy.txt
+./Lib5/bin/Debug/Lib5.dll
+./Lib5/bin/Debug/Lib5.dll.config
+./Lib5/bin/Debug/Lib5.dll.mdb
+./Lib5/obj/Debug/en-US/Lib5.resources.dll
+./Lib5/obj/Debug/fr-CA/Lib5.resources.dll
+./Lib5/obj/Debug/fr-FR/Lib5.resources.dll
+./Lib5/obj/Debug/Lib5.Book.en-US.resources
+./Lib5/obj/Debug/Lib5.Book.fr-CA.resources
+./Lib5/obj/Debug/Lib5.Book.resources
+./Lib5/obj/Debug/Lib5.Choco.foo.resources
+./Lib5/obj/Debug/Lib5.dll
+./Lib5/obj/Debug/Lib5.dll.mdb
+./Lib5/obj/Debug/Lib5.InvalidCulture.foo.txt
+./Lib5/obj/Debug/Lib5.Lib5.foo.txt
+./Lib5/obj/Debug/Lib5.Publisher.fr-CA.resources
+./Lib5/obj/Debug/Lib5.Publisher.fr-FR.resources
+./Lib5/obj/Debug/Lib5.Publisher.resources
+./Lib5/obj/Lib5.csproj.FilesWrittenAbsolute.txt
 ./Project01/bin/Debug/abc.dll
 ./Project01/bin/Debug/bar.dll
 ./Project01/bin/Debug/en-US/Lib1.resources.dll
diff --git a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
index 8b8abecd9ad..972dd75a97c 100644
--- a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
@@ -402,10 +402,10 @@
 
 	<Target Name="_CopyDeployFilesToOutputDirectory"
 		DependsOnTargets="GetCopyToOutputDirectoryItems;
-			_CopyDeployFilesToOutputDirectoryToOutputDirectoryAlways;
-			CopyDeployFilesToOutputDirectoryPreserveNewest"/>
+			_CopyDeployFilesToOutputDirectoryAlways;
+			_CopyDeployFilesToOutputDirectoryPreserveNewest"/>
 
-	<Target Name="CopyDeployFilesToOutputDirectoryPreserveNewest"
+	<Target Name="_CopyDeployFilesToOutputDirectoryPreserveNewest"
 		Condition="'@(ItemsToCopyToOutputDirectoryPreserveNewest)' != ''"
 		Inputs="@(ItemsToCopyToOutputDirectoryPreserveNewest)"
 		Outputs="@(ItemsToCopyToOutputDirectoryPreserveNewest->'$(OutDir)%(TargetPath)')">
@@ -417,7 +417,7 @@
 	</Target>
 
 	<!-- Copy if newer -->
-	<Target Name="_CopyDeployFilesToOutputDirectoryToOutputDirectoryAlways"
+	<Target Name="_CopyDeployFilesToOutputDirectoryAlways"
 		Condition="'@(ItemsToCopyToOutputDirectoryAlways)' != ''">
 
 		<Copy SourceFiles="@(ItemsToCopyToOutputDirectoryAlways)"
@@ -443,11 +443,13 @@
 		Outputs="@(AllItemsFullPathWithTargetPath)"
 		DependsOnTargets="AssignTargetPaths">
 
-		<!-- FIXME: handle .vcproj -->
+		<!-- FIXME: handle .vcproj
+		     FIXME: Private ProjectReferences are honored only in 3.5
+		-->
 		<MSBuild
 			Projects="@(ProjectReference)"
 			Targets="GetCopyToOutputDirectoryItems"
-			Condition="'@(ProjectReference)' != ''">
+			Condition="'@(ProjectReference)' != '' and '%(ProjectReference.Private)' != 'false'">
 
 			<Output TaskParameter="TargetOutputs" ItemName="AllChildProjectItemsWithTargetPath"/>
 		</MSBuild>