Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -2,33 +2,11 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$(MSBuildProjectName).props" />
<ItemGroup>
<!-- identity project, runtime specific projects are included by props above -->
<!-- identity project, runtime specific projects are included through netcoreapp.rids.props -->
<Project Include="$(MSBuildProjectName).pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
<PropertyGroup>
<TraversalBuildDependsOn>
FilterProjects;
$(TraversalBuildDependsOn);
</TraversalBuildDependsOn>
</PropertyGroup>
<Target Name="FilterProjects">
<Error Condition="'$(PackageRID)' == ''" Text="'PackageRID' property must be specified."/>
<!-- Only build packages for current RID -->
<ItemGroup>
<_projectsToBuild Include="@(Project)" Condition="'%(Project.PackageTargetRuntime)' == '$(PackageRID)' OR '%(Project.PackageTargetRuntime)' == ''" />
</ItemGroup>
<ItemGroup>
<Project Remove="@(Project)" />
<Project Include="@(_projectsToBuild)" />
</ItemGroup>
</Target>
</Project>

View File

@ -2,132 +2,53 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<Import Project="$(MSBuildProjectName).props" />
<!-- Add path globs specific to native binaries to exclude unnecessary files from packages. -->
<Choose>
<When Condition="$(PackageTargetRuntime.StartsWith('win'))"/>
<When Condition="$(PackageTargetRuntime.StartsWith('osx'))">
<PropertyGroup>
<LibraryFileExtension>.dylib</LibraryFileExtension>
<SymbolFileExtension>.dwarf</SymbolFileExtension>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<LibraryFileExtension>.so</LibraryFileExtension>
<SymbolFileExtension>.dbg</SymbolFileExtension>
</PropertyGroup>
</Otherwise>
</Choose>
<ItemGroup>
<AdditionalLibPackageExcludes Condition="'$(SymbolFileExtension)' != ''" Include="%2A%2A\%2A$(SymbolFileExtension)" />
<AdditionalSymbolPackageExcludes Condition="'$(LibraryFileExtension)' != ''" Include="%2A%2A\%2A.a;%2A%2A\%2A$(LibraryFileExtension)" />
</ItemGroup>
<PropertyGroup>
<IsLineupPackage Condition="'$(PackageTargetRuntime)' == ''">true</IsLineupPackage>
<PreventImplementationReference Condition="'$(PackageTargetRuntime)' != ''">true</PreventImplementationReference>
<TargetFrameworkName>netcoreapp</TargetFrameworkName>
<TargetFrameworkVersion>2.0</TargetFrameworkVersion>
<TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<RefBinDir>$(NETCoreAppPackageRefPath)</RefBinDir>
<LibBinDir>$(NETCoreAppPackageRuntimePath)</LibBinDir>
<NETStandardLibraryPackage>NETStandard.Library2</NETStandardLibraryPackage>
<NETStandardLibraryPackageVersion>2.0.0-beta-24709-0</NETStandardLibraryPackageVersion>
<NETStandardVersion>2.0</NETStandardVersion>
<IsFrameworkPackage>true</IsFrameworkPackage>
<!-- Include symbols in package by default-->
<!-- Private packages need symbols -->
<IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
</PropertyGroup>
<Import Condition="'$(PackageTargetRuntime)' == ''" Project="$(RefBinDir)\*.props" />
<ItemGroup Condition="'$(PackageTargetRuntime)' == ''">
<!-- Include refs -->
<File Include="@(FileToPackage)">
<TargetPath Condition="'%(File.TargetPath)' == ''">ref/$(TargetFramework)</TargetPath>
</File>
<!-- force a missing file if ref build is absent -->
<File Include="$(RefBinDir)/MISSING_REF_BUILD" Condition="'@(FileToPackage)' == ''" />
<_buildRIDWithMetadata Include="@(BuildRID)">
<TargetRuntime>%(Identity)</TargetRuntime>
<Version>$(PackageVersion)</Version>
</_buildRIDWithMetadata>
<Dependency Include="@(_buildRIDWithMetadata->'runtime.%(Identity).$(Id)')" />
<Dependency Include="Microsoft.NETCore.Platforms">
<Version>$(PlatformPackageVersion)</Version>
</Dependency>
</ItemGroup>
<Import Condition="'$(PackageTargetRuntime)' != ''" Project="$(LibBinDir)\*.props" />
<ItemGroup Condition="'$(PackageTargetRuntime)' != ''">
<!-- Include lib -->
<File Include="@(FileToPackage)">
<TargetPath Condition="'%(File.TargetPath)' == ''">runtimes/$(PackageTargetRuntime)/lib/$(TargetFramework)</TargetPath>
</File>
<!-- force a missing file if lib build is absent -->
<File Include="$(LibBinDir)/MISSING_LIB_BUILD" Condition="'@(FileToPackage)' == ''" />
<!-- Include native -->
<ExcludeNative Include="$(NativeBinDir)/*.lib" />
<NativeFile Include="$(NativeBinDir)/*.*" Exclude="@(ExcludeNative)">
<TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath>
</NativeFile>
<File Include="@(NativeFile)" />
<!-- force a missing file if native build is absent -->
<File Include="$(NativeBinDir)/MISSING_NATIVE_BUILD" Condition="'@(NativeFile)' == ''" />
</ItemGroup>
<ItemGroup>
<IgnoredReference Include="System.Private.CoreLib" />
<!-- Exclude shims from the closure verification -->
<ExcludeFromClosure Include="mscorlib" />
<ExcludeFromClosure Include="System" />
<ExcludeFromClosure Include="System.Configuration" />
<ExcludeFromClosure Include="System.Core" />
<ExcludeFromClosure Include="System.Data" />
<ExcludeFromClosure Include="System.Drawing" />
<ExcludeFromClosure Include="System.Net" />
<ExcludeFromClosure Include="System.Security" />
<ExcludeFromClosure Include="System.ServiceProcess" />
<ExcludeFromClosure Include="System.Transactions" />
<ExcludeFromClosure Include="WindowsBase" />
<!-- Permit the following implementation-only assemblies -->
<ValidatePackageSuppression Condition="'$(PackageTargetRuntime)' != ''" Include="PermitInbox">
<Value>
Microsoft.VisualBasic;
Microsoft.Win32.Registry;
System.IO.FileSystem.AccessControl;
System.Private.DataContractSerialization;
System.Private.Uri;
System.Private.Xml;
System.Private.Xml.Linq;
System.Security.AccessControl;
System.Security.Cryptography.Cng;
System.Security.Cryptography.OpenSsl;
System.Security.Principal.Windows;
</Value>
</ValidatePackageSuppression>
</ItemGroup>
<Target Name="VerifyClosure" AfterTargets="Build">
<ItemGroup>
<!-- Exclude shims from the closure verification -->
<ExcludeFromClosure Include="mscorlib" />
<ExcludeFromClosure Include="System" />
<ExcludeFromClosure Include="System.Core" />
<ExcludeFromClosure Include="System.Data" />
</ItemGroup>
<ItemGroup>
<_fileExisting Include="@(File)" Condition="Exists(%(FullPath))"/>
<_fileNames Include="@(_fileExisting -> '%(FileName)')" Exclude="@(ExcludeFromClosure)">
<Original>%(_fileExisting.Identity)</Original>
</_fileNames>
<_filesFiltered Include="@(_fileNames->'%(Original)')" />
</ItemGroup>
<VerifyClosure Sources="@(_filesFiltered)"
IgnoredReferences="@(IgnoredReference)" />
</Target>
<Target Name="VerifyNETStandard" AfterTargets="Build">
<ItemGroup>
<_NETStandardFile Include="$(PackagesDir)$(NETStandardLibraryPackage)\$(NETStandardLibraryPackageVersion)\ref\netstandard$(NETStandardVersion)\*.dll" />
<_NETStandardMissingFile Include="@(_NETStandardFile->'%(FileName)')" Exclude="@(File->'%(FileName)')" />
<_NETStandardMissingFileError Include="@(_NETStandardMissingFile)" Exclude="@(SuppressNETStandardMissingFile)" />
<_NETStandardSuppressedMissingFile Include="@(_NETStandardMissingFile)" Exclude="@(_NETStandardMissingFileError)" />
</ItemGroup>
<Message Condition="'@(_NETStandardSuppressedMissingFile)' != ''" Text="Files'@(_NETStandardSuppressedMissingFile)' are part of '$(NETStandardLibraryPackage)' but missing from this package. This error has been suppressed." />
<Error Condition="'@(_NETStandardMissingFileError)' != ''" Text="Files '@(_NETStandardMissingFileError)' are part of '$(NETStandardLibraryPackage)' but missing from this package." />
</Target>
<Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles">
<ItemGroup>
<File>
<IsSymbolFile Condition="'%(Extension)' == '.pdb'">true</IsSymbolFile>
<IsSymbolFile Condition="'$(SymbolFileExtension)' != '' AND'%(Extension)' == '$(SymbolFileExtension)'">true</IsSymbolFile>
</File>
</ItemGroup>
</Target>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

View File

@ -1,91 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex>
<_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
</PropertyGroup>
<Choose>
<When Condition="'$(PackageRID)' != ''" />
<When Condition="'$(_runtimeOSFamily)' == 'win'">
<PropertyGroup>
<PackageRID Condition="'$(ArchGroup)' == 'x86' OR '$(ArchGroup)' == 'x64'">win7-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(ArchGroup)' == 'arm'">win8-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(ArchGroup)' == 'arm64'">win10-$(ArchGroup)</PackageRID>
</PropertyGroup>
</When>
<When Condition="'$(_runtimeOSFamily)' == 'osx'">
<PropertyGroup>
<PackageRID>osx.10.12-$(ArchGroup)</PackageRID>
</PropertyGroup>
</When>
<When Condition="'$(_runtimeOSFamily)' == 'rhel'">
<PropertyGroup>
<PackageRID>rhel.7-$(ArchGroup)</PackageRID>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID>
</PropertyGroup>
</Otherwise>
</Choose>
<ItemGroup>
<OfficialBuildRID Include="alpine.3.4.3-x64" />
<OfficialBuildRID Include="debian.8-armel">
<Platform>armel</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="debian.8-x64" />
<OfficialBuildRID Include="fedora.23-x64" />
<OfficialBuildRID Include="fedora.24-x64" />
<OfficialBuildRID Include="linux-x64" />
<OfficialBuildRID Include="opensuse.13.2-x64" />
<OfficialBuildRID Include="opensuse.42.1-x64" />
<OfficialBuildRID Include="osx.10.12-x64" />
<OfficialBuildRID Include="rhel.7-x64" />
<OfficialBuildRID Include="tizen.4.0.0-armel">
<Platform>armel</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="ubuntu.14.04-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="ubuntu.14.04-x64" />
<OfficialBuildRID Include="ubuntu.16.04-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="ubuntu.16.04-x64" />
<OfficialBuildRID Include="ubuntu.16.10-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="ubuntu.16.10-x64" />
<OfficialBuildRID Include="win7-x86">
<Platform>x86</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="win7-x64" />
<OfficialBuildRID Include="win8-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="win10-arm64">
<Platform>arm64</Platform>
</OfficialBuildRID>
<!-- Ensure we have a RID-specific package for the current build, even if it isn't in our official set -->
<BuildRID Include="@(OfficialBuildRID)" Exclude="$(PackageRID)"/>
<BuildRID Include="$(PackageRID)">
<Platform Condition="'$(ArchGroup)' == 'x64'">amd64</Platform>
<Platform Condition="'$(ArchGroup)' != 'x64'">$(ArchGroup)</Platform>
</BuildRID>
</ItemGroup>
<ItemGroup>
<_project Include="@(BuildRID)">
<Platform Condition="'%(Platform)' == ''">amd64</Platform>
<PackageTargetRuntime>%(Identity)</PackageTargetRuntime>
<AdditionalProperties>PackageTargetRuntime=%(Identity);Platform=%(Platform)</AdditionalProperties>
</_project>
<Project Include="@(_project->'$(MSBuildProjectName).pkgproj')" />
</ItemGroup>
</Project>

View File

@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(PortableBuild)' == 'true'">
<PackageRID>linux-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(_runtimeOSFamily)' == 'osx'">osx-$(ArchGroup)</PackageRID>
<PackageRID Condition="'$(_runtimeOSFamily)' == 'win'">win-$(ArchGroup)</PackageRID>
</PropertyGroup>
<PropertyGroup Condition="'$(PortableBuild)' != 'true'">
<PackageRID>$(RuntimeOS)-$(ArchGroup)</PackageRID>
</PropertyGroup>
<ItemGroup>
<OfficialBuildRID Include="linux-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="linux-x64" />
<OfficialBuildRID Include="osx-x64" />
<OfficialBuildRID Include="win-arm">
<Platform>arm</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="win-arm64">
<Platform>arm64</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="win-x64" />
<OfficialBuildRID Include="win-x86">
<Platform>x86</Platform>
</OfficialBuildRID>
<!-- The following RIDs are not officically supported and are not
built during official builds, however we wish to include them
in our runtime.json to enable others to provide them. -->
<OfficialBuildRID Include="tizen.4.0.0-armel">
<Platform>armel</Platform>
</OfficialBuildRID>
</ItemGroup>
</Project>