From 12a730818b91c8552061692134383c49c1ee9d01 Mon Sep 17 00:00:00 2001
From: ankit <ankit@e3ebcda4-bce8-0310-ba0a-eca2169e7518>
Date: Thu, 8 Oct 2009 02:03:41 +0000
Subject: [PATCH] In b/tools/xbuild: 	* xbuild/Microsoft.Common.targets:
 Don't get list of files 	to deploy, for 'Private' project references. 
 Fix target named for *CopyDeploy*.

In tools/xbuild/tests:

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

git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@143740 e3ebcda4-bce8-0310-ba0a-eca2169e7518
---
 tools/xbuild/ChangeLog                             |  6 ++++++
 tools/xbuild/tests/ChangeLog                       |  7 +++++++
 .../tests/standalone/Project01/Lib2/Class1.cs      |  2 ++
 .../tests/standalone/Project01/Lib2/Lib2.csproj    | 11 +++++++++--
 .../tests/standalone/Project01/Project01.sln       |  6 ++++++
 .../standalone/Project01/Project01/Main.csproj     |  8 +++++++-
 .../standalone/Project01/Project01/Program.cs      |  1 +
 .../tests/standalone/Project01/final-outputs.txt   | 22 ++++++++++++++++++++++
 tools/xbuild/xbuild/Microsoft.Common.targets       | 14 ++++++++------
 9 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/tools/xbuild/ChangeLog b/tools/xbuild/ChangeLog
index 30ab5120df..903ab24e0d 100644
--- a/tools/xbuild/ChangeLog
+++ b/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/tools/xbuild/tests/ChangeLog b/tools/xbuild/tests/ChangeLog
index 3833537c43..40d6f28af1 100644
--- a/tools/xbuild/tests/ChangeLog
+++ b/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/tools/xbuild/tests/standalone/Project01/Lib2/Class1.cs b/tools/xbuild/tests/standalone/Project01/Lib2/Class1.cs
index 470bbb7bb4..c8f285f2ca 100644
--- a/tools/xbuild/tests/standalone/Project01/Lib2/Class1.cs
+++ b/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/tools/xbuild/tests/standalone/Project01/Lib2/Lib2.csproj b/tools/xbuild/tests/standalone/Project01/Lib2/Lib2.csproj
index afd51c9be8..5a0cd769ca 100644
--- a/tools/xbuild/tests/standalone/Project01/Lib2/Lib2.csproj
+++ b/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/tools/xbuild/tests/standalone/Project01/Project01.sln b/tools/xbuild/tests/standalone/Project01/Project01.sln
index c7672882c4..63e3164982 100644
--- a/tools/xbuild/tests/standalone/Project01/Project01.sln
+++ b/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/tools/xbuild/tests/standalone/Project01/Project01/Main.csproj b/tools/xbuild/tests/standalone/Project01/Project01/Main.csproj
index d3126c5070..73cd15b5e2 100644
--- a/tools/xbuild/tests/standalone/Project01/Project01/Main.csproj
+++ b/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/tools/xbuild/tests/standalone/Project01/Project01/Program.cs b/tools/xbuild/tests/standalone/Project01/Project01/Program.cs
index 1a8aa9a722..d9b6afe62c 100644
--- a/tools/xbuild/tests/standalone/Project01/Project01/Program.cs
+++ b/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/tools/xbuild/tests/standalone/Project01/final-outputs.txt b/tools/xbuild/tests/standalone/Project01/final-outputs.txt
index d1cded4574..d2045e0b72 100644
--- a/tools/xbuild/tests/standalone/Project01/final-outputs.txt
+++ b/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/tools/xbuild/xbuild/Microsoft.Common.targets b/tools/xbuild/xbuild/Microsoft.Common.targets
index 8b8abecd9a..972dd75a97 100644
--- a/tools/xbuild/xbuild/Microsoft.Common.targets
+++ b/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>
-- 
2.11.4.GIT