diff options
author | Elinor Fung <47805090+elinor-fung@users.noreply.github.com> | 2019-06-14 22:32:22 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-14 22:32:22 -0700 |
commit | db746a1995a2d4c3e4039e6eb51288f098b32551 (patch) | |
tree | cb35686ce223371d9a4caba3bb4f9d0a53f452f4 | |
parent | ae2cd207ecf1e14c5e458588f28465b7aab97436 (diff) | |
download | coreclr-db746a1995a2d4c3e4039e6eb51288f098b32551.tar.gz coreclr-db746a1995a2d4c3e4039e6eb51288f098b32551.tar.bz2 coreclr-db746a1995a2d4c3e4039e6eb51288f098b32551.zip |
Fix duplicate imports in managed product build (#25174)
-rw-r--r-- | dependencies.props | 3 | ||||
-rw-r--r-- | dir.props | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/dependencies.props b/dependencies.props index 5a662ce64c..a661e93db8 100644 --- a/dependencies.props +++ b/dependencies.props @@ -11,7 +11,8 @@ </RestoreSources> </PropertyGroup> - <Import Project="eng/Versions.props" /> + <!-- [ARCADE REMOVE] Versions.props is imported by Arcade SDK targets when building with Arcade --> + <Import Project="eng/Versions.props" Condition="'$(ArcadeBuild)' != 'true'" /> <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. --> <PropertyGroup> @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project> - <Import Project="dir.common.props" /> + <!-- dir.common.props is imported by Directory.Build.props when building with Arcade --> + <Import Project="dir.common.props" Condition="'$(ArcadeBuild)' != 'true'" /> <!-- [ARCADE REMOVE] This entire file can be removed. Properties set by this file should be moved into dir.common.props and Directory.Build.props as appropriate and projects should stop importing this. --> |