From 0f230305d3ce5650a5b405928dcefd87fe96e59d Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Mon, 28 Feb 2011 14:50:53 +0530 Subject: [PATCH] [xbuild] ResolveAssemblyReference - add missing api. --- .../Microsoft.Build.Tasks/ResolveAssemblyReference.cs | 11 ++++++++++- mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets | 1 + mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs index f1d20ab11f9..d0d74310e03 100644 --- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs +++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs @@ -644,7 +644,15 @@ namespace Microsoft.Build.Tasks { public ITaskItem[] SuggestedRedirects { get { return suggestedRedirects; } } - + +#if NET_4_0 + public string TargetFrameworkMoniker { get; set; } + + public string TargetFrameworkMonikerDisplayName { get; set; } +#endif + + public string TargetFrameworkVersion { get; set; } + public string[] TargetFrameworkDirectories { get { return targetFrameworkDirectories; } set { targetFrameworkDirectories = value; } @@ -655,6 +663,7 @@ namespace Microsoft.Build.Tasks { set { targetProcessorArchitecture = value; } } + static Dictionary cultureNamesTable; static Dictionary CultureNamesTable { get { diff --git a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets index f671d817605..2efac100f43 100644 --- a/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets +++ b/mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets @@ -180,6 +180,7 @@ FindDependencies="true" FindSatellites="true" FindRelatedFiles="true" + TargetFrameworkVersion="$(TargetFrameworkVersion)" > diff --git a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets index 5ecd77a1382..f1195b86ee4 100644 --- a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets +++ b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets @@ -218,6 +218,9 @@ FindDependencies="true" FindSatellites="true" FindRelatedFiles="true" + TargetFrameworkMoniker="$(TargetFrameworkMoniker)" + TargetFrameworkMonikerDisplayName="$(TargetFrameworkMonikerDisplayName)" + TargetFrameworkVersion="$(TargetFrameworkVersion)" > -- 2.25.1