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

@@ -1,14 +1,6 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. -->
<!-- There are situations where the live .Net Native targeting pack wouldn't be suitable to pick up.
These are usually temporary, but requires 'freezing' the .net native targeting pack on CoreFX.
Use the property below to control this behavior
-->
<PropertyGroup>
<DisableProjectNTfsAutoUpgrade Condition="'$(DisableProjectNTfsAutoUpgrade)'==''">false</DisableProjectNTfsAutoUpgrade>
</PropertyGroup>
<!-- For detailed explanation of the reference versions see:
https://github.com/dotnet/buildtools/blob/master/Documentation/project-nuget-dependencies.md
@@ -17,31 +9,38 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>a09547edb94590bb09a4fd4878a1115e3e40c701</CoreFxCurrentRef>
<CoreClrCurrentRef>511f00e5ec0ce46799550a8e76d810a54806501d</CoreClrCurrentRef>
<ExternalCurrentRef>3b8a99621d89ad9877f053ba8af25e0f25dcd9d8</ExternalCurrentRef>
<ProjectNTfsCurrentRef>b19dba92f5c43b2a6692f743ecb2beca6af2ef7a</ProjectNTfsCurrentRef>
<SniCurrentRef>05650e53f2aa4497f74cd6e9b053d3f69f64b0bd</SniCurrentRef>
<StandardCurrentRef>b19dba92f5c43b2a6692f743ecb2beca6af2ef7a</StandardCurrentRef>
<CoreFxCurrentRef>02d899e8f3e71a4f5afbd1412aeac387e12ce973</CoreFxCurrentRef>
<CoreClrCurrentRef>1621e635efcf0a895866e654db357eb3d44ad650</CoreClrCurrentRef>
<CoreSetupCurrentRef>82fc1fc68bfa1d55e43913b188868879f31de8e7</CoreSetupCurrentRef>
<ExternalCurrentRef>5a0606fccb09fce4b47545ae9896139acca547f5</ExternalCurrentRef>
<ProjectNTfsCurrentRef>02d899e8f3e71a4f5afbd1412aeac387e12ce973</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>02d899e8f3e71a4f5afbd1412aeac387e12ce973</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>97059fa979a3c8fb8b9fba127c526f15e48c9dde</SniCurrentRef>
<StandardCurrentRef>02d899e8f3e71a4f5afbd1412aeac387e12ce973</StandardCurrentRef>
</PropertyGroup>
<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>beta-25122-02</CoreFxExpectedPrerelease>
<CoreClrExpectedPrerelease>beta-25123-07</CoreClrExpectedPrerelease>
<ExternalExpectedPrerelease>beta-25016-01</ExternalExpectedPrerelease>
<ProjectNTfsExpectedPrerelease>beta-25123-00</ProjectNTfsExpectedPrerelease>
<NETStandardPackageVersion>2.0.0-beta-25123-01</NETStandardPackageVersion>
<PlatformPackageVersion>2.1.0-preview1-25324-02</PlatformPackageVersion>
<CoreFxExpectedPrerelease>preview1-25406-02</CoreFxExpectedPrerelease>
<CoreClrPackageVersion>2.1.0-preview1-25407-01</CoreClrPackageVersion>
<ExternalExpectedPrerelease>beta-25322-00</ExternalExpectedPrerelease>
<ProjectNTfsExpectedPrerelease>beta-25406-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-25406-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-25406-00</ProjectNTfsTestILCPackageVersion>
<NETStandardPackageVersion>2.1.0-preview1-25406-01</NETStandardPackageVersion>
<NETStandardPackageId>NETStandard.Library</NETStandardPackageId>
<MicrosoftNETCoreAppPackageVersion>2.1.0-preview1-25405-02</MicrosoftNETCoreAppPackageVersion>
<!-- Use the SNI runtime package -->
<SniPackageVersion>4.4.0-beta-25007-02</SniPackageVersion>
<SniPackageVersion>4.4.0-preview2-25312-01</SniPackageVersion>
</PropertyGroup>
<!-- Full package version strings that are used in other parts of the build. -->
<PropertyGroup>
<AppXRunnerVersion>1.0.3-prerelease-00921-01</AppXRunnerVersion>
<XunitPerfAnalysisPackageVersion>1.0.0-alpha-build0049</XunitPerfAnalysisPackageVersion>
<TraceEventPackageVersion>1.0.0-alpha-experimental</TraceEventPackageVersion>
<XunitPerfAnalysisPackageVersion>1.0.0-beta-build0007</XunitPerfAnalysisPackageVersion>
<TraceEventPackageVersion>1.0.3-alpha-experimental</TraceEventPackageVersion>
<XunitNetcoreExtensionsVersion>1.0.1-prerelease-01630-02</XunitNetcoreExtensionsVersion>
</PropertyGroup>
<!-- Package dependency verification/auto-upgrade configuration. -->
@@ -60,6 +59,10 @@
<BuildInfoPath>$(BaseDotNetBuildInfo)coreclr/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(CoreClrCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="CoreSetup">
<BuildInfoPath>$(BaseDotNetBuildInfo)core-setup/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(CoreSetupCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="External">
<BuildInfoPath>$(BaseDotNetBuildInfo)projectk-tfs/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(ExternalCurrentRef)</CurrentRef>
@@ -72,10 +75,14 @@
<BuildInfoPath>$(BaseDotNetBuildInfo)standard/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(StandardCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Condition="'$(DisableProjectNTfsAutoUpgrade)' != 'true'" Include="ProjectNTfs">
<RemoteDependencyBuildInfo Include="ProjectNTfs">
<BuildInfoPath>$(BaseDotNetBuildInfo)projectn-tfs/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(ProjectNTfsCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<RemoteDependencyBuildInfo Include="ProjectNTfsTestILC">
<BuildInfoPath>$(BaseDotNetBuildInfo)projectn-tfs-testilc/$(DependencyBranch)</BuildInfoPath>
<CurrentRef>$(ProjectNTfsTestILCCurrentRef)</CurrentRef>
</RemoteDependencyBuildInfo>
<DependencyBuildInfo Include="@(RemoteDependencyBuildInfo)">
<RawVersionsBaseUrl>https://raw.githubusercontent.com/dotnet/versions</RawVersionsBaseUrl>
@@ -86,10 +93,15 @@
<ElementName>CoreFxExpectedPrerelease</ElementName>
<BuildInfoName>CoreFx</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="CoreFx">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>PlatformPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.Platforms</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Include="CoreClr">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>CoreClrExpectedPrerelease</ElementName>
<BuildInfoName>CoreClr</BuildInfoName>
<ElementName>CoreClrPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Include="External">
<Path>$(MSBuildThisFileFullPath)</Path>
@@ -101,21 +113,35 @@
<ElementName>NETStandardPackageVersion</ElementName>
<PackageId>$(NETStandardPackageId)</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Condition="'$(DisableProjectNTfsAutoUpgrade)' != 'true'" Include="ProjectNTfs">
<XmlUpdateStep Include="ProjectNTfs">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>ProjectNTfsExpectedPrerelease</ElementName>
<BuildInfoName>ProjectNTfs</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="ProjectNTfsTestILC">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>ProjectNTfsTestILCExpectedPrerelease</ElementName>
<BuildInfoName>ProjectNTfsTestILC</BuildInfoName>
</XmlUpdateStep>
<XmlUpdateStep Include="ProjectNTfsTestILC">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>ProjectNTfsTestILCPackageVersion</ElementName>
<PackageId>TestILC.amd64ret</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Include="Sni">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>SniPackageVersion</ElementName>
<!-- Pick any of the SNI runtime packages. All the runtime packages of sni will have the same version -->
<PackageId>runtime.win7-x64.runtime.native.System.Data.SqlClient.sni</PackageId>
<PackageId>runtime.win-x64.runtime.native.System.Data.SqlClient.sni</PackageId>
</XmlUpdateStep>
<XmlUpdateStep Include="CoreSetup">
<Path>$(MSBuildThisFileFullPath)</Path>
<ElementName>MicrosoftNETCoreAppPackageVersion</ElementName>
<PackageId>Microsoft.NETCore.App</PackageId>
</XmlUpdateStep>
</ItemGroup>
<PropertyGroup>
<XUnitPackageVersion>2.2.0-beta4-build3444</XUnitPackageVersion>
<XUnitPackageVersion>2.3.0-beta1-build3642</XUnitPackageVersion>
</PropertyGroup>
<!-- Set up dependencies on packages that aren't found in a BuildInfo. -->
@@ -142,7 +168,7 @@
</StaticDependency>
<StaticDependency Include="Microsoft.xunit.netcore.extensions;Microsoft.DotNet.BuildTools.TestSuite">
<Version>1.0.1-prerelease-01401-04</Version>
<Version>$(XunitNetcoreExtensionsVersion)</Version>
</StaticDependency>
<PerformancePackDependency Include="xunit.performance.core" />
@@ -164,8 +190,6 @@
</DependencyBuildInfo>
<!-- project.json files to update -->
<ProjectJsonFiles Include="external\**\project.json" />
<ProjectJsonFiles Include="external\**\project.json.template" />
<ProjectJsonFiles Include="$(MSBuildThisFileDirectory)external\**\optional.json" />
</ItemGroup>
</Project>