diff options
| author | Santiago Fernandez Madero <safern@microsoft.com> | 2019-01-31 17:28:37 +0300 |
|---|---|---|
| committer | Eric StJohn <ericstj@microsoft.com> | 2019-01-31 17:28:37 +0300 |
| commit | 1441e90efb279d990f496149ac45140ee3652526 (patch) | |
| tree | 76d2a703ebb73d5cea108e8b42dad58114a3b828 | |
| parent | 01d19b04a22c0f32afd03f031f0d6acf71b2ae44 (diff) | |
Bring back hooks to AddRuntimeProjectReference from buildtools (dotnet/corefx#34979)
Commit migrated from https://github.com/dotnet/corefx/commit/38b2d1d4e298a717d99adadcfb0803a8e2a0b04f
| -rw-r--r-- | eng/referenceFromRuntime.targets | 16 | ||||
| -rw-r--r-- | eng/references.targets | 1 |
2 files changed, 16 insertions, 1 deletions
diff --git a/eng/referenceFromRuntime.targets b/eng/referenceFromRuntime.targets index 5a87f368fc7..2df3af10fae 100644 --- a/eng/referenceFromRuntime.targets +++ b/eng/referenceFromRuntime.targets @@ -9,9 +9,23 @@ <ReferenceCopyLocalPaths Condition="'%(ReferenceFromRuntime.Private)' == 'true'" Include="@(ReferenceFromRuntime->'$(RuntimePath)%(Identity).dll')" /> </ItemGroup> </Target> + + <PropertyGroup> + <PrepareProjectReferencesDependsOn> + AddRuntimeProjectReference; + $(PrepareProjectReferencesDependsOn); + </PrepareProjectReferencesDependsOn> + <ResolveReferencesDependsOn> + AddRuntimeProjectReference; + $(ResolveReferencesDependsOn); + </ResolveReferencesDependsOn> + <CleanDependsOn> + AddRuntimeProjectReference; + $(CleanDependsOn) + </CleanDependsOn> + </PropertyGroup> <Target Name="AddRuntimeProjectReference" - BeforeTargets="AddReferencesDynamically" Condition="'$(IsTestProject)'!='true' AND '@(ReferenceFromRuntime)' != ''"> <Error Condition="('$(IsReferenceAssembly)' != 'true' OR '$(AllowReferenceFromRuntime)' == 'true') AND '$(RuntimeProjectFile)' == ''" Text="RuntimeProjectFile must be specified when using ReferenceFromRuntime from source projects." /> <Error Condition="'$(IsReferenceAssembly)' == 'true' AND '$(AllowReferenceFromRuntime)' != 'true'" Text="ReferenceFromRuntime may not be used from reference assemblies." /> diff --git a/eng/references.targets b/eng/references.targets index 7c9f43fca1a..de6eccf6338 100644 --- a/eng/references.targets +++ b/eng/references.targets @@ -34,5 +34,6 @@ </Reference> </ItemGroup> </Target> + <Target Name="AddReferencesDynamically" BeforeTargets="BeforeResolveReferences;ResolveAssemblyReferences" /> </Project>
\ No newline at end of file |