From: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Sun, 30 Aug 2020 09:54:11 +0000 (+0000)
Subject: [master] Update dependencies from dotnet/arcade Microsoft/vstest dotnet/runtime-asset...
X-Git-Tag: submit/tizen/20210909.063632~5705
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fcd8dd9d41d696341a2bc96cfcaaedf7ff8be3b0;p=platform%2Fupstream%2Fdotnet%2Fruntime.git
[master] Update dependencies from dotnet/arcade Microsoft/vstest dotnet/runtime-assets dotnet/xharness dotnet/icu (#41322)
[master] Update dependencies from dotnet/arcade Microsoft/vstest dotnet/runtime-assets dotnet/xharness dotnet/icu
- Updates:
- System.ComponentModel.TypeConverter.TestData: from 5.0.0-beta.20420.1 to 5.0.0-beta.20426.1
- System.Drawing.Common.TestData: from 5.0.0-beta.20420.1 to 5.0.0-beta.20426.1
- System.IO.Compression.TestData: from 5.0.0-beta.20420.1 to 5.0.0-beta.20426.1
- System.IO.Packaging.TestData: from 5.0.0-beta.20420.1 to 5.0.0-beta.20426.1
- System.Net.TestData: from 5.0.0-beta.20420.1 to 5.0.0-beta.20426.1
- System.Private.Runtime.UnicodeData: from 5.0.0-beta.20420.1 to 5.0.0-beta.20426.1
- System.Security.Cryptography.X509Certificates.TestData: from 5.0.0-beta.20420.1 to 5.0.0-beta.20426.1
- System.Windows.Extensions.TestData: from 5.0.0-beta.20420.1 to 5.0.0-beta.20426.1
- Updates:
- Microsoft.DotNet.XHarness.CLI: from 1.0.0-prerelease.20424.1 to 1.0.0-prerelease.20424.2
- Microsoft.DotNet.XHarness.TestRunners.Xunit: from 1.0.0-prerelease.20424.1 to 1.0.0-prerelease.20424.2
- Updates:
- Microsoft.NETCore.Runtime.ICU.Transport: from 5.0.0-preview.8.20421.1 to 6.0.0-alpha.1.20428.1
- Updates:
- Microsoft.DotNet.GenFacades: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.Build.Tasks.Feed: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.Build.Tasks.Packaging: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.CodeAnalysis: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.GenAPI: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.XUnitExtensions: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.Helix.Sdk: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.RemoteExecutor: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.VersionTools.Tasks: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.XUnitConsoleRunner: from 2.5.1-beta.20419.21 to 2.5.1-beta.20427.5
- Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Microsoft.DotNet.ApiCompat: from 5.0.0-beta.20419.21 to 5.0.0-beta.20427.5
- Updates:
- Microsoft.NET.Test.Sdk: from 16.8.0-release-20200821-04 to 16.8.0-release-20200828-02
- fix TestFirstYearOfJapaneseEra test on Browser platform
---
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 733f23e..aeb5ed1 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,67 +4,67 @@
https://github.com/dotnet/standard
cfe95a23647c7de1fe1a349343115bd7720d6949
-
+
https://github.com/dotnet/icu
- 8025faea58fb28c51ddaf3484a7bf506eaa7897b
+ 0b35b4718f5d82854fa05ad115fa8f848f512bdd
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
-
+
https://github.com/dotnet/arcade
- 56a95cc477558c1ccdf16d7abe962849ea970ba4
+ f2b7fe854a0b1f78c04dfc065164d6d61040f5b8
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
@@ -86,41 +86,41 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
f69d7fc09c4fdb9e9427741b9a176e867dab577f
-
+
https://github.com/microsoft/vstest
- f5e870bd4f3402c9e6e71679f8d0b716653143f5
+ 4fcacb284064e66e670689b9888c0c438b1f4154
-
+
https://github.com/dotnet/runtime-assets
- 3697381858b21a189224431a11850e2a4733a131
+ 0349b47d49bcdd411692b23464f3ad5707df8bea
-
+
https://github.com/dotnet/runtime-assets
- 3697381858b21a189224431a11850e2a4733a131
+ 0349b47d49bcdd411692b23464f3ad5707df8bea
-
+
https://github.com/dotnet/runtime-assets
- 3697381858b21a189224431a11850e2a4733a131
+ 0349b47d49bcdd411692b23464f3ad5707df8bea
-
+
https://github.com/dotnet/runtime-assets
- 3697381858b21a189224431a11850e2a4733a131
+ 0349b47d49bcdd411692b23464f3ad5707df8bea
-
+
https://github.com/dotnet/runtime-assets
- 3697381858b21a189224431a11850e2a4733a131
+ 0349b47d49bcdd411692b23464f3ad5707df8bea
-
+
https://github.com/dotnet/runtime-assets
- 3697381858b21a189224431a11850e2a4733a131
+ 0349b47d49bcdd411692b23464f3ad5707df8bea
-
+
https://github.com/dotnet/runtime-assets
- 3697381858b21a189224431a11850e2a4733a131
+ 0349b47d49bcdd411692b23464f3ad5707df8bea
-
+
https://github.com/dotnet/runtime-assets
- 3697381858b21a189224431a11850e2a4733a131
+ 0349b47d49bcdd411692b23464f3ad5707df8bea
https://github.com/dotnet/llvm-project
@@ -186,13 +186,13 @@
https://github.com/mono/linker
cefde0af8d4714c59b32eec1075f3e68a9666419
-
+
https://github.com/dotnet/xharness
- 1ff8172e92ae0bfb1d998993f34e8685568807c1
+ d7e768b6315f3c85b44159c78646e1107cb61f82
-
+
https://github.com/dotnet/xharness
- 1ff8172e92ae0bfb1d998993f34e8685568807c1
+ d7e768b6315f3c85b44159c78646e1107cb61f82
diff --git a/eng/Versions.props b/eng/Versions.props
index ff15480..d54e3ae 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -53,16 +53,16 @@
3.8.0-2.20403.2
- 5.0.0-beta.20419.21
- 5.0.0-beta.20419.21
- 5.0.0-beta.20419.21
- 5.0.0-beta.20419.21
- 5.0.0-beta.20419.21
- 5.0.0-beta.20419.21
- 2.5.1-beta.20419.21
- 5.0.0-beta.20419.21
- 5.0.0-beta.20419.21
- 5.0.0-beta.20419.21
+ 5.0.0-beta.20427.5
+ 5.0.0-beta.20427.5
+ 5.0.0-beta.20427.5
+ 5.0.0-beta.20427.5
+ 5.0.0-beta.20427.5
+ 5.0.0-beta.20427.5
+ 2.5.1-beta.20427.5
+ 5.0.0-beta.20427.5
+ 5.0.0-beta.20427.5
+ 5.0.0-beta.20427.5
5.0.0-preview.4.20202.18
5.0.0-preview.4.20202.18
@@ -103,14 +103,14 @@
4.3.0
5.0.0-alpha.1.19563.3
- 5.0.0-beta.20420.1
- 5.0.0-beta.20420.1
- 5.0.0-beta.20420.1
- 5.0.0-beta.20420.1
- 5.0.0-beta.20420.1
- 5.0.0-beta.20420.1
- 5.0.0-beta.20420.1
- 5.0.0-beta.20420.1
+ 5.0.0-beta.20426.1
+ 5.0.0-beta.20426.1
+ 5.0.0-beta.20426.1
+ 5.0.0-beta.20426.1
+ 5.0.0-beta.20426.1
+ 5.0.0-beta.20426.1
+ 5.0.0-beta.20426.1
+ 5.0.0-beta.20426.1
2.2.0-prerelease.19564.1
2.0.3
@@ -134,9 +134,9 @@
4.9.4
4.9.4
- 16.8.0-release-20200821-04
- 1.0.0-prerelease.20424.1
- 1.0.0-prerelease.20424.1
+ 16.8.0-release-20200828-02
+ 1.0.0-prerelease.20424.2
+ 1.0.0-prerelease.20424.2
2.4.1
2.4.2
1.3.0
@@ -149,7 +149,7 @@
6.0.0-alpha.1.20424.3
- 5.0.0-preview.8.20421.1
+ 6.0.0-alpha.1.20428.1
9.0.1-alpha.1.20418.1
9.0.1-alpha.1.20418.1
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 67ee6d2..94a91c0 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -23,6 +23,8 @@ Param(
[switch][Alias('nobl')]$excludeCIBinarylog,
[switch] $ci,
[switch] $prepareMachine,
+ [string] $runtimeSourceFeed = '',
+ [string] $runtimeSourceFeedKey = '',
[switch] $help,
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
)
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 6d7c5a1..252b636 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -76,9 +76,10 @@ projects=''
configuration='Debug'
prepare_machine=false
verbosity='minimal'
+runtime_source_feed=''
+runtime_source_feed_key=''
properties=''
-
while [[ $# > 0 ]]; do
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
case "$opt" in
@@ -151,6 +152,14 @@ while [[ $# > 0 ]]; do
node_reuse=$2
shift
;;
+ -runtimesourcefeed)
+ runtime_source_feed=$2
+ shift
+ ;;
+ -runtimesourcefeedkey)
+ runtime_source_feed_key=$2
+ shift
+ ;;
*)
properties="$properties $1"
;;
diff --git a/eng/common/cross/armel/tizen-build-rootfs.sh b/eng/common/cross/armel/tizen-build-rootfs.sh
index 25a0efa..9a4438a 100755
--- a/eng/common/cross/armel/tizen-build-rootfs.sh
+++ b/eng/common/cross/armel/tizen-build-rootfs.sh
@@ -30,8 +30,6 @@ rm -rf $TIZEN_TMP_DIR
# Configure Tizen rootfs
echo ">>Start configuring Tizen rootfs"
-rm ./usr/lib/libunwind.so
-ln -s libunwind.so.8 ./usr/lib/libunwind.so
ln -sfn asm-arm ./usr/include/asm
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
echo "<&1 | grep -q "BusyBox"; then
- decodeArg="-d"
- fi
- decodedFeedKey=`echo $7 | base64 $decodeArg`
- runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
+ local runtimeSourceFeedKey=''
+ if [[ -n "${7:-}" ]]; then
+ # The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
+ # '-d'. To work around this, do a simple detection and switch the parameter
+ # accordingly.
+ decodeArg="--decode"
+ if base64 --help 2>&1 | grep -q "BusyBox"; then
+ decodeArg="-d"
fi
+ decodedFeedKey=`echo $7 | base64 $decodeArg`
+ runtimeSourceFeedKey="--feed-credential $decodedFeedKey"
+ fi
- if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then
- bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || {
- local exit_code=$?
- Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')."
- ExitWithExitCode $exit_code
- }
- else
+ if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then
+ bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || {
+ local exit_code=$?
+ Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')."
ExitWithExitCode $exit_code
+ }
+ else
+ if [[ $exit_code != 0 ]]; then
+ Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')."
fi
+ ExitWithExitCode $exit_code
fi
}
}
@@ -391,11 +395,7 @@ function MSBuild {
InitializeBuildTool
InitializeToolset
- # Work around issues with Azure Artifacts credential provider
- # https://github.com/dotnet/arcade/issues/3932
if [[ "$ci" == true ]]; then
- "$_InitializeBuildTool" nuget locals http-cache -c
-
export NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20
export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
diff --git a/global.json b/global.json
index 30a1da0..840fc20 100644
--- a/global.json
+++ b/global.json
@@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20419.21",
- "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20419.21",
- "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20419.21",
- "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20419.21",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20427.5",
+ "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20427.5",
+ "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20427.5",
+ "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20427.5",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
"Microsoft.Build.NoTargets": "1.0.53",
diff --git a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs b/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs
index 31fe501..b4c5576 100644
--- a/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs
+++ b/src/libraries/System.Globalization/tests/DateTimeFormatInfo/DateTimeFormatInfoTests.cs
@@ -176,10 +176,6 @@ namespace System.Globalization.Tests
DateTime dt = new DateTime(1989, 01, 08); // Start of Heisei Era
string formattedDateWithGannen = "\u5E73\u6210 \u5143\u5E74 01\u6708 08\u65E5";
- if (PlatformDetection.IsBrowser)
- {
- formattedDateWithGannen = "Heisei \u5143\u5E74 01\u6708 08\u65E5";
- }
string formattedDate = dt.ToString(pattern, jpnFormat);