Merge pull request #1508 from slluis/fix-20966

Generate proper Link metadata for resources in imported projects

diff --combined mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
index 097fd8b284420f5c5a837c7ad3e1987c684491db,1d16bbf5351c93dd8299174ac1fbc79c2a2a9e1a..005752baf98e12f541683c8aa9f258b6a7d03354
--- 1/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
--- 2/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
@@@ -323,7 -323,9 +323,7 @@@ namespace Microsoft.Build.BuildEngine 
                                Reevaluate ();
                        }
  
 -#if NET_4_0
                        ProcessBeforeAndAfterTargets ();
 -#endif
  
                        if (targetNames == null || targetNames.Length == 0) {
                                if (defaultTargets != null && defaultTargets.Length != 0) {
@@@ -402,6 -404,7 +402,6 @@@
                        return sb.ToString ();
                }
  
 -#if NET_4_0
                void ProcessBeforeAndAfterTargets ()
                {
                        var beforeTable = Targets.AsIEnumerable ()
@@@ -437,6 -440,7 +437,6 @@@
                        expr.Parse (targets, ParseOptions.AllowItemsNoMetadataAndSplit);
                        return (string []) expr.ConvertTo (this, typeof (string []));
                }
 -#endif
  
                [MonoTODO]
                public string [] GetConditionedPropertyValues (string propertyName)
@@@ -1425,6 -1429,10 +1425,10 @@@
                        return default (T);
                }
  
+               internal string ThisFileFullPath {
+                       get { return this_file_property_stack.Peek (); }
+               }
+ 
                // Used for MSBuild*This* set of properties
                internal void PushThisFileProperty (string full_filename)
                {

diff --combined mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj
index 3aa75d7099d42484a218a77a1bf3a55f6686a012,6806165daca47710c7e802796aebffa80a196205..05eac250c7299c599ed2e0a0794e234bbaf944c5
--- 1/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj
--- 2/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks-net_4_5.csproj
@@@ -25,7 -25,7 +25,7 @@@
      <DebugType>full</DebugType>\r
      <NoWarn>1699</NoWarn>\r
      <Optimize>false</Optimize>\r
 -    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
 +    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
      <ErrorReport>prompt</ErrorReport>\r
      <WarningLevel>4</WarningLevel>\r
    </PropertyGroup>\r
@@@ -33,7 -33,7 +33,7 @@@
      <DebugType>pdbonly</DebugType>\r
      <NoWarn>1699</NoWarn>\r
      <Optimize>true</Optimize>\r
 -    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
 +    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
      <ErrorReport>prompt</ErrorReport>\r
      <WarningLevel>4</WarningLevel>\r
    </PropertyGroup>\r
@@@ -105,6 -105,7 +105,7 @@@
      <Compile Include="Microsoft.Build.Tasks\AssignCulture.cs" />\r
      <Compile Include="Microsoft.Build.Tasks\AssignProjectConfiguration.cs" />\r
      <Compile Include="Microsoft.Build.Tasks\AssignTargetPath.cs" />\r
+     <Compile Include="Microsoft.Build.Tasks\AssignLinkMetadata.cs" />\r
      <Compile Include="Microsoft.Build.Tasks\CallTarget.cs" />\r
      <Compile Include="Microsoft.Build.Tasks\CodeTaskFactory.cs" />\r
      <Compile Include="Microsoft.Build.Tasks\CombinePath.cs" />\r