diff options
| author | Vitek Karas <vitek.karas@microsoft.com> | 2021-07-19 19:54:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 19:54:03 +0300 |
| commit | ae7f47d456a1e5d8b0cb479f69d39a889412d25c (patch) | |
| tree | 3aef7357251608fbe83dd7c91bb37172df223ddf /src/installer/pkg | |
| parent | d05950ba1ad440855f9851857bbad6f9d1a34321 (diff) | |
Fixes building Host tests from VS (#55917)
When building the Host tests projects from VS the CrossGen2 related properties are not set (probably because the build type is not set to Core - which doesn't matter for the tests).
Changed the includes to be conditional.
Diffstat (limited to 'src/installer/pkg')
| -rw-r--r-- | src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props index 28ac4374be2..3fe16b05bac 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Runtime.props @@ -155,10 +155,10 @@ </ItemGroup> </Target> - <Import Project="$(Crossgen2SdkOverridePropsPath)" /> + <Import Project="$(Crossgen2SdkOverridePropsPath)" Condition="'$(Crossgen2SdkOverridePropsPath)' != ''" /> <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.SharedFramework.Sdk" /> - <Import Project="$(Crossgen2SdkOverrideTargetsPath)" /> + <Import Project="$(Crossgen2SdkOverrideTargetsPath)" Condition="'$(Crossgen2SdkOverrideTargetsPath)' != ''" /> <PropertyGroup> <PublishReadyToRunComposite Condition="$(ForcePublishReadyToRunComposite) == 'true'">true</PublishReadyToRunComposite> </PropertyGroup> |