You've already forked linux-packaging-mono
Imported Upstream version 5.10.0.47
Former-commit-id: d0813289fa2d35e1f8ed77530acb4fb1df441bc0
This commit is contained in:
parent
88ff76fe28
commit
e46a49ecf1
16
external/corefx/dir.targets
vendored
16
external/corefx/dir.targets
vendored
@@ -3,9 +3,9 @@
|
||||
|
||||
<Target Name="CheckForBuildTools">
|
||||
<Error Condition="!Exists('$(ToolsDir)') and '$(OverrideToolsDir)'=='true'"
|
||||
Text="The tools directory [$(ToolsDir)] does not exist. Please run sync in your enlistment to ensure the tools are installed before attempting to build an individual project." />
|
||||
Text="The tools directory [$(ToolsDir)] does not exist. Please run sync in your repo to ensure the tools are installed before attempting to build an individual project." />
|
||||
<Error Condition="!Exists('$(ToolsDir)') and '$(OverrideToolsDir)'!='true'"
|
||||
Text="The tools directory [$(ToolsDir)] does not exist. Please run init-tools.cmd in your enlistment to ensure the tools are installed before attempting to build an individual project." />
|
||||
Text="The tools directory [$(ToolsDir)] does not exist. Please run init-tools.cmd in your repo to ensure the tools are installed before attempting to build an individual project." />
|
||||
</Target>
|
||||
|
||||
<Import Project="buildvertical.targets" />
|
||||
@@ -22,6 +22,7 @@
|
||||
|
||||
<BinPlaceRef Condition="'$(BinPlaceRef)' == '' And ('$(IsReferenceAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRef>
|
||||
<BinPlaceRuntime Condition="'$(BinPlaceRuntime)' == '' And ('$(IsRuntimeAssembly)' == 'true' OR '$(IsRuntimeAndReferenceAssembly)' == 'true')">true</BinPlaceRuntime>
|
||||
<BinPlaceTest Condition="'$(BinPlaceTest)' == '' And '$(IsTestProject)' == 'true'">true</BinPlaceTest>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition="'@(BinPlaceConfiguration)' == ''">
|
||||
@@ -29,6 +30,8 @@
|
||||
<BinPlaceConfiguration Include="$(_bc_TargetGroup)-$(_bc_OSGroup)">
|
||||
<RefPath>$(BuildConfigurationRefPath)</RefPath>
|
||||
<RuntimePath>$(RuntimePath)</RuntimePath>
|
||||
<!-- we want to bin place the test output into the working directory -->
|
||||
<TestPath>$(TestPath)</TestPath>
|
||||
</BinPlaceConfiguration>
|
||||
<!-- binplace to directories for packages -->
|
||||
<BinPlaceConfiguration Condition="'$(IsNETCoreApp)' == 'true' AND '$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)">
|
||||
@@ -47,11 +50,6 @@
|
||||
<BinPlaceConfiguration Condition="'$(IsUAP)' == 'true' AND '$(BuildingUAPAOTVertical)' == 'true'" Include="uapaot-$(_bc_OSGroup)">
|
||||
<PackageFileRuntimePath>$(UAPAOTPackageRuntimePath)</PackageFileRuntimePath>
|
||||
</BinPlaceConfiguration>
|
||||
<BinPlaceConfiguration Condition="('$(IsNetFxNETStandard)' == 'true' OR '$(IsNetFxNETStandardRef)' == 'true') AND '$(BuildingNETFxVertical)' == 'true'"
|
||||
Include="netfx-$(_bc_OSGroup);net462-$(_bc_OSGroup);net47-$(_bc_OSGroup)">
|
||||
<PackageFileRefPath Condition="'$(IsNetFxNETStandardRef)'=='true'">$(NetFxPackageRefPath)</PackageFileRefPath>
|
||||
<PackageFileRuntimePath Condition="'$(IsNetFxNETStandard)'=='true'">$(NetFxPackageRuntimePath)</PackageFileRuntimePath>
|
||||
</BinPlaceConfiguration>
|
||||
|
||||
<!-- Setup the shared framework directory for testing -->
|
||||
<BinPlaceConfiguration Condition="'$(BinPlaceTestSharedFramework)' == 'true'" Include="netcoreapp-$(_bc_OSGroup)">
|
||||
@@ -73,6 +71,10 @@
|
||||
<BinPlaceConfiguration Include="netstandard">
|
||||
<RefPath>$(RefRootPath)netstandard/</RefPath>
|
||||
</BinPlaceConfiguration>
|
||||
<!-- some libraries that produce packages will remain targeting netcoreapp2.0 -->
|
||||
<BinPlaceConfiguration Condition="'$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp2.0">
|
||||
<RefPath>$(RefRootPath)netcoreapp2.0/</RefPath>
|
||||
</BinPlaceConfiguration>
|
||||
<!-- for BuildAllConfigurations make sure all refpaths are created. -->
|
||||
<_TargetGroupsWithIsAot Condition="'$(BuildAllConfigurations)' == 'true'" Include="@(TargetGroups)">
|
||||
<IsAot>$([System.String]::new('%(Identity)').Contains('aot'))</IsAot>
|
||||
|
Reference in New Issue
Block a user