diff options
| author | Eric StJohn <ericstj@microsoft.com> | 2017-04-25 02:43:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 02:43:55 +0300 |
| commit | c77b83942986c9103d959dbba5de5ce0599b2858 (patch) | |
| tree | cf100f2d7812cb9d3a20ead021e8474a2a8d3fa2 /dir.targets | |
| parent | fd069b752f7c5881b1d2da0dbd125e2b6c411b7f (diff) | |
| parent | d541367b18373e4a0073ecf15dfbfd6b75c184a1 (diff) | |
Merge pull request #18766 from ericstj/removeIsDesktopFacade
Remove IsDesktopFacade
Diffstat (limited to 'dir.targets')
| -rw-r--r-- | dir.targets | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/dir.targets b/dir.targets index feab7b5aad..242fa6cb10 100644 --- a/dir.targets +++ b/dir.targets @@ -39,14 +39,8 @@ <IsUAPRef Condition="'$(IsUAPRef)' == ''">$(IsUAP)</IsUAPRef> <IsNetFxNETStandardRef Condition="'$(IsNetFxNETStandardRef)' == ''">$(IsNetFxNETStandard)</IsNetFxNETStandardRef> - <BuildingDesktopFacade Condition="'$(IsDesktopFacade)' == 'true' And ('$(TargetGroup)' == 'netfx' Or $(TargetGroup.StartsWith('net4')))" >true</BuildingDesktopFacade> - - <!-- if building desktop facade, we don't bin place the refs --> - <BinPlaceRef Condition="'$(BinPlaceRef)' == '' And '$(BuildingDesktopFacade)' != 'true' And ('$(IsReferenceAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef> + <BinPlaceRef Condition="'$(BinPlaceRef)' == '' And ('$(IsReferenceAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef> <BinPlaceRuntime Condition="'$(BinPlaceRuntime)' == '' And ('$(IsRuntimeAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRuntime> - - <!-- if building desktop facade and bin placing the runtime, then we need to bin place the refs too --> - <BinPlaceRef Condition="'$(BuildingDesktopFacade)' == 'true' And '$(BinPlaceRuntime)' == 'true'">true</BinPlaceRef> </PropertyGroup> <ItemGroup Condition="'@(BinPlaceConfiguration)' == ''"> @@ -98,17 +92,13 @@ <BinPlaceConfiguration Include="netstandard"> <RefPath>$(RefRootPath)netstandard/</RefPath> </BinPlaceConfiguration> + <!-- for BuildAllConfigurations make sure all refpaths are created. --> + <_TargetGroupsWithIsAot Condition="'$(BuildAllConfigurations)' == 'true'" Include="@(TargetGroups)"> + <IsAot>$([System.String]::new('%(Identity)').Contains('aot'))</IsAot> + </_TargetGroupsWithIsAot> <BinPlaceConfiguration Condition="'$(BuildAllConfigurations)' == 'true'" - Include="netcoreapp"> - <RefPath>$(RefRootPath)netcoreapp/</RefPath> - </BinPlaceConfiguration> - <BinPlaceConfiguration Condition="'$(BuildAllConfigurations)' == 'true'" - Include="uap"> - <RefPath>$(RefRootPath)uap/</RefPath> - </BinPlaceConfiguration> - <BinPlaceConfiguration Condition="'$(BuildAllConfigurations)' == 'true'" - Include="netfx"> - <RefPath>$(RefRootPath)netfx/</RefPath> + Include="@(_TargetGroupsWithIsAot->WithMetadataValue('IsAot', 'false'))"> + <RefPath>$(RefRootPath)%(Identity)/</RefPath> </BinPlaceConfiguration> </ItemGroup> |