diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2019-06-26 11:53:11 -0700 |
---|---|---|
committer | William Godbe <wigodbe@microsoft.com> | 2019-06-26 11:53:11 -0700 |
commit | 7f0840ee0930f869c47ae442d9a3d0edfd592eec (patch) | |
tree | c97ade496c277fc6214091a6148af996f58b585e | |
parent | 8c4695f0e3c89a569032a533568ea1af5a55b534 (diff) | |
download | coreclr-7f0840ee0930f869c47ae442d9a3d0edfd592eec.tar.gz coreclr-7f0840ee0930f869c47ae442d9a3d0edfd592eec.tar.bz2 coreclr-7f0840ee0930f869c47ae442d9a3d0edfd592eec.zip |
[master] Update dependencies from dotnet/corefx (#25425)
* Update dependencies from https://github.com/dotnet/corefx build 20190626.2
- Microsoft.Bcl.AsyncInterfaces - 1.0.0-preview7.19326.2
- Microsoft.NETCore.Platforms - 3.0.0-preview7.19326.2
- Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-preview7.19326.2
* Reenable globalization tests
-rw-r--r-- | eng/Version.Details.xml | 8 | ||||
-rw-r--r-- | eng/Versions.props | 6 | ||||
-rw-r--r-- | tests/CoreFX/CoreFX.issues.rsp | 4 |
3 files changed, 7 insertions, 11 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09dbaefa58..001ef78ee4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,13 +19,13 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>062febd818fa51e82c7192782a6b6e6429cc81c8</Sha> </Dependency> - <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview7.19324.8"> + <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview7.19326.2"> <Uri>https://github.com/dotnet/corefx</Uri> - <Sha>60d8aa31a4c1ffa0e125bd7941aca171439a2f72</Sha> + <Sha>219b67118e3a2d539afc1ff3bb2c10e1bc7b03d2</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19324.8"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19326.2"> <Uri>https://github.com/dotnet/corefx</Uri> - <Sha>60d8aa31a4c1ffa0e125bd7941aca171439a2f72</Sha> + <Sha>219b67118e3a2d539afc1ff3bb2c10e1bc7b03d2</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27824-03"> <Uri>https://github.com/dotnet/core-setup</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index b50c7ff0e3..6634a87f6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,9 +18,9 @@ <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19324.24</MicrosoftDotNetBuildTasksPackagingVersion> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion> <!-- corefx --> - <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview7.19324.8</MicrosoftPrivateCoreFxNETCoreAppVersion> - <MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19324.8</MicrosoftNETCorePlatformsVersion> - <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19324.8</MicrosoftBclAsyncInterfacesVersion> + <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview7.19326.2</MicrosoftPrivateCoreFxNETCoreAppVersion> + <MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19326.2</MicrosoftNETCorePlatformsVersion> + <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19326.2</MicrosoftBclAsyncInterfacesVersion> <!-- core-setup --> <MicrosoftNETCoreAppVersion>3.0.0-preview7-27824-03</MicrosoftNETCoreAppVersion> <!-- dotnet-core-internal-tooling --> diff --git a/tests/CoreFX/CoreFX.issues.rsp b/tests/CoreFX/CoreFX.issues.rsp index b299e9953c..255904d533 100644 --- a/tests/CoreFX/CoreFX.issues.rsp +++ b/tests/CoreFX/CoreFX.issues.rsp @@ -88,10 +88,6 @@ # 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 |