summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>2019-06-22 01:33:30 -0700
committerJan Kotas <jkotas@microsoft.com>2019-06-22 01:33:30 -0700
commitf55135711f21c7c60ebaf9653e7d97486085a649 (patch)
tree137ed72bb321c60a4c49f6d1ed1c6eb338cdf843
parente20dc64847265b1b8d65844b12388ca19a8b074a (diff)
downloadcoreclr-f55135711f21c7c60ebaf9653e7d97486085a649.tar.gz
coreclr-f55135711f21c7c60ebaf9653e7d97486085a649.tar.bz2
coreclr-f55135711f21c7c60ebaf9653e7d97486085a649.zip
[master] Update dependencies from dotnet/corefx (#25120)
* Update dependencies from https://github.com/dotnet/corefx build 20190621.1 - Microsoft.Bcl.AsyncInterfaces - 1.0.0-preview7.19321.1 - Microsoft.NETCore.Platforms - 3.0.0-preview7.19321.1 - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-preview7.19321.1 * Disable failing tests
-rw-r--r--eng/Version.Details.xml12
-rw-r--r--eng/Versions.props6
-rw-r--r--tests/CoreFX/CoreFX.issues.rsp9
3 files changed, 13 insertions, 14 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 88d5fce3f3..9f6f3e6acd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -19,17 +19,17 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
</Dependency>
- <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview7.19311.1">
+ <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview7.19321.1">
<Uri>https://github.com/dotnet/corefx</Uri>
- <Sha>a78bd7308555926f88aad3d0ecaaebae0f9204cc</Sha>
+ <Sha>e5aa6a5b6df5593e17b794dfcf5cf7ec87e9ef1d</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19311.1">
+ <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19321.1">
<Uri>https://github.com/dotnet/corefx</Uri>
- <Sha>a78bd7308555926f88aad3d0ecaaebae0f9204cc</Sha>
+ <Sha>e5aa6a5b6df5593e17b794dfcf5cf7ec87e9ef1d</Sha>
</Dependency>
- <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0-preview7.19311.1">
+ <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0-preview7.19321.1">
<Uri>https://github.com/dotnet/corefx</Uri>
- <Sha>a78bd7308555926f88aad3d0ecaaebae0f9204cc</Sha>
+ <Sha>e5aa6a5b6df5593e17b794dfcf5cf7ec87e9ef1d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27820-07">
<Uri>https://github.com/dotnet/core-setup</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index a904958d58..a8e7d71f78 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,9 +18,9 @@
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19320.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<!-- corefx -->
- <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview7.19311.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
- <MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19311.1</MicrosoftNETCorePlatformsVersion>
- <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19311.1</MicrosoftBclAsyncInterfacesVersion>
+ <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview7.19321.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
+ <MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19321.1</MicrosoftNETCorePlatformsVersion>
+ <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19321.1</MicrosoftBclAsyncInterfacesVersion>
<!-- core-setup -->
<MicrosoftNETCoreAppVersion>3.0.0-preview7-27820-07</MicrosoftNETCoreAppVersion>
<!-- dotnet-core-internal-tooling -->
diff --git a/tests/CoreFX/CoreFX.issues.rsp b/tests/CoreFX/CoreFX.issues.rsp
index e7b11abbf7..e34bcd071a 100644
--- a/tests/CoreFX/CoreFX.issues.rsp
+++ b/tests/CoreFX/CoreFX.issues.rsp
@@ -44,11 +44,6 @@
# https://github.com/dotnet/corefx/issues/37886
-nomethod System.Security.Cryptography.Rsa.Tests.RSAXml.FromNonsenseXml
-# requires corefx test updates
--nomethod System.Diagnostics.Tests.DebugTestsNoListeners.Print
--nomethod System.Diagnostics.Tests.DebugTestsUsingListeners.Print
--nomethod System.Tests.ArrayTests.Copy_SourceAndDestinationNeverConvertible_ThrowsArrayTypeMismatchException
-
# System.Net.Tests are known for their instability
-nonamespace System.Net.Http.Functional.Tests
-nonamespace System.Net.Sockets.Tests
@@ -100,6 +95,10 @@
# Assert: https://github.com/dotnet/coreclr/issues/25050
-nonamespace System.Data.Common.Tests
+# Test failure: https://github.com/dotnet/corefx/issues/38768
+-nomethod System.Globalization.Tests.CurrentCultureTests.CurrentCulture_DefaultWithNoLang
+-nomethod System.Globalization.Tests.CurrentCultureTests.CurrentCulture_BasedOnLangEnvVar
+
# requires corefx test updates
-nomethod System.Data.Tests.Common.DbConnectionStringBuilderTest.Add_Keyword_Invalid
-nomethod System.Data.Tests.Common.DbConnectionStringBuilderTest.Indexer_Keyword_Invalid