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

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<BuildConfigurations>
netstandard;
</BuildConfigurations>
</PropertyGroup>
</Project>

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<ItemGroup Condition="'$(BuildingAnOfficialBuildLeg)' != 'true' Or '$(BuildAllConfigurations)' == 'true'">
<Project Include="Microsoft.NETCore.Platforms.Future.pkgproj" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
<PackageVersion>3.0.0</PackageVersion>
<SkipValidatePackage>true</SkipValidatePackage>
<!-- We don't need to harvest the stable packages to build this -->
<HarvestStablePackage>false</HarvestStablePackage>
</PropertyGroup>
<ItemGroup>
<File Include="runtime.json" />
<!-- make this package installable and noop in a packages.config-based project -->
<File Include="$(PlaceHolderFile)">
<TargetPath>lib/netstandard1.0</TargetPath>
</File>
<ProjectReference Include="..\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.pkgproj" />
</ItemGroup>
<Import Project="runtimeGroups.props" />
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
</Project>

View File

@@ -0,0 +1 @@
see ..\Microsoft.NETCore.Platforms\readme.md

View File

@@ -0,0 +1,15 @@
{
"unix-wasm": [
"unix-wasm"
],
"webassembly": [
"webassembly",
"unix"
],
"webassembly-wasm": [
"webassembly-wasm",
"webassembly",
"unix-wasm",
"unix"
]
}

View File

@@ -0,0 +1,18 @@
{
"runtimes": {
"unix-wasm": {
"#import": []
},
"webassembly": {
"#import": [
"unix"
]
},
"webassembly-wasm": {
"#import": [
"webassembly",
"unix-wasm"
]
}
}
}

View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<RuntimeGroup Include="unix">
<Architectures>wasm</Architectures>
<!-- don't generate the archiecture-less RID -->
<OmitRIDs>unix</OmitRIDs>
</RuntimeGroup>
<RuntimeGroup Include="webassembly">
<Parent>unix</Parent>
<Architectures>wasm</Architectures>
</RuntimeGroup>
</ItemGroup>
<Target Name="GenerateRuntimeJson" BeforeTargets="CreatePackage">
<!-- Generates a Runtime graph using RuntimeGroups and diffs it with the graph described by runtime.json and runtime.compatibility.json
Specifying UpdateRuntimeFiles=true skips the diff and updates those files.
The graph can be visualized using the generated dmgl -->
<MakeDir Directories="$(PackageReportDir)" />
<GenerateRuntimeGraph RuntimeGroups="@(RuntimeGroup)"
RuntimeJson="runtime.json"
ExternalRuntimeJsons="..\Microsoft.NETCore.Platforms\runtime.json"
CompatibilityMap="runtime.compatibility.json"
RuntimeDirectedGraph="$(PackageReportDir)$(Id)$(NuspecSuffix)-runtime.json.dgml"
UpdateRuntimeFiles="$(UpdateRuntimeFiles)" />
</Target>
</Project>

View File

@@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<PackageVersion>2.1.0</PackageVersion>
<PackageVersion>2.2.0</PackageVersion>
<SkipValidatePackage>true</SkipValidatePackage>
<!-- We don't need to harvest the stable packages to build this -->
<HarvestStablePackage>false</HarvestStablePackage>

View File

@@ -1 +1 @@
b6552464639042b51b931dba020c7957f73ae840
6b8e53c33c8b2f8109e42b46a87bf39e91893c97

View File

@@ -632,6 +632,31 @@
"fedora-x64-corert"
]
},
"fedora.29": {
"#import": [
"fedora"
]
},
"fedora.29-corert": {
"#import": [
"fedora.29",
"fedora-corert"
]
},
"fedora.29-x64": {
"#import": [
"fedora.29",
"fedora-x64"
]
},
"fedora.29-x64-corert": {
"#import": [
"fedora.29-corert",
"fedora.29-x64",
"fedora.29",
"fedora-x64-corert"
]
},
"gentoo": {
"#import": [
"linux"
@@ -1222,6 +1247,62 @@
"ol.7.3-x64-corert"
]
},
"ol.7.5": {
"#import": [
"ol.7.4",
"rhel.7.5"
]
},
"ol.7.5-corert": {
"#import": [
"ol.7.5",
"ol.7.4-corert",
"rhel.7.5-corert"
]
},
"ol.7.5-x64": {
"#import": [
"ol.7.5",
"ol.7.4-x64",
"rhel.7.5-x64"
]
},
"ol.7.5-x64-corert": {
"#import": [
"ol.7.5-corert",
"ol.7.5-x64",
"ol.7.5",
"ol.7.4-x64-corert"
]
},
"ol.7.6": {
"#import": [
"ol.7.5",
"rhel.7.6"
]
},
"ol.7.6-corert": {
"#import": [
"ol.7.6",
"ol.7.5-corert",
"rhel.7.6-corert"
]
},
"ol.7.6-x64": {
"#import": [
"ol.7.6",
"ol.7.5-x64",
"rhel.7.6-x64"
]
},
"ol.7.6-x64-corert": {
"#import": [
"ol.7.6-corert",
"ol.7.6-x64",
"ol.7.6",
"ol.7.5-x64-corert"
]
},
"opensuse": {
"#import": [
"linux"
@@ -1470,6 +1551,31 @@
"osx.10.12-x64-corert"
]
},
"osx.10.14": {
"#import": [
"osx.10.13"
]
},
"osx.10.14-corert": {
"#import": [
"osx.10.14",
"osx.10.13-corert"
]
},
"osx.10.14-x64": {
"#import": [
"osx.10.14",
"osx.10.13-x64"
]
},
"osx.10.14-x64-corert": {
"#import": [
"osx.10.14-corert",
"osx.10.14-x64",
"osx.10.14",
"osx.10.13-x64-corert"
]
},
"rhel": {
"#import": [
"linux"
@@ -1669,6 +1775,56 @@
"rhel.7.3-x64-corert"
]
},
"rhel.7.5": {
"#import": [
"rhel.7.4"
]
},
"rhel.7.5-corert": {
"#import": [
"rhel.7.5",
"rhel.7.4-corert"
]
},
"rhel.7.5-x64": {
"#import": [
"rhel.7.5",
"rhel.7.4-x64"
]
},
"rhel.7.5-x64-corert": {
"#import": [
"rhel.7.5-corert",
"rhel.7.5-x64",
"rhel.7.5",
"rhel.7.4-x64-corert"
]
},
"rhel.7.6": {
"#import": [
"rhel.7.5"
]
},
"rhel.7.6-corert": {
"#import": [
"rhel.7.6",
"rhel.7.5-corert"
]
},
"rhel.7.6-x64": {
"#import": [
"rhel.7.6",
"rhel.7.5-x64"
]
},
"rhel.7.6-x64-corert": {
"#import": [
"rhel.7.6-corert",
"rhel.7.6-x64",
"rhel.7.6",
"rhel.7.5-x64-corert"
]
},
"sles": {
"#import": [
"linux"
@@ -1817,6 +1973,19 @@
"linux-corert"
]
},
"tizen-x86": {
"#import": [
"tizen",
"linux-x86"
]
},
"tizen-x86-corert": {
"#import": [
"tizen-corert",
"tizen-x86",
"linux-x86-corert"
]
},
"tizen.4.0.0": {
"#import": [
"tizen"
@@ -1842,6 +2011,59 @@
"tizen-corert"
]
},
"tizen.4.0.0-x86": {
"#import": [
"tizen.4.0.0",
"tizen-x86"
]
},
"tizen.4.0.0-x86-corert": {
"#import": [
"tizen.4.0.0-corert",
"tizen.4.0.0-x86",
"tizen.4.0.0",
"tizen-x86-corert"
]
},
"tizen.5.0.0": {
"#import": [
"tizen.4.0.0"
]
},
"tizen.5.0.0-armel": {
"#import": [
"tizen.5.0.0",
"tizen.4.0.0-armel"
]
},
"tizen.5.0.0-armel-corert": {
"#import": [
"tizen.5.0.0-corert",
"tizen.5.0.0-armel",
"tizen.5.0.0",
"tizen.4.0.0-armel-corert"
]
},
"tizen.5.0.0-corert": {
"#import": [
"tizen.5.0.0",
"tizen.4.0.0-corert"
]
},
"tizen.5.0.0-x86": {
"#import": [
"tizen.5.0.0",
"tizen.4.0.0-x86"
]
},
"tizen.5.0.0-x86-corert": {
"#import": [
"tizen.5.0.0-corert",
"tizen.5.0.0-x86",
"tizen.5.0.0",
"tizen.4.0.0-x86-corert"
]
},
"ubuntu": {
"#import": [
"debian"
@@ -2452,6 +2674,73 @@
"ubuntu-x86-corert"
]
},
"ubuntu.18.10": {
"#import": [
"ubuntu"
]
},
"ubuntu.18.10-arm": {
"#import": [
"ubuntu.18.10",
"ubuntu-arm"
]
},
"ubuntu.18.10-arm-corert": {
"#import": [
"ubuntu.18.10-corert",
"ubuntu.18.10-arm",
"ubuntu.18.10",
"ubuntu-arm-corert"
]
},
"ubuntu.18.10-arm64": {
"#import": [
"ubuntu.18.10",
"ubuntu-arm64"
]
},
"ubuntu.18.10-arm64-corert": {
"#import": [
"ubuntu.18.10-corert",
"ubuntu.18.10-arm64",
"ubuntu.18.10",
"ubuntu-arm64-corert"
]
},
"ubuntu.18.10-corert": {
"#import": [
"ubuntu.18.10",
"ubuntu-corert"
]
},
"ubuntu.18.10-x64": {
"#import": [
"ubuntu.18.10",
"ubuntu-x64"
]
},
"ubuntu.18.10-x64-corert": {
"#import": [
"ubuntu.18.10-corert",
"ubuntu.18.10-x64",
"ubuntu.18.10",
"ubuntu-x64-corert"
]
},
"ubuntu.18.10-x86": {
"#import": [
"ubuntu.18.10",
"ubuntu-x86"
]
},
"ubuntu.18.10-x86-corert": {
"#import": [
"ubuntu.18.10-corert",
"ubuntu.18.10-x86",
"ubuntu.18.10",
"ubuntu-x86-corert"
]
},
"unix": {
"#import": [
"any"

View File

@@ -43,7 +43,7 @@
<RuntimeGroup Include="fedora">
<Parent>linux</Parent>
<Architectures>x64</Architectures>
<Versions>23;24;25;26;27;28</Versions>
<Versions>23;24;25;26;27;28;29</Versions>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>
@@ -72,7 +72,7 @@
<RuntimeGroup Include="ol">
<Parent>rhel</Parent>
<Architectures>x64</Architectures>
<Versions>7;7.0;7.1;7.2;7.3;7.4</Versions>
<Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6</Versions>
<ApplyVersionsToParent>true</ApplyVersionsToParent>
</RuntimeGroup>
@@ -87,7 +87,7 @@
<RuntimeGroup Include="osx">
<Parent>unix</Parent>
<Architectures>x64</Architectures>
<Versions>10.10;10.11;10.12;10.13</Versions>
<Versions>10.10;10.11;10.12;10.13;10.14</Versions>
</RuntimeGroup>
<!-- rhel 6 is independent -->
@@ -100,7 +100,7 @@
<RuntimeGroup Include="rhel">
<Parent>linux</Parent>
<Architectures>x64</Architectures>
<Versions>7;7.0;7.1;7.2;7.3;7.4</Versions>
<Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6</Versions>
</RuntimeGroup>
<RuntimeGroup Include="sles">
@@ -111,8 +111,8 @@
<RuntimeGroup Include="tizen">
<Parent>linux</Parent>
<Architectures>armel</Architectures>
<Versions>4.0.0</Versions>
<Architectures>x86;armel</Architectures>
<Versions>4.0.0;5.0.0</Versions>
</RuntimeGroup>
<RuntimeGroup Include="ubuntu">
@@ -124,7 +124,7 @@
<RuntimeGroup Include="ubuntu">
<Parent>debian</Parent>
<Architectures>x64;x86;arm;arm64</Architectures>
<Versions>16.04;16.10;17.04;17.10;18.04</Versions>
<Versions>16.04;16.10;17.04;17.10;18.04;18.10</Versions>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>

View File

@@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<PackageVersion>2.1.0</PackageVersion>
<PackageVersion>2.2.0</PackageVersion>
<SkipValidatePackage>true</SkipValidatePackage>
<!-- We don't need to harvest the stable packages to build this -->
<HarvestStablePackage>false</HarvestStablePackage>

View File

@@ -3,8 +3,9 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<PackageVersion>4.5.220</PackageVersion>
<TargetFrameworkName>netcoreapp</TargetFrameworkName>
<TargetFrameworkVersion>2.1</TargetFrameworkVersion>
<TargetFrameworkVersion>2.2</TargetFrameworkVersion>
<TargetFramework>$(TargetFrameworkName)$(TargetFrameworkVersion)</TargetFramework>
<RefBinDir>$(NETCoreAppPackageRefPath)</RefBinDir>

View File

@@ -28,5 +28,8 @@
<OfficialBuildRID Include="tizen.4.0.0-armel">
<Platform>armel</Platform>
</OfficialBuildRID>
<OfficialBuildRID Include="tizen.5.0.0-armel">
<Platform>armel</Platform>
</OfficialBuildRID>
</ItemGroup>
</Project>

View File

@@ -1 +1 @@
30def071acd452360aa3599aac24a11b186918af
672a8fa9fcab430df8874712c03d5594bf9bb065

View File

@@ -4,42 +4,24 @@
<PropertyGroup>
<PackageVersion>$(CompatibilityShimsPackageVersion)</PackageVersion>
<_ShimsLocationPath>$(BaseIntermediateOutputPath)shims/netcoreapp/facades/</_ShimsLocationPath>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
<SkipValidatePackage>true</SkipValidatePackage>
<OmitDependencies>true</OmitDependencies>
<HarvestStablePackage>false</HarvestStablePackage>
</PropertyGroup>
<ItemGroup>
<ShimsToInclude Include="mscorlib.dll" />
<ShimsToInclude Include="System.dll" />
<ShimsToInclude Include="System.Configuration.dll" />
<ShimsToInclude Include="System.Core.dll" />
<ShimsToInclude Include="System.Data.dll" />
<ShimsToInclude Include="System.Drawing.dll" />
<ShimsToInclude Include="System.Net.dll" />
<ShimsToInclude Include="System.Security.dll" />
<ShimsToInclude Include="System.ServiceModel.Web.dll" />
<ShimsToInclude Include="System.ServiceProcess.dll" />
<ShimsToInclude Include="System.Transactions.dll" />
<ShimsToInclude Include="WindowsBase.dll" />
<!-- We include placeholder files so that it is installable but takes the inbox shims in netcoreapp2.1 -->
<File Include="$(PlaceHolderFile)">
<TargetPath>/lib/netcoreapp2.1</TargetPath>
</File>
<File Include="$(PlaceHolderFile)">
<TargetPath>/ref/netcoreapp2.1</TargetPath>
</File>
<ProjectReference Include="..\..\src\shims\**\*.*proj"
Exclude="..\..\src\shims\ApiCompat.proj" />
</ItemGroup>
<Target Name="AddShimsToPackage"
BeforeTargets="GetPackageFiles">
<Error Text="Required facade: %(ShimsToInclude.Identity) was not found in $(_ShimsLocationPath)." Condition="!Exists('@(ShimsToInclude->'$(_ShimsLocationPath)%(Identity)')')" />
<ItemGroup>
<File Include="@(ShimsToInclude->'$(_ShimsLocationPath)%(Identity)')">
<TargetPath>/lib/netcoreapp2.0</TargetPath>
<SkipPackageFileCheck>true</SkipPackageFileCheck>
</File>
<!-- Include placeholder to be netstandard2.0 compatible -->
<File Include="$(PlaceHolderFile)">
<TargetPath>/lib/netstandard2.0</TargetPath>
</File>
</ItemGroup>
<Message Importance="Low" Text="Added: %(ShimsToInclude.Identity) to package." />
</Target>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>

View File

@@ -3,7 +3,8 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<PackageVersion>2.0.0</PackageVersion>
<HarvestStablePackage>false</HarvestStablePackage>
<PackageVersion>2.0.1</PackageVersion>
<ServiceModelVersion>4.4.1</ServiceModelVersion>
</PropertyGroup>
@@ -70,12 +71,22 @@
</ItemGroup>
<ItemGroup>
<Dependency Include="@(LibraryPackage)" />
<Dependency Include="@(PrereleaseLibraryPackage)" />
<!-- The shims included in the shims package are only needed for netcoreapp2.0 since in newer frameworks they are included inbox.
In order to condition the shims package to an specific framework other dependencies need to specify their target framework. So
we need to include the dependencies with the supported frameworks and then we include the compatibility shims package only for 2.0 -->
<Dependency Include="@(LibraryPackage);@(PrereleaseLibraryPackage)">
<TargetFramework>netcoreapp2.0</TargetFramework>
</Dependency>
<Dependency Include="@(LibraryPackage);@(PrereleaseLibraryPackage)">
<TargetFramework>netcoreapp2.1</TargetFramework>
</Dependency>
<Dependency Include="@(LibraryPackage);@(PrereleaseLibraryPackage)">
<TargetFramework>netstandard2.0</TargetFramework>
</Dependency>
<!-- Include dependency to shims package -->
<Dependency Include="Microsoft.Windows.Compatibility.Shims">
<Version>$(CompatibilityShimsPackageVersion)</Version>
<TargetFramework>netcoreapp2.0</TargetFramework>
</Dependency>
</ItemGroup>

View File

@@ -63,6 +63,11 @@
"Description": "Provides runtime information required to resolve target framework, platform, and runtime specific implementations of .NETCore packages.",
"CommonTypes": []
},
{
"Name": "Microsoft.NETCore.Platforms.Future",
"Description": "Provides runtime information required to resolve target framework, platform, and runtime specific implementations of .NETCore packages. This package represents future platforms not yet supported in .NETCore stable release and is subject to change.",
"CommonTypes": []
},
{
"Name": "Microsoft.NETCore.Portable.Compatibility",
"Description": "Enables compatibility with portable libraries targeting previous .NET releases like .NET Framework 4.0 and Silverlight.\nThis package supports retargeting references to classic reference assemblies (mscorlib.dll, system.dll, etc) to new contract assemblies (System.Runtime.dll, System.IO, etc). It does this in a pay-for-play way to prevent consuming assemblies from having to reference all of the contracts that happen to overlap with mscorlib. As such, when using this package you may encounter errors like\n\terror CS0012: The type 'WebRequest' is defined in an assembly that is not referenced. You must add a reference to assembly 'System.Net.Requests, Version=0.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'.\nTo resolve these errors install the package with the same name as the missing assembly.",

View File

@@ -4,6 +4,6 @@
<!-- 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>
<RuntimeFrameworkVersion>2.1.0</RuntimeFrameworkVersion>
</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>
<!-- Enable targeting netcoreapp2.2 even in an older CLI -->
<NETCoreAppMaximumVersion>2.2</NETCoreAppMaximumVersion>
<!-- use the most recent MS.NETCore.App we have from upstack -->
<RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
</PropertyGroup>
</Project>