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

@@ -1 +1 @@
2.1.0-rc1-02804-05
2.2.0-preview1-03415-02

View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<PreReleaseLabel Condition="'$(PackageVersionStamp)' != ''">$(PackageVersionStamp)</PreReleaseLabel>
<PreReleaseLabel Condition="'$(PreReleaseLabel)' == ''">rtm</PreReleaseLabel>
<PreReleaseLabel Condition="'$(PreReleaseLabel)' == ''">servicing</PreReleaseLabel>
<IncludePreReleaseLabelInPackageVersion Condition="'$(StabilizePackageVersion)' != 'true' or '$(PackageVersionStamp)' != ''">true</IncludePreReleaseLabelInPackageVersion>
<IncludeBuildNumberInPackageVersion Condition="'$(StabilizePackageVersion)' == 'true'">false</IncludeBuildNumberInPackageVersion>
<IncludeBuildNumberInPackageVersion Condition="'$(StabilizePackageVersion)' != 'true'">true</IncludeBuildNumberInPackageVersion>

View File

@@ -1,3 +1,3 @@
# Mono fork of .NET Core Libraries (CoreFX)
Tracking https://github.com/dotnet/corefx/tree/release/2.1 branch
Tracking https://github.com/dotnet/corefx/tree/release/2.2 branch

View File

@@ -29,9 +29,15 @@
<Import Project="$(ToolsDir)clean.targets" />
<PropertyGroup>
<TraversalBuildDependsOn>
<PrebuildSetupTargets>
GenerateConfigurationProperties;
CreateOrUpdateCurrentVersionFile;
CreateOrUpdateCurrentVersionFile
</PrebuildSetupTargets>
</PropertyGroup>
<PropertyGroup>
<TraversalBuildDependsOn>
$(PrebuildSetupTargets);
$(TraversalBuildDependsOn);
</TraversalBuildDependsOn>
</PropertyGroup>
@@ -42,7 +48,7 @@
<GenerateConfigurationProps Properties="@(Property)" PropertyValues="@(PropertyValue)" PropsFolder="$(BuildConfigurationFolder)" />
</Target>
<Target Name="Sync" DependsOnTargets="GenerateConfigurationProperties">
<Target Name="Sync" DependsOnTargets="$(PrebuildSetupTargets)">
<ItemGroup>
<ExternalProject Include="external\dir.proj" />
</ItemGroup>

View File

@@ -359,6 +359,7 @@
"continueOnError": true,
"displayName": "run end.sh",
"timeoutInMinutes": 0,
"condition": "always()",
"alwaysRun": true,
"task": {
"id": "10f1f9a1-74b0-47ab-87bf-e3c9c68e8b0d",

View File

@@ -359,6 +359,7 @@
"continueOnError": true,
"displayName": "run end.sh",
"timeoutInMinutes": 0,
"condition": "always()",
"alwaysRun": true,
"task": {
"id": "10f1f9a1-74b0-47ab-87bf-e3c9c68e8b0d",
@@ -486,7 +487,7 @@
"allowOverride": true
},
"PB_TargetQueue": {
"value": "Centos.73.Amd64+RedHat.73.Amd64+Debian.87.Amd64+Debian.90.Amd64+Debian.9.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+Ubuntu.1804.Amd64+opensuse.423.amd64+SLES.12.Amd64+Fedora.26.Amd64+Fedora.27.Amd64"
"value": "Centos.7.Amd64+RedHat.7.Amd64+Debian.8.Amd64+Debian.9.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+Ubuntu.1804.Amd64+opensuse.42.amd64+SLES.12.Amd64+Fedora.27.Amd64+Fedora.28.Amd64"
},
"PB_VsoAccountName": {
"value": "dn-bot"

View File

@@ -275,6 +275,7 @@
"continueOnError": true,
"displayName": "run end.sh",
"timeoutInMinutes": 0,
"condition": "always()",
"alwaysRun": true,
"task": {
"id": "10f1f9a1-74b0-47ab-87bf-e3c9c68e8b0d",

View File

@@ -299,6 +299,7 @@
"alwaysRun": true,
"displayName": "run end.ps1",
"timeoutInMinutes": 0,
"condition": "always()",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "2.*",

View File

@@ -350,6 +350,7 @@
"alwaysRun": true,
"displayName": "run end.ps1",
"timeoutInMinutes": 0,
"condition": "always()",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "2.*",

View File

@@ -149,6 +149,7 @@
"alwaysRun": true,
"displayName": "run end.ps1",
"timeoutInMinutes": 0,
"condition": "always()",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "2.*",

View File

@@ -298,6 +298,7 @@
"alwaysRun": true,
"displayName": "run end.ps1",
"timeoutInMinutes": 0,
"condition": "always()",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "2.*",

View File

@@ -144,6 +144,7 @@
"alwaysRun": true,
"displayName": "run end.ps1",
"timeoutInMinutes": 0,
"condition": "always()",
"task": {
"id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
"versionSpec": "2.*",

View File

@@ -1,5 +1,5 @@
These are the checked in build definitions used by BuildPipeline.
These are the checked-in build definitions used by BuildPipeline.
You may edit build steps, variables, and other artifacts of the definition directly to modify the BuildPipeline builds.
If you want to make major changes to these definitions such as adding / deleting build steps, or other major rewrites, chcosta has tools to assist with those changes and can provide guidance. It is important that we know what kinds of changes are being made to the build definitions so that we can invest in improviing those experiences.
If you want to make major changes to these definitions such as adding / deleting build steps or other major rewrites, chcosta has tools to assist with those changes and can provide guidance. It is important that we know what kinds of changes are being made to the build definitions so that we can invest in improving those experiences.

View File

@@ -47,7 +47,7 @@ simpleDockerNode('microsoft/dotnet-buildtools-prereqs:centos-6-376e1a3-201743110
// Get the user that should be associated with the submission
def helixCreator = getUser()
// Target queues
def targetHelixQueues = ['RedHat.69.Amd64.Open']
def targetHelixQueues = ['RedHat.6.Amd64.Open']
sh "LD_LIBRARY_PATH=/usr/local/lib ./Tools/msbuild.sh src/upload-tests.proj /p:ArchGroup=x64 /p:ConfigurationGroup=${params.CGroup} /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux /p:HelixJobType=test/functional/cli/ /p:HelixSource=${helixSource} /p:BuildMoniker=${helixBuild} /p:HelixCreator=${helixCreator} /p:CloudDropAccountName=dotnetbuilddrops /p:CloudResultsAccountName=dotnetjobresults /p:CloudDropAccessToken=\$CloudDropAccessToken /p:CloudResultsAccessToken=\$OutputCloudResultsAccessToken /p:HelixApiEndpoint=https://helix.dot.net/api/2017-04-14/jobs /p:TargetQueues=${targetHelixQueues.join('+')} /p:HelixLogFolder=${WORKSPACE}/${logFolder}/ /p:HelixCorrelationInfoFileName=SubmittedHelixRuns.txt"

View File

@@ -47,17 +47,17 @@ simpleDockerNode('microsoft/dotnet-buildtools-prereqs:rhel7_prereqs_2') {
// Get the user that should be associated with the submission
def helixCreator = getUser()
// Target queues
def targetHelixQueues = ['Centos.74.Amd64.Open',
'RedHat.74.Amd64.Open',
'Debian.87.Amd64.Open',
def targetHelixQueues = ['Centos.7.Amd64.Open',
'RedHat.7.Amd64.Open',
'Debian.8.Amd64.Open',
'Ubuntu.1404.Amd64.Open',
'Ubuntu.1604.Amd64.Open',
'Ubuntu.1804.Amd64.Open',
'OpenSuse.423.Amd64.Open',
'Fedora.26.Amd64.Open',]
'OpenSuse.42.Amd64.Open',
'Fedora.27.Amd64.Open',]
if (params.TestOuter) {
targetHelixQueues += ['Debian.9.Amd64.Open',
'Fedora.27.Amd64.Open',
'Fedora.28.Amd64.Open',
'SLES.12.Amd64.Open',]
}

View File

@@ -23,7 +23,7 @@
"PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -- /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
"PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -- /p:ArchiveTests=true /p:EnableDumpling=true",
"PB_SyncArguments": "-p -- /p:ArchGroup=x64 /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
"PB_TargetQueue": "Centos.73.Amd64+Centos.74.Amd64+RedHat.73.Amd64+RedHat.74.Amd64+Debian.87.Amd64+Debian.90.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+Ubuntu.1710.Amd64+Ubuntu.1804.Amd64+OpenSuse.423.Amd64+SLES.12.Amd64+Fedora.26.Amd64+Fedora.27.Amd64",
"PB_TargetQueue": "Centos.7.Amd64+RedHat.7.Amd64+RedHat.7.Amd64+Debian.8.Amd64+Debian.9.Amd64+Ubuntu.1404.Amd64+Ubuntu.1604.Amd64+Ubuntu.1804.Amd64+OpenSuse.42.Amd64+SLES.12.Amd64+Fedora.27.Amd64+Fedora.28.Amd64",
"PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux"
},
"ReportingParameters": {
@@ -39,7 +39,7 @@
"PB_BuildArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -stripSymbols -RuntimeOS=rhel.6 -- /p:PortableBuild=false /p:StabilizePackageVersion=$(PB_IsStable) /p:PackageVersionStamp=$(PB_VersionStamp)",
"PB_BuildTestsArguments": "-buildArch=x64 -$(PB_ConfigurationGroup) -SkipTests -Outerloop -RuntimeOS=rhel.6 -- /p:ArchiveTests=true /p:EnableDumpling=true /p:PortableBuild=false",
"PB_SyncArguments": "-p -RuntimeOS=rhel.6 -- /p:ArchGroup=x64 /p:PortableBuild=false /p:DotNetRestoreSources=$(PB_RestoreSource) /p:DotNetAssetRootUrl=$(PB_AssetRootUrl)",
"PB_TargetQueue": "RedHat.69.Amd64",
"PB_TargetQueue": "RedHat.6.Amd64",
"PB_CreateHelixArguments": "/p:ArchGroup=x64 /p:ConfigurationGroup=$(PB_ConfigurationGroup) /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Linux"
},
"ReportingParameters": {

View File

@@ -9,7 +9,7 @@
"OSGroup": {
"description": "Sets the OS for the BuildConfigurtation you want to build.",
"valueType": "property",
"values": ["Windows_NT", "Unix", "Linux", "OSX", "FreeBSD", "NetBSD"],
"values": ["Windows_NT", "Unix", "Linux", "OSX", "FreeBSD", "NetBSD", "WebAssembly"],
"defaultValue": "${OSName}"
},
"ConfigurationGroup": {
@@ -21,7 +21,7 @@
"ArchGroup": {
"description": "Sets the architecture for the BuildConfiguration you want to build.",
"valueType": "property",
"values": ["x64", "x86", "arm", "arm64"],
"values": ["x64", "x86", "arm", "arm64", "wasm"],
"defaultValue": "x64"
},
"BuildAllConfigurations": {
@@ -159,7 +159,7 @@
"BuildArchitecture": {
"description": "Sets the value of the build architecture.",
"valueType": "passThrough",
"values": ["x86", "arm", "armel", "x64", "arm64"],
"values": ["x86", "arm", "armel", "x64", "arm64", "wasm"],
"defaultValue": "${CPUArch}"
},
"CmakeBuildType": {

View File

@@ -208,10 +208,10 @@ function cross_build_corefx_with_docker {
# For armel Tizen, we are going to construct RootFS on the fly.
case $__linuxCodeName in
tizen)
__dockerImage=" hqueue/dotnetcore:ubuntu1404_cross_prereqs_v4-tizen_rootfs"
__dockerImage=" tizendotnet/dotnet-buildtools-prereqs:ubuntu-16.04-cross-e435274-20180426002255-tizen-rootfs-5.0m1"
__skipRootFS=1
__dockerEnvironmentVariables+=" -e ROOTFS_DIR=/crossrootfs/armel.tizen.build"
__runtimeOS="tizen.4.0.0"
__runtimeOS="tizen.5.0.0"
;;
*)
echo "ERROR: $__linuxCodeName is not a supported linux name for $__buildArch"

View File

@@ -51,7 +51,7 @@ if [ ! -d $TMPDIR ]; then
mkdir -p $TMPDIR
fi
TIZEN_URL=http://download.tizen.org/releases/daily/tizen
TIZEN_URL=http://download.tizen.org/releases/milestone/tizen
BUILD_XML=build.xml
REPOMD_XML=repomd.xml
PRIMARY_XML=primary.xml
@@ -157,20 +157,15 @@ fetch_tizen_pkgs()
Inform "Initialize base"
fetch_tizen_pkgs_init standard base
Inform "fetch common packages"
fetch_tizen_pkgs armv7l gcc glibc glibc-devel
fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu-devel
fetch_tizen_pkgs noarch linux-glibc-devel
Inform "fetch coreclr packages"
fetch_tizen_pkgs armv7l lldb lldb-devel libuuid libuuid-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel
fetch_tizen_pkgs armv7l lldb lldb-devel libuuid libuuid-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel tizen-release
Inform "fetch corefx packages"
fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel
fetch_tizen_pkgs armv7l libcom_err libcom_err-devel zlib zlib-devel libopenssl libopenssl-devel krb5 krb5-devel libcurl libcurl-devel
Inform "Initialize unified"
fetch_tizen_pkgs_init standard unified
Inform "fetch common packages"
fetch_tizen_pkgs armv7l libicu-devel
Inform "fetch coreclr packages"
fetch_tizen_pkgs armv7l tizen-release
Inform "fetch corefx packages"
fetch_tizen_pkgs armv7l gssdp gssdp-devel krb5 krb5-devel libcurl libcurl-devel
fetch_tizen_pkgs armv7l gssdp gssdp-devel

View File

@@ -9,15 +9,15 @@
These ref versions are pulled from https://github.com/dotnet/versions.
-->
<PropertyGroup>
<CoreFxCurrentRef>88565452637e4312f259161d5006ef24870858c7</CoreFxCurrentRef>
<CoreClrCurrentRef>88565452637e4312f259161d5006ef24870858c7</CoreClrCurrentRef>
<CoreSetupCurrentRef>88565452637e4312f259161d5006ef24870858c7</CoreSetupCurrentRef>
<CoreFxCurrentRef>077835c69ffeed87cc350b45f04a831900b1d680</CoreFxCurrentRef>
<CoreClrCurrentRef>077835c69ffeed87cc350b45f04a831900b1d680</CoreClrCurrentRef>
<CoreSetupCurrentRef>077835c69ffeed87cc350b45f04a831900b1d680</CoreSetupCurrentRef>
<ExternalCurrentRef>96dc7805f5df4a70a55783964ce69dcd91bfca80</ExternalCurrentRef>
<ProjectNTfsCurrentRef>ccd922b62227c43ed2dac6bcb737321dd2b07be0</ProjectNTfsCurrentRef>
<ProjectNTfsTestILCCurrentRef>ccd922b62227c43ed2dac6bcb737321dd2b07be0</ProjectNTfsTestILCCurrentRef>
<SniCurrentRef>8bd1ec5fac9f0eec34ff6b34b1d878b4359e02dd</SniCurrentRef>
<StandardCurrentRef>eff554f39ee29c9f2b470bf7755b83ceaaf2b1a1</StandardCurrentRef>
<BuildToolsCurrentRef>923fc4e4aade5e96f0ebdbd76edfa36dd0a2985c</BuildToolsCurrentRef>
<StandardCurrentRef>c520a2569b40fc53cf51e4f6970c3e7411adc173</StandardCurrentRef>
<BuildToolsCurrentRef>077835c69ffeed87cc350b45f04a831900b1d680</BuildToolsCurrentRef>
</PropertyGroup>
<!-- Product dependency versions. -->
@@ -31,24 +31,24 @@
<!-- Tests/infrastructure dependency versions. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>rtm-26508-03</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>2.1.0-rtm-26508-03</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.1.0-rtm-26508-04</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<CoreFxExpectedPrerelease>servicing-27110-04</CoreFxExpectedPrerelease>
<MicrosoftNETCorePlatformsPackageVersion>2.2.0</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCoreRuntimeCoreCLRPackageVersion>2.2.0-rtm-27110-04</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
<ProjectNTfsExpectedPrerelease>beta-26413-00</ProjectNTfsExpectedPrerelease>
<ProjectNTfsTestILCExpectedPrerelease>beta-26413-00</ProjectNTfsTestILCExpectedPrerelease>
<ProjectNTfsTestILCPackageVersion>1.0.0-beta-26413-00</ProjectNTfsTestILCPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>2.1.0-rtm-26508-02</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.1.0-rtm-26508-02</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.1.0-rtm-26508-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>2.2.0</MicrosoftNETCoreDotNetHostPackageVersion>
<MicrosoftNETCoreDotNetHostPolicyPackageVersion>2.2.0</MicrosoftNETCoreDotNetHostPolicyPackageVersion>
<MicrosoftNETCoreAppPackageVersion>2.2.0</MicrosoftNETCoreAppPackageVersion>
<!-- CoreFX-built SNI identity package -->
<RuntimeNativeSystemDataSqlClientSniPackageVersion>4.4.0</RuntimeNativeSystemDataSqlClientSniPackageVersion>
<AppXRunnerVersion>1.0.3-prerelease-00921-01</AppXRunnerVersion>
<XunitPerfAnalysisPackageVersion>1.0.0-beta-build0018</XunitPerfAnalysisPackageVersion>
<XunitPerfAnalysisPackageVersion>1.0.0-beta-build0019</XunitPerfAnalysisPackageVersion>
<TraceEventPackageVersion>2.0.5</TraceEventPackageVersion>
<XunitNetcoreExtensionsVersion>2.1.0-rc1-02804-05</XunitNetcoreExtensionsVersion>
<XunitNetcoreExtensionsVersion>2.2.0-preview1-03415-02</XunitNetcoreExtensionsVersion>
<!-- Roslyn optimization data package version -->
<OptimizationDataVersion>2.0.0-rc-61101-17</OptimizationDataVersion>
</PropertyGroup>
@@ -56,7 +56,7 @@
<!-- Package versions used as toolsets -->
<PropertyGroup>
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
<FeedTasksPackageVersion>2.1.0-rc1-02804-05</FeedTasksPackageVersion>
<FeedTasksPackageVersion>2.2.0-preview1-03415-02</FeedTasksPackageVersion>
</PropertyGroup>
<!-- Publish symbol build task package -->
@@ -68,7 +68,7 @@
<!-- Package dependency verification/auto-upgrade configuration. -->
<PropertyGroup>
<BaseDotNetBuildInfo>build-info/dotnet/</BaseDotNetBuildInfo>
<DependencyBranch>release/2.1</DependencyBranch>
<DependencyBranch>release/2.2</DependencyBranch>
<CurrentRefXmlPath>$(MSBuildThisFileFullPath)</CurrentRefXmlPath>
</PropertyGroup>
@@ -199,7 +199,7 @@
<PropertyGroup>
<XUnitPackageVersion>2.3.0-beta1-build3642</XUnitPackageVersion>
<CompatibilityShimsPackageVersion>2.0.0</CompatibilityShimsPackageVersion>
<CompatibilityShimsPackageVersion>2.0.1</CompatibilityShimsPackageVersion>
</PropertyGroup>
<!-- Set up dependencies on packages that aren't found in a BuildInfo. -->

Some files were not shown because too many files have changed in this diff Show More