Imported Upstream version 6.0.0.172

Former-commit-id: f3cc9b82f3e5bd8f0fd3ebc098f789556b44e9cd
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-04-12 14:10:50 +00:00
parent 8016999e4d
commit 64ac736ec5
32155 changed files with 3981439 additions and 75368 deletions

View File

@@ -76,6 +76,9 @@
<BinPlaceConfiguration Condition="'$(BuildingNETCoreAppVertical)' == 'true'" Include="netcoreapp2.0">
<RefPath>$(RefRootPath)netcoreapp2.0/</RefPath>
</BinPlaceConfiguration>
<BinPlaceConfiguration Include="netcoreapp2.0-Windows_NT">
<RuntimePath>$(ShimsTargetRuntimeRoot)netcoreapp2.0/</RuntimePath>
</BinPlaceConfiguration>
<!-- some libraries that produce packages will remain targeting uap10.0.16299 -->
<BinPlaceConfiguration Condition="'$(BuildingUAPVertical)' == 'true' OR '$(BuildingUAPAOTVertical)' == 'true'" Include="uap10.0.16299">
<RefPath>$(RefRootPath)uap10.0.16299/</RefPath>
@@ -90,6 +93,15 @@
</BinPlaceConfiguration>
</ItemGroup>
<PropertyGroup Condition="'$(BlockStable)' == 'true'">
<!--
If BlockStable is set to true then always include the label and build number in the package version.
This needs to be set before we import packaging.targets which comes in the Build.Common.targets.
-->
<IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
<IncludeBuildNumberInPackageVersion>true</IncludeBuildNumberInPackageVersion>
</PropertyGroup>
<Import Project="$(ToolsDir)/Build.Common.targets" Condition="Exists('$(ToolsDir)/Build.Common.targets')" />
<!-- permit a wrapping build system to contribute targets to this build -->