diff options
| author | Ankit Jain <radical@corewars.org> | 2009-10-03 02:08:37 +0400 |
|---|---|---|
| committer | Ankit Jain <radical@corewars.org> | 2009-10-03 02:08:37 +0400 |
| commit | 85f197004deb82340c28cea5d9215d96c889f4d0 (patch) | |
| tree | f5df22b46d3eb004dc64c92dca0a75bae00771a1 /mcs | |
| parent | 01c866af9c37621a0f397339a45521ffa021c92a (diff) | |
Update xbuild and Microsoft.Build.* from trunk.
In tools/xbuild:
2009-10-03 Ankit Jain <jankit@novell.com>
Fix bug#542461.
* xbuild/Microsoft.Common.targets (KeyOriginatorFile): Set to
$(AssemblyOriginatorKeyFile), if SignAssembly is true.
Use it for satellite assemblies also.
In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:
2009-10-03 Ankit Jain <jankit@novell.com>
* Project.cs (OS): New.
(InitializeProperties): Set 'OS' as a pre-defined property, set to
'Windows_NT', 'Unix' or 'OSX' depending on the platform.
svn path=/branches/mono-2-6/mcs/; revision=143317
Diffstat (limited to 'mcs')
4 files changed, 34 insertions, 0 deletions
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog index ff17581c295..1d06008ffd2 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog @@ -1,3 +1,9 @@ +2009-10-03 Ankit Jain <jankit@novell.com> + + * Project.cs (OS): New. + (InitializeProperties): Set 'OS' as a pre-defined property, set to + 'Windows_NT', 'Unix' or 'OSX' depending on the platform. + 2009-10-02 Ankit Jain <jankit@novell.com> * Expression.cs (Parse): Don't change '/' to '\\', not required. 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 a6af58a233b..68c56012a1b 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs @@ -900,6 +900,7 @@ namespace Microsoft.Build.BuildEngine { EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildToolsPath", parentEngine.BinPath, PropertyType.Reserved)); EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildExtensionsPath", ExtensionsPath, PropertyType.Reserved)); EvaluatedProperties.AddProperty (new BuildProperty ("MSBuildProjectDefaultTargets", DefaultTargets, PropertyType.Reserved)); + EvaluatedProperties.AddProperty (new BuildProperty ("OS", OS, PropertyType.Environment)); // FIXME: make some internal method that will work like GetDirectoryName but output String.Empty on null/String.Empty string projectDir; @@ -1277,6 +1278,22 @@ namespace Microsoft.Build.BuildEngine { internal static string XmlNamespace { get { return ns; } } + + static string OS { + get { + PlatformID pid = Environment.OSVersion.Platform; + switch ((int)pid) { + case 128: + case 4: + return "Unix"; + case 6: + return "OSX"; + default: + return "Windows_NT"; + } + } + } + } } diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog index 69b5b904cc1..152f9396f79 100644 --- a/mcs/tools/xbuild/ChangeLog +++ b/mcs/tools/xbuild/ChangeLog @@ -1,3 +1,10 @@ +2009-10-03 Ankit Jain <jankit@novell.com> + + Fix bug#542461. + * xbuild/Microsoft.Common.targets (KeyOriginatorFile): Set to + $(AssemblyOriginatorKeyFile), if SignAssembly is true. + Use it for satellite assemblies also. + 2009-09-29 Ankit Jain <jankit@novell.com> * SolutionParser.cs (Insert): Show project name in case of a cyclic diff --git a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets index b256b4854f9..8b8abecd9ad 100644 --- a/mcs/tools/xbuild/xbuild/Microsoft.Common.targets +++ b/mcs/tools/xbuild/xbuild/Microsoft.Common.targets @@ -50,6 +50,8 @@ <TargetName Condition="'$(TargetName)' == '' ">$(AssemblyName)</TargetName> <TargetFileName Condition="'$(TargetFileName)' == '' ">$(TargetName)$(TargetExt)</TargetFileName> <TargetPath>@(_OutDirItem->'%(FullPath)\$(TargetFileName)')</TargetPath> + + <KeyOriginatorFile Condition=" '$(SignAssembly)' == 'true' ">$(AssemblyOriginatorKeyFile)</KeyOriginatorFile> </PropertyGroup> <Target Name="_ValidateEssentialProperties"> @@ -343,7 +345,9 @@ <AL Culture = "%(Culture)" + DelaySign="$(DelaySign)" EmbedResources = "@(ManifestResourceWithCulture);@(ManifestNonResxWithCultureOnDisk)" + KeyFile="$(KeyOriginatorFile)" OutputAssembly = "$(IntermediateOutputPath)%(Culture)\$(AssemblyName).resources.dll" > <Output TaskParameter="OutputAssembly" ItemName="FileWrites"/> </AL> |