In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:

	* Project.cs: Add reserved properties MSBuildProjectFullPath
	and MSBuildProjectExtension .

In tools/xbuild:

	* xbuild/*/Microsoft.Common.targets: Set MSBuildAllProjects property.
	* xbuild/Microsoft.CSharp.targets: Likewise.

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

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
index 7cd5a01f3fccbbdfd2c04fb2dff2f38d5504b6a0..fe41130967dca24fb7613b886364f0f7f83e9393 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-22  Ankit Jain  <jankit@novell.com>
+
+       * Project.cs: Add reserved properties MSBuildProjectFullPath
+       and MSBuildProjectExtension .
+
 2010-07-09  Ankit Jain  <jankit@novell.com>
 
        Correctly handle precedence of ToolsVersion value coming

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
index c2de8c7fc9ecb1e9ef854cae64178bd1f39a4fe4..4f7f90e377cbe65b0270b43f206cce2cc51d7277 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
@@ -930,9 +930,14 @@ namespace Microsoft.Build.BuildEngine {
 
                        EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildProjectFile", Path.GetFileName (fullFileName),
                                                PropertyType.Reserved));
+                       EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildProjectFullPath", fullFileName, PropertyType.Reserved));
                        EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildProjectName",
                                                Path.GetFileNameWithoutExtension (fullFileName),
                                                PropertyType.Reserved));
+                       EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildProjectExtension",
+                                               Path.GetExtension (fullFileName),
+                                               PropertyType.Reserved));
+
                        string toolsPath = parentEngine.Toolsets [effective_tools_version].ToolsPath;
                        if (toolsPath == null)
                                throw new Exception (String.Format ("Invalid tools version '{0}', no tools path set for this.", effective_tools_version));

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index 3f7a5d1752950ab1d5d90a00710a8a450dcea292..b682bcb16f32a1ee900337395279a4a84ac9ed01 100644 (file)
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-22  Ankit Jain  <jankit@novell.com>
+
+       * xbuild/*/Microsoft.Common.targets: Set MSBuildAllProjects property.
+       * xbuild/Microsoft.CSharp.targets: Likewise.
+
 2010-07-21  Ankit Jain  <jankit@novell.com>
 
        * xbuild/Microsoft.Silverlight.Common.targets: Set AssemblySearchPaths

diff --git a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
index f17abf6f44afeda4509429188f5ae886800a5951..1de2a07cf0863fb8a480946221d9727161d4028e 100644 (file)
--- a/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/2.0/Microsoft.Common.targets
@@ -53,6 +53,7 @@
                <TargetName Condition="'$(TargetName)' == '' ">$(AssemblyName)</TargetName>
                <TargetFileName Condition="'$(TargetFileName)' == '' ">$(TargetName)$(TargetExt)</TargetFileName>
                <TargetPath>@(_OutDirItem->'%(FullPath)\$(TargetFileName)')</TargetPath>
+               <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildProjectFullPath);$(MSBuildToolsPath)\Microsoft.Common.targets</MSBuildAllProjects>
 
                <KeyOriginatorFile Condition=" '$(SignAssembly)' == 'true' ">$(AssemblyOriginatorKeyFile)</KeyOriginatorFile>
        </PropertyGroup>

diff --git a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
index f17abf6f44afeda4509429188f5ae886800a5951..1de2a07cf0863fb8a480946221d9727161d4028e 100644 (file)
--- a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
@@ -53,6 +53,7 @@
                <TargetName Condition="'$(TargetName)' == '' ">$(AssemblyName)</TargetName>
                <TargetFileName Condition="'$(TargetFileName)' == '' ">$(TargetName)$(TargetExt)</TargetFileName>
                <TargetPath>@(_OutDirItem->'%(FullPath)\$(TargetFileName)')</TargetPath>
+               <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildProjectFullPath);$(MSBuildToolsPath)\Microsoft.Common.targets</MSBuildAllProjects>
 
                <KeyOriginatorFile Condition=" '$(SignAssembly)' == 'true' ">$(AssemblyOriginatorKeyFile)</KeyOriginatorFile>
        </PropertyGroup>

diff --git a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
index 3b1849d25669a3f71b704901b09c66f9419f96b6..80d9431c3025b8e6501a95eb40bbe5098ec700cf 100644 (file)
--- a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
@@ -53,6 +53,7 @@
                <TargetName Condition="'$(TargetName)' == '' ">$(AssemblyName)</TargetName>
                <TargetFileName Condition="'$(TargetFileName)' == '' ">$(TargetName)$(TargetExt)</TargetFileName>
                <TargetPath>@(_OutDirItem->'%(FullPath)\$(TargetFileName)')</TargetPath>
+               <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildProjectFullPath);$(MSBuildToolsPath)\Microsoft.Common.targets</MSBuildAllProjects>
 
                <KeyOriginatorFile Condition=" '$(SignAssembly)' == 'true' ">$(AssemblyOriginatorKeyFile)</KeyOriginatorFile>
        </PropertyGroup>

diff --git a/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets b/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
index d4f92824254285ddfca67e49d6526984cb1854f7..ce5745803f2d0444006bdf8afb9f0a38db5e763e 100644 (file)
--- a/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
+++ b/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
@@ -16,6 +16,8 @@
 
                <CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' != 'v4.0'">gmcs</CscToolExe>
                <CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.0'">dmcs</CscToolExe>
+
+               <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildToolsPath)\Microsoft.CSharp.targets</MSBuildAllProjects>
        </PropertyGroup>
 
        <ItemGroup>