Update xbuild and Microsoft.Build.* from trunk.

In tools/xbuild:
2010-02-06  Ankit Jain  <jankit@novell.com>

	* xbuild/Microsoft.Common.targets: Add targets for compiling
	licx (license) files.
	* xbuild/Microsoft.Common.tasks: Add LC task.

2010-02-04  Ankit Jain  <jankit@novell.com>

	* xbuild/Microsoft.Common.targets (_RecordCleanFile): Append list of
	current build files to list of previous build files.
	(_GetCleanFileWrites): Rename items to be obvious of the contents.
	(CoreClean): Delete the file list also.

In class/Microsoft.Build.Tasks/Test/Microsoft.Build.Tasks:
2010-02-06  Ankit Jain  <jankit@novell.com>

	* LCTest.cs: New.

2010-02-05  Ankit Jain  <jankit@novell.com>

	* CreateCSharpManifestResourceNameTest.cs:
	* CreateVisualBasicManifestResourceNameTest.cs:
	Add new tests for TargetPath metadata.

2010-02-04  Ankit Jain  <jankit@novell.com>

	* WriteLinesToFileTest.cs: New.

In class/Microsoft.Build.Tasks/Test/resources:
2010-02-05  Ankit Jain  <jankit@novell.com>

	* junk.txt: New.

In class/Microsoft.Build.Tasks:
2010-02-06  Ankit Jain  <jankit@novell.com>

	* Microsoft.Build.Tasks.dll.sources: Add LC.cs
	* Microsoft.Build.Tasks_test.dll.sources: Add LCTest.cs

2010-02-04  Ankit Jain  <jankit@novell.com>

	* Microsoft.Build.Tasks_test.dll.sources: Added
	WriteLinesToFileTest.cs

In class/Microsoft.Build.Tasks/Microsoft.Build.Tasks:
2010-02-06  Ankit Jain  <jankit@novell.com>

	* LC.cs: New.

2010-02-05  Ankit Jain  <jankit@novell.com>

	Fix bug #576579.
	* CreateManifestResourceName.cs: Use TargetPath metadata, as the link
	name.
	* CreateCSharpManifestResourceName.cs:
	* CreateVisualBasicManifestResourceName.cs: Prefer linkname over
	filename, if available.

2010-02-04  Ankit Jain  <jankit@novell.com>

	* WriteLinesToFile.cs: Delete the file if there is nothing to
	be written and overwrite==true.

2010-02-02	Rodrigo B. de Oliveira	<rodrigo@unity3d.com>

	* AssemblyResolver.cs:
		guard against non existing framework directory
		(for scenarios where lib/mono/3.5 is not available).

In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
2010-02-04  Ankit Jain  <jankit@novell.com>

	Fix bug #576589.
	* ConditionFunctionExpression.cs (Exists): Check for directory also.

In class/Microsoft.Build.Utilities/Microsoft.Build.Utilities:
2010-02-06  Ankit Jain  <jankit@novell.com>

	* ToolTask.cs (SkipTaskExecution): Use ValidateParameters method.
	Remove some MonoTODOs.


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

4 files changed, 114 insertions, 55 deletions

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index a20763ac604..48649b73c56 100644
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-06  Ankit Jain  <jankit@novell.com>
+
+	* xbuild/Microsoft.Common.targets: Add targets for compiling
+	licx (license) files.
+	* xbuild/Microsoft.Common.tasks: Add LC task.
+
+2010-02-04  Ankit Jain  <jankit@novell.com>
+
+	* xbuild/Microsoft.Common.targets (_RecordCleanFile): Append list of
+	current build files to list of previous build files.
+	(_GetCleanFileWrites): Rename items to be obvious of the contents.
+	(CoreClean): Delete the file list also.
+
 2010-01-21	Rodrigo B. de Oliveira <rodrigo@unity3d.com>
 
 	* Main.cs
diff --git a/mcs/tools/xbuild/xbuild.sln b/mcs/tools/xbuild/xbuild.sln
index bd8abd1f270..a0815a59650 100644
--- a/mcs/tools/xbuild/xbuild.sln
+++ b/mcs/tools/xbuild/xbuild.sln
@@ -1,50 +1,50 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Engine", "..\..\class\Microsoft.Build.Engine\Microsoft.Build.Engine.csproj", "{49CC9B64-E28A-4818-97F9-301E14B383B9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xbuild", "xbuild.csproj", "{89938F1A-C851-41D5-96D2-C329E00887B6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Engine.Test", "..\..\class\Microsoft.Build.Engine\Microsoft.Build.Engine.Test.csproj", "{A2F451CD-8701-434A-A562-EF1809E2DB7D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xbuild.tests", "Test\xbuild.tests\xbuild.tests.csproj", "{929D9BCD-2280-4B6D-AD69-0FD089E344C2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		DebugMS|Any CPU = DebugMS|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.DebugMS|Any CPU.ActiveCfg = DebugMS|Any CPU
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.DebugMS|Any CPU.Build.0 = DebugMS|Any CPU
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.DebugMS|Any CPU.ActiveCfg = DebugMS|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.DebugMS|Any CPU.Build.0 = DebugMS|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89938F1A-C851-41D5-96D2-C329E00887B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.DebugMS|Any CPU.ActiveCfg = Debug|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.DebugMS|Any CPU.Build.0 = Debug|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.DebugMS|Any CPU.ActiveCfg = DebugMS|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.DebugMS|Any CPU.Build.0 = DebugMS|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = ..\..\class\Microsoft.Build.Engine\Microsoft.Build.Engine.csproj
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+

+Microsoft Visual Studio Solution File, Format Version 9.00

+# Visual Studio 2005

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Engine", "..\..\class\Microsoft.Build.Engine\Microsoft.Build.Engine.csproj", "{49CC9B64-E28A-4818-97F9-301E14B383B9}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xbuild", "xbuild.csproj", "{89938F1A-C851-41D5-96D2-C329E00887B6}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Build.Engine.Test", "..\..\class\Microsoft.Build.Engine\Microsoft.Build.Engine.Test.csproj", "{A2F451CD-8701-434A-A562-EF1809E2DB7D}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xbuild.tests", "Test\xbuild.tests\xbuild.tests.csproj", "{929D9BCD-2280-4B6D-AD69-0FD089E344C2}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug|Any CPU = Debug|Any CPU

+		DebugMS|Any CPU = DebugMS|Any CPU

+		Release|Any CPU = Release|Any CPU

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{49CC9B64-E28A-4818-97F9-301E14B383B9}.DebugMS|Any CPU.ActiveCfg = DebugMS|Any CPU

+		{49CC9B64-E28A-4818-97F9-301E14B383B9}.DebugMS|Any CPU.Build.0 = DebugMS|Any CPU

+		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{49CC9B64-E28A-4818-97F9-301E14B383B9}.Release|Any CPU.Build.0 = Release|Any CPU

+		{89938F1A-C851-41D5-96D2-C329E00887B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{89938F1A-C851-41D5-96D2-C329E00887B6}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{89938F1A-C851-41D5-96D2-C329E00887B6}.DebugMS|Any CPU.ActiveCfg = DebugMS|Any CPU

+		{89938F1A-C851-41D5-96D2-C329E00887B6}.DebugMS|Any CPU.Build.0 = DebugMS|Any CPU

+		{89938F1A-C851-41D5-96D2-C329E00887B6}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{89938F1A-C851-41D5-96D2-C329E00887B6}.Release|Any CPU.Build.0 = Release|Any CPU

+		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.DebugMS|Any CPU.ActiveCfg = Debug|Any CPU

+		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.DebugMS|Any CPU.Build.0 = Debug|Any CPU

+		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{929D9BCD-2280-4B6D-AD69-0FD089E344C2}.Release|Any CPU.Build.0 = Release|Any CPU

+		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.DebugMS|Any CPU.ActiveCfg = DebugMS|Any CPU

+		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.DebugMS|Any CPU.Build.0 = DebugMS|Any CPU

+		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{A2F451CD-8701-434A-A562-EF1809E2DB7D}.Release|Any CPU.Build.0 = Release|Any CPU

+	EndGlobalSection

+	GlobalSection(MonoDevelopProperties) = preSolution

+		StartupItem = ..\..\class\Microsoft.Build.Engine\Microsoft.Build.Engine.csproj

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
index 0fc3faed53f..0871e32b0b0 100644
--- a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets
@@ -143,7 +143,7 @@
 		>
 			<Output TaskParameter="ResolvedFiles" ItemName="ResolvedFiles"/>
 			<Output TaskParameter="ResolvedFiles" ItemName="ReferencePath"/>
-			<Output TaskParameter="ResolvedDependencyFiles" ItemName="_ResolveAssemblyReferenceResolvedFiles"/>
+			<Output TaskParameter="ResolvedDependencyFiles" ItemName="_ResolvedDependencyFiles"/>
 			<Output TaskParameter="RelatedFiles" ItemName="_ReferenceRelatedPaths"/>
 			<Output TaskParameter="SatelliteFiles" ItemName="ReferenceSatellitePaths"/>
 			<Output TaskParameter="CopyLocalFiles" ItemName="ReferenceCopyLocalPaths"/>
@@ -252,6 +252,7 @@
 			ResolveReferences;
 			CopyFilesMarkedCopyLocal;
 			BuildResources;
+			CompileLicxFiles;
 			Compile;
 			PrepareForRun;
 			DeployOutputFiles;
@@ -299,7 +300,13 @@
 	</Target>
 
 	<Target Name="SplitResourcesByCulture" DependsOnTargets="AssignTargetPaths">
-		<AssignCulture Files="@(EmbeddedResourceWithTargetPath)">
+		<!-- Extract .licx files into @(LicxFiles) -->
+		<CreateItem Include="@(EmbeddedResourceWithTargetPath)" Condition="'%(Extension)' == '.licx'">
+			<Output TaskParameter="Include" ItemName="LicxFiles"/>
+		</CreateItem>
+
+		<!-- Split *remaining* resource files into various groups.. -->
+		<AssignCulture Files="@(EmbeddedResourceWithTargetPath)" Condition="'%(Extension)' != '.licx'">
 			<Output TaskParameter="AssignedFilesWithNoCulture" ItemName="ResourcesWithNoCulture"/>
 			<Output TaskParameter="AssignedFilesWithCulture" ItemName="ResourcesWithCulture"/>
 		</AssignCulture>
@@ -390,6 +397,28 @@
 		</CreateItem>
 	</Target>
 
+	<PropertyGroup>
+		<CompileLicxFilesDependsOn></CompileLicxFilesDependsOn>
+	</PropertyGroup>
+
+	<Target Name = "CompileLicxFiles"
+		Condition = "'@(LicxFiles)' != ''"
+		DependsOnTargets = "$(CompileLicxFilesDependsOn)"
+		Outputs = "$(IntermediateOutputPath)$(TargetFileName).licenses">
+		<LC
+			Sources = "@(LicxFiles)"
+			LicenseTarget = "$(TargetFileName)"
+			OutputDirectory = "$(IntermediateOutputPath)"
+			OutputLicense = "$(IntermediateOutputPath)$(TargetFileName).licenses"
+			ReferencedAssemblies = "@(ReferencePath);@(_ResolvedDependencyFiles)"
+			ToolPath = "$(LCToolPath)"
+			ToolExe = "$(LCToolExe)">
+
+			<Output TaskParameter="OutputLicense" ItemName="CompiledLicenseFile"/>
+			<Output TaskParameter="OutputLicense" ItemName="FileWrites"/>
+		</LC>
+	</Target>
+
 	<!-- Assign target paths to files that will need to be copied along with the project -->
 	<Target Name = "AssignTargetPaths">
 		<AssignTargetPath Files="@(None)" RootFolder="$(MSBuildProjectDirectory)">
@@ -607,9 +636,20 @@
 	<!-- Clean -->
 	<Target Name="_RecordCleanFile"
 		DependsOnTargets="_GetCompileOutputsForClean">
+
+		<!-- add to list of previous writes for this platform/config -->
+
+		<ReadLinesFromFile File="$(IntermediateOutputPath)$(CleanFile)">
+			<Output TaskParameter="Lines" ItemName="PreviousFileWrites"/>
+		</ReadLinesFromFile>
+
+		<RemoveDuplicates Inputs="@(PreviousFileWrites);@(FileWrites->'%(FullPath)')">
+			<Output TaskParameter="Filtered" ItemName="CombinedFileWrites"/>
+		</RemoveDuplicates>
+
 		<WriteLinesToFile
 			File="$(IntermediateOutputPath)$(CleanFile)"
-			Lines="@(FileWrites->'%(FullPath)')"
+			Lines="@(CombinedFileWrites)"
 			Overwrite="true"/>
 	</Target>
 
@@ -623,6 +663,7 @@
 	</PropertyGroup>
 
 	<Target Name="_GetCompileOutputsForClean">
+		<!-- assembly and debug file in the *intermediate output path* -->
 		<CreateItem Include="@(IntermediateAssembly)" Condition="Exists('@(IntermediateAssembly)')">
 			<Output TaskParameter="Include" ItemName="FileWrites"/>
 		</CreateItem>
@@ -637,7 +678,7 @@
 	<Target Name="_GetCleanFileWrites"
 		DependsOnTargets="_GetCompileOutputsForClean">
 		<ReadLinesFromFile File="$(IntermediateOutputPath)$(CleanFile)">
-			<Output TaskParameter="Lines" ItemName="FileWrites"/>
+			<Output TaskParameter="Lines" ItemName="PreviousFileWrites"/>
 		</ReadLinesFromFile>
 	</Target>
 
@@ -660,7 +701,11 @@
 	<Target Name="AfterClean" />
 
 	<Target Name="CoreClean" DependsOnTargets="_GetCleanFileWrites">
-		<Delete Files="@(FileWrites)" TreatErrorsAsWarnings="true"/>
+		<Delete Files="@(PreviousFileWrites);@(FileWrites)" TreatErrorsAsWarnings="true"/>
+
+		<!-- all previous files written for this platform/config have been deleted,
+		     we can safely remove the file list now -->
+		<Delete Files="$(IntermediateOutputPath)$(CleanFile)" TreatErrorsAsWarnings="true" />
 	</Target>
 
 </Project>
diff --git a/mcs/tools/xbuild/xbuild/Microsoft.Common.tasks b/mcs/tools/xbuild/xbuild/Microsoft.Common.tasks
index 49c5ef89e29..9b1c1ad488e 100644
--- a/mcs/tools/xbuild/xbuild/Microsoft.Common.tasks
+++ b/mcs/tools/xbuild/xbuild/Microsoft.Common.tasks
@@ -17,6 +17,7 @@
 	<UsingTask TaskName="Microsoft.Build.Tasks.GenerateResource"	AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 	<UsingTask TaskName="Microsoft.Build.Tasks.GetFrameworkPath"	AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 	<UsingTask TaskName="Microsoft.Build.Tasks.GetFrameworkSdkPath"	AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+	<UsingTask TaskName="Microsoft.Build.Tasks.LC"			AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 	<UsingTask TaskName="Microsoft.Build.Tasks.MakeDir"		AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 	<UsingTask TaskName="Microsoft.Build.Tasks.Message"		AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
 	<UsingTask TaskName="Microsoft.Build.Tasks.MSBuild"		AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />