From 87408efb68b1f5940024df89b4e9f56a7047967e Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 28 Aug 2018 17:57:57 -0700 Subject: [PATCH] Update BuildTools, CoreClr, CoreFx, CoreSetup, PgoData to preview1-03127-01, preview1-26827-04, preview1-26827-04, preview1-26827-01, master-20180827-0150, respectively (master) (dotnet/coreclr#19543) * Update BuildTools, CoreClr, CoreFx, CoreSetup, PgoData to preview1-03127-01, preview1-26827-04, preview1-26827-04, preview1-26827-01, master-20180827-0150, respectively * Undo buildtools update * Use older version of CoreFx.Private.TestUtilities * Disable outdated test * Disable failing test against dotnet/coreclr#19537 Commit migrated from https://github.com/dotnet/coreclr/commit/027d534ff6738ca0731321dc389da0153b7e9160 --- src/coreclr/ILAsmVersion.txt | 2 +- src/coreclr/dependencies.props | 20 ++++++++++---------- src/coreclr/tests/CoreFX/CoreFX.issues.json | 10 +++++++++- src/coreclr/tests/arm/Tests.lst | 4 ++-- src/coreclr/tests/issues.targets | 6 ++++++ src/coreclr/tests/src/Common/CoreFX/CoreFX.depproj | 3 ++- 6 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/coreclr/ILAsmVersion.txt b/src/coreclr/ILAsmVersion.txt index 409c62b..04cc31b 100644 --- a/src/coreclr/ILAsmVersion.txt +++ b/src/coreclr/ILAsmVersion.txt @@ -1 +1 @@ -3.0.0-preview1-26817-05 +3.0.0-preview1-26827-04 diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props index 9b23470..2c090d2 100644 --- a/src/coreclr/dependencies.props +++ b/src/coreclr/dependencies.props @@ -23,23 +23,23 @@ - e0c1d36d8a19fed21cadfff4890e027bd4c2c214 - e0c1d36d8a19fed21cadfff4890e027bd4c2c214 + fdd0b548adc896b40ecb28af7de3b781b30fa890 + fdd0b548adc896b40ecb28af7de3b781b30fa890 e0c1d36d8a19fed21cadfff4890e027bd4c2c214 - e0c1d36d8a19fed21cadfff4890e027bd4c2c214 - e0c1d36d8a19fed21cadfff4890e027bd4c2c214 + fdd0b548adc896b40ecb28af7de3b781b30fa890 + fdd0b548adc896b40ecb28af7de3b781b30fa890 e0c1d36d8a19fed21cadfff4890e027bd4c2c214 - 4.6.0-preview1-26817-04 - 3.0.0-preview1-26817-04 - 99.99.99-master-20180817-0151 - 3.0.0-preview1-26817-05 - 3.0.0-preview1-26817-01 + 4.6.0-preview1-26827-04 + 3.0.0-preview1-26827-04 + 99.99.99-master-20180827-0150 + 3.0.0-preview1-26827-04 + 3.0.0-preview1-26827-01 2.4.0-beta.2.build4010 - 99.99.99-master-20180817-0151 + 99.99.99-master-20180827-0150 4.6.0-alpha-00001 1.0.0-beta-build0015 2.0.4 diff --git a/src/coreclr/tests/CoreFX/CoreFX.issues.json b/src/coreclr/tests/CoreFX/CoreFX.issues.json index ff8a131..71fa2cf 100644 --- a/src/coreclr/tests/CoreFX/CoreFX.issues.json +++ b/src/coreclr/tests/CoreFX/CoreFX.issues.json @@ -1,4 +1,4 @@ -[ +[ { "name": "System.Data.SqlClient.ManualTesting.Tests", "enabled": false, @@ -163,6 +163,14 @@ { "name": "System.IO.Tests.FileInfo_GetSetTimes.SettingUpdatesProperties", "reason": "Assert.All() Failure: 6 out of 6 items in the collection did not pass." + }, + { + "name": "System.IO.Tests.EncryptDecrypt.EncryptDecrypt_NotSupported", + "reason": "outdated" + }, + { + "name": "System.IO.Tests.EncryptDecrypt.NullArg_ThrowsException", + "reason": "outdated" } ] } diff --git a/src/coreclr/tests/arm/Tests.lst b/src/coreclr/tests/arm/Tests.lst index a1b00ba..964d746 100644 --- a/src/coreclr/tests/arm/Tests.lst +++ b/src/coreclr/tests/arm/Tests.lst @@ -94153,7 +94153,7 @@ RelativePath=JIT\SIMD\Matrix4x4_ro\Matrix4x4_ro.cmd WorkingDir=JIT\SIMD\Matrix4x4_ro Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;NEW +Categories=EXPECTED_FAIL;EXCLUDED;19537;NEW HostStyle=0 [BroadcastVector128ToVector256_ro.cmd_11857] @@ -94297,7 +94297,7 @@ RelativePath=JIT\SIMD\Matrix4x4_r\Matrix4x4_r.cmd WorkingDir=JIT\SIMD\Matrix4x4_r Expected=0 MaxAllowedDurationSeconds=600 -Categories=EXPECTED_PASS;NEW +Categories=EXPECTED_FAIL;EXCLUDED;19537;NEW HostStyle=0 [MoveMask_ro.cmd_11875] diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets index b111014..2ab7329 100644 --- a/src/coreclr/tests/issues.targets +++ b/src/coreclr/tests/issues.targets @@ -181,6 +181,12 @@ times out + + 19537 + + + 19537 + diff --git a/src/coreclr/tests/src/Common/CoreFX/CoreFX.depproj b/src/coreclr/tests/src/Common/CoreFX/CoreFX.depproj index e64aeb7..0a7db4a 100644 --- a/src/coreclr/tests/src/Common/CoreFX/CoreFX.depproj +++ b/src/coreclr/tests/src/Common/CoreFX/CoreFX.depproj @@ -17,6 +17,7 @@ 2.2.0-beta2-build3300 2.0.19 2.1.0 + 4.6.0-preview1-26817-04 @@ -53,7 +54,7 @@ $(XUnitNetcoreExtensionsVersion) - $(MicrosoftPrivateCoreFxNETCoreAppPackageVersion) + $(MicrosoftPrivateCoreFxTestUtilitiesPackageVersion) $(MicrosoftPrivateCoreFxNETCoreAppPackageVersion) -- 2.7.4