Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions

View File

@@ -7,6 +7,7 @@
<ShouldVerifyTypes>true</ShouldVerifyTypes>
<!-- ensure that we get runtime assemblies in ReferenceCopyLocalPaths -->
<SelfContained>true</SelfContained>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
@@ -14,5 +15,9 @@
<!-- intentionally dangling refs in shims -->
<ExcludeFromClosure Include="@(NetFxReference)" />
<IgnoredReference Include="@(NetFxReference)" />
<!-- netstandard will have cycles because OOB packages target netstandard and are used in netstandard closure,
We do ensure that netstandard inside the shared framework has no cycles, but we permit them in packages in order to allow for simpler netstandard-based builds.-->
<IgnoredReference Include="netstandard" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition="'$(RuntimeIdentifier)' != ''">
<!-- NETCoreApp2.0 had experimental versions of Span and ReadOnlySpan
which we don't match the final API nor were they ship-quality -->
<IgnoredTypes Include="System.ReadOnlySpan`1" />
<IgnoredTypes Include="System.Span`1" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Enable targeting netcoreapp2.1 even in an older CLI -->
<NETCoreAppMaximumVersion>2.1</NETCoreAppMaximumVersion>
<!-- use the most recent MS.NETCore.App we have from upstack -->
<RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
</PropertyGroup>
</Project>

View File

@@ -1,7 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(ToolsDir)netfxreference.props" />
<PropertyGroup>
<ShouldVerifyClosure>true</ShouldVerifyClosure>
<ShouldVerifyTypes>true</ShouldVerifyTypes>
</PropertyGroup>
<ItemGroup>
<!-- intentionally dangling refs in shims -->
<ExcludeFromClosure Include="@(NetFxReference)" />
<IgnoredReference Include="@(NetFxReference)" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- This package will generate validation issues since we usually try to consume same-day packages from corefx that will have a higher
version than locally built packages. Validation will assume incorrectly that you are downgrading the reference which is why this error is flagged.
Since it isn't really an error, we will supress it in order to unblock same-day package ingestion. -->
<NoWarn>$(NoWarn);NU1605</NoWarn>
</PropertyGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- This package intentionally drops all runtime-package mappings from runtime.json -->
<ShouldVerifyClosure>false</ShouldVerifyClosure>
</PropertyGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- This package intentionally drops all runtime-package mappings from runtime.json -->
<ShouldVerifyClosure>false</ShouldVerifyClosure>
</PropertyGroup>
</Project>

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- This package will generate validation issues since we usually try to consume same-day packages from corefx that will have a higher
version than locally built packages. Validation will assume incorrectly that you are downgrading the reference which is why this error is flagged.
Since it isn't really an error, we will supress it in order to unblock same-day package ingestion. -->
<NoWarn>$(NoWarn);NU1605</NoWarn>
</PropertyGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- issue https://github.com/dotnet/corefx/issues/28551 -->
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- issue https://github.com/dotnet/corefx/issues/28551 -->
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- issue https://github.com/dotnet/corefx/issues/28551 -->
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- issue https://github.com/dotnet/corefx/issues/28551 -->
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- issue https://github.com/dotnet/corefx/issues/28551 -->
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- issue https://github.com/dotnet/corefx/issues/28551 -->
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- issue https://github.com/dotnet/corefx/issues/28551 -->
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- issue https://github.com/dotnet/corefx/issues/28551 -->
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- issue https://github.com/dotnet/corefx/issues/28551 -->
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<!-- issue https://github.com/dotnet/corefx/issues/28551 -->
<PackageReference Include="NETStandard.Library" Version="1.6.1" />
</ItemGroup>
</Project>

View File

@@ -8,6 +8,7 @@
</PropertyGroup>
<Import Project="tools\Packaging.common.targets" />
<Import Project="tools\dependencies.props" />
<Import Project="frameworkSettings\$(_targetFrameworkIdentifier)\*.targets" />
<Import Project="frameworkSettings\$(TargetFramework)\*.targets" />
<Import Project="packageSettings\$(TestPackageId)\*.targets" />
@@ -56,7 +57,7 @@
<Target Name="VerifyRuntimeClosure"
DependsOnTargets="ResolveReferences"
Condition="'$(ShouldVerifyClosure)' == 'true' AND '$(RuntimeIdentifier)' != '' AND '@(ReferenceCopyLocalPaths)' != ''">
Condition="'$(ShouldVerifyClosure)' == 'true' AND '$(RuntimeIdentifier)' != ''">
<ItemGroup>
<_runClosureFileNames Include="@(ReferenceCopyLocalPaths->'%(FileName)')">
<Original>%(Identity)</Original>
@@ -100,7 +101,7 @@
<Target Name="_test"
DependsOnTargets="$(TestDependsOn)">
<MakeDir Directories="$(IntermediateOutputPath)" />
<Touch AlwaysCreate="true" Files="$(IntermediateOutputPath)\.testComplete" />
<Touch AlwaysCreate="true" Files="$(IntermediateOutputPath)\$(RuntimeIdentifier).testComplete" />
</Target>
<Target Name="_getTestProjects">
@@ -112,7 +113,7 @@
<Semaphore>$(IntermediateOutputPath)\.testComplete</Semaphore>
</TestProject>
<TestProject Include="$(MSBuildProjectFullPath)">
<Semaphore>$(IntermediateOutputPath)\%(_projectRuntime.Identity)\.testComplete</Semaphore>
<Semaphore>$(IntermediateOutputPath)\%(_projectRuntime.Identity).testComplete</Semaphore>
<AdditionalProperties>RuntimeIdentifier=%(_projectRuntime.Identity)</AdditionalProperties>
</TestProject>
</ItemGroup>
@@ -125,4 +126,4 @@
Outputs="@(TestProject->'%(Semaphore)')">
<MSBuild Projects="@(TestProject)" Targets="_test" BuildInParallel="true" />
</Target>
</Project>
</Project>

View File

@@ -4,30 +4,37 @@
<ItemGroup>
<TestPackages Condition="'$(TestPackages)' != ''" Include="$(TestPackages)" />
<PackageReports Condition="'@(TestPackages)' == ''" Include="$(PackageReportDir)*.json" />
<ExcludePackages Include="CoreFx.Private.TestUtilities" />
<ExcludePackages Include="$(ExcludePackages)" />
<PackageReports Condition="'@(TestPackages)' == ''" Include="$(PackageReportDir)*.json" Exclude="@(ExcludePackages->'$(PackageReportDir)%(Identity).json')"/>
<PackageReports Condition="'@(TestPackages)' != ''" Include="@(TestPackages->'$(PackageReportDir)%(Identity).json')" />
<!-- support override via commandline -->
<RuntimesToInclude Condition="'$(RuntimesToInclude)' != ''" Include="$(RuntimesToInclude)" />
<TargetFrameworksToInclude Condition="'$(TargetFrameworksToInclude)' != ''" Include="$(TargetFrameworksToInclude)" />
<!-- restrict restore sources to the current build and publicly shipped packages -->
<RestoreSource Include="$(PackageOutputPath)" />
<RestoreSource Include="https:%2F%2Fapi.nuget.org/v3/index.json" />
<!-- needed for SQLClient's SNI packages -->
<RestoreSource Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<!-- ideally this would be first, but we need to list last to workaround https://github.com/NuGet/Home/issues/6678 -->
<RestoreSource Include="$(PackageOutputPath)" />
<!-- we don't build alpine or older OSX versions -->
<RuntimesToExclude Include="alpine.3.4.3-x64;osx.10.10-x64;osx.10.11-x64" />
<!-- no targeting pack was ever shipped for net463 -->
<TargetFrameworksToExclude Include="net463" />
<TargetFrameworksToExclude Include="net47" />
<!-- exclude netcoreapp2.2 in release branch for 2.1 -->
<TargetFrameworksToExclude Include="netcoreapp2.2" />
</ItemGroup>
<PropertyGroup>
<TestDir>$(PackageOutputPath)test/</TestDir>
<TestDir>$(BinDir)testPkg/</TestDir>
<TestProjectName>test.msbuild</TestProjectName>
<TestProject>$(TestDir)$(TestProjectName)</TestProject>
<TestToolsDir>$(TestDir)tools/</TestToolsDir>
@@ -50,12 +57,15 @@
</PropertyGroup>
<ItemGroup>
<TestSupportFiles Include="$(DotnetCliPath)\**\*.*">
<TestSupportFiles Include="$(DotnetCliPath)\**\*.*" Exclude="$(DotnetCliPath)\sdk\NuGetFallbackFolder\**\*.*">
<DestinationFolder>$(TestToolsDir)%(RecursiveDir)</DestinationFolder>
</TestSupportFiles>
<TestSupportFiles Include="$(SourceDir)shims\netfxreference.props">
<DestinationFolder>$(TestToolsDir)</DestinationFolder>
</TestSupportFiles>
<TestSupportFiles Include="$(ProjectDir)dependencies.props">
<DestinationFolder>$(TestToolsDir)</DestinationFolder>
</TestSupportFiles>
<TestSupportFiles Include="$(ToolsDir)Packaging.common.targets">
<DestinationFolder>$(TestToolsDir)</DestinationFolder>
</TestSupportFiles>
@@ -75,6 +85,12 @@
<DestinationFolder>$(TestDir)</DestinationFolder>
</TestSupportFiles>
</ItemGroup>
<ItemGroup>
<CliEnvironment Include="DOTNET_CLI_TELEMETRY_OPTOUT=1" />
<CliEnvironment Include="DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1" />
<CliEnvironment Include="DOTNET_MULTILEVEL_LOOKUP=0" />
</ItemGroup>
<Target Name="CreateTestDir"
Inputs="@(TestSupportFiles)"
@@ -155,16 +171,16 @@
<Target Name="RestoreProjects"
DependsOnTargets="GenerateProjects">
<Message Importance="High" Text="*** Restoring ***" />
<Exec Command="$(TestRestoreCommand) &quot;$(TestProject)&quot;" StandardOutputImportance="High" />
<Exec Command="$(TestRestoreCommand) &quot;$(TestProject)&quot;" EnvironmentVariables="@(CliEnvironment)" ContinueOnError="ErrorAndContinue" StandardOutputImportance="High" />
</Target>
<Target Name="BuildProjects"
DependsOnTargets="RestoreProjects">
<Message Importance="High" Text="*** Testing ***" />
<Exec Command="$(TestBuildCommand) &quot;$(TestProject)&quot; /p:TestPackages=%(SupportedPackage.Identity)" StandardOutputImportance="High" />
<Exec Command="$(TestBuildCommand) &quot;$(TestProject)&quot; /p:TestPackages=%(SupportedPackage.Identity)" EnvironmentVariables="@(CliEnvironment)" ContinueOnError="ErrorAndContinue" StandardOutputImportance="High" />
</Target>
<Target Name="Build" DependsOnTargets="BuildProjects" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
</Project>