[xbuild] Add $(TargetFrameworkDirectory) for msbuild compatibility.

[mono.git] / mcs / tools / xbuild / xbuild / 4.0 / Microsoft.Common.targets

diff --git a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
index 80d9431c3025b8e6501a95eb40bbe5098ec700cf..cf0bd6d65a89df6cbab545b464f16405c26cfa1d 100644 (file)
--- a/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
+++ b/mcs/tools/xbuild/xbuild/4.0/Microsoft.Common.targets
@@ -96,17 +96,21 @@
                <GetFrameworkPath>
                        <Output Condition="'$(TargetFrameworkVersion)' == 'v4.0'"
                                TaskParameter="FrameworkVersion40Path"
-                               ItemName="TargetFrameworkDirectories"/>
+                               ItemName="_TargetFrameworkDirectories"/>
                        <Output Condition="'$(TargetFrameworkVersion)' == 'v3.5'"
                                TaskParameter="FrameworkVersion35Path"
-                               ItemName="TargetFrameworkDirectories"/>
+                               ItemName="_TargetFrameworkDirectories"/>
                        <Output Condition="'$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'" 
                                TaskParameter="FrameworkVersion30Path"
-                               ItemName="TargetFrameworkDirectories"/>
+                               ItemName="_TargetFrameworkDirectories"/>
                        <Output Condition="'$(TargetFrameworkVersion)' == 'v2.0' or '$(TargetFrameworkVersion)' == 'v3.0' or '$(TargetFrameworkVersion)' == 'v3.5'" 
                                TaskParameter="FrameworkVersion20Path"
-                               ItemName="TargetFrameworkDirectories"/>
+                               ItemName="_TargetFrameworkDirectories"/>
                </GetFrameworkPath>
+               <CreateProperty Value="@(_TargetFrameworkDirectories)">
+                       <Output TaskParameter="Value" PropertyName="TargetFrameworkDirectory"/>
+               </CreateProperty>
+
                <Warning Text="TargetFrameworkVersion '$(TargetFrameworkVersion)' not supported by this toolset (ToolsVersion: $(MSBuildToolsVersion))."
                        Condition="'$(TargetFrameworkVersion)' != 'v4.0' and '$(TargetFrameworkVersion)' != 'v3.5' and '$(TargetFrameworkVersion)' != 'v3.0' and '$(TargetFrameworkVersion)' != 'v2.0'"/>
        </Target>
@@ -151,7 +155,7 @@
                        AssemblyFiles="@(ChildProjectReferences)"
                        SearchPaths="$(AssemblySearchPaths)"
                        CandidateAssemblyFiles="@(Content);@(None)"
-                       TargetFrameworkDirectories="@(TargetFrameworkDirectories)"
+                       TargetFrameworkDirectories="$(TargetFrameworkDirectory)"
                        AllowedAssemblyExtensions="$(AllowedReferenceAssemblyFileExtensions)"
                        AllowedRelatedFileExtensions="$(AllowedReferenceRelatedFileExtensions)"
                        FindDependencies="true"