projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9c80a2d
)
[xbuild] ResolveAssemblyReference - add missing api.
author
Ankit Jain
<radical@corewars.org>
Mon, 28 Feb 2011 09:20:53 +0000
(14:50 +0530)
committer
Ankit Jain
<radical@corewars.org>
Mon, 28 Feb 2011 09:20:53 +0000
(14:50 +0530)
mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/ResolveAssemblyReference.cs
patch
|
blob
|
history
mcs/tools/xbuild/xbuild/3.5/Microsoft.Common.targets
patch
|
blob
|
history
mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
patch
|
blob
|
history
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 f1d20ab11f997140fffd714a06db897f42d67c26..d0d74310e036e221d5f54558ed5a3242c4e66a2f 100644
(file)
--- 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; }
}
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; }
public string[] TargetFrameworkDirectories {
get { return targetFrameworkDirectories; }
set { targetFrameworkDirectories = value; }
@@
-655,6
+663,7
@@
namespace Microsoft.Build.Tasks {
set { targetProcessorArchitecture = value; }
}
set { targetProcessorArchitecture = value; }
}
+
static Dictionary<string, string> cultureNamesTable;
static Dictionary<string, string> CultureNamesTable {
get {
static Dictionary<string, string> cultureNamesTable;
static Dictionary<string, string> 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 f671d817605a04b754667e5ef468e59e1272e0c3..2efac100f43ebeb6f10c49fafd29896c39aad36b 100644
(file)
--- 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"
FindDependencies="true"
FindSatellites="true"
FindRelatedFiles="true"
+ TargetFrameworkVersion="$(TargetFrameworkVersion)"
>
<Output TaskParameter="ResolvedFiles" ItemName="ResolvedFiles"/>
<Output TaskParameter="ResolvedFiles" ItemName="ReferencePath"/>
>
<Output TaskParameter="ResolvedFiles" ItemName="ResolvedFiles"/>
<Output TaskParameter="ResolvedFiles" ItemName="ReferencePath"/>
diff --git
a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
index 5ecd77a13820e5112ce7beaf9176dcc26dbde7ee..f1195b86ee4895be37b5d9276fdaf1373177c2c9 100644
(file)
--- 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"
FindDependencies="true"
FindSatellites="true"
FindRelatedFiles="true"
+ TargetFrameworkMoniker="$(TargetFrameworkMoniker)"
+ TargetFrameworkMonikerDisplayName="$(TargetFrameworkMonikerDisplayName)"
+ TargetFrameworkVersion="$(TargetFrameworkVersion)"
>
<Output TaskParameter="ResolvedFiles" ItemName="ResolvedFiles"/>
<Output TaskParameter="ResolvedFiles" ItemName="ReferencePath"/>
>
<Output TaskParameter="ResolvedFiles" ItemName="ResolvedFiles"/>
<Output TaskParameter="ResolvedFiles" ItemName="ReferencePath"/>