summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>2019-05-09 04:51:41 -0700
committerJan Kotas <jkotas@microsoft.com>2019-05-09 04:51:41 -0700
commit201a6ea6b12b0906f303f37c2339127c05ecc3a3 (patch)
treea249770aa81cb993fad329f955c13bcbd3435a0e
parentaa494182a1b005674619c0177f238840812db6cd (diff)
downloadcoreclr-201a6ea6b12b0906f303f37c2339127c05ecc3a3.tar.gz
coreclr-201a6ea6b12b0906f303f37c2339127c05ecc3a3.tar.bz2
coreclr-201a6ea6b12b0906f303f37c2339127c05ecc3a3.zip
[master] Update dependencies from dotnet/corefx (#24314)
* Update dependencies from https://github.com/dotnet/corefx build 20190506.1 - Microsoft.NETCore.Platforms - 3.0.0-preview6.19256.1 - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-preview6.19256.1 * Use last stable version of System.Numerics.Vectors package * Add Microsoft.Bcl.AsyncInterfaces package * Disable Microsoft.Bcl.AsyncInterfaces
-rw-r--r--eng/Version.Details.xml8
-rw-r--r--eng/Versions.props5
-rw-r--r--tests/CoreFX/CoreFX.issues.rsp3
-rw-r--r--tests/src/Common/CoreFX/CoreFX.depproj5
-rw-r--r--tests/src/JIT/SIMD/VectorCopyToArray.cs2
-rw-r--r--tests/src/JIT/config/benchmark/benchmark.csproj2
-rw-r--r--tests/src/performance/performance.csproj2
7 files changed, 16 insertions, 11 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index cbcb2f341e..5c91ade793 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -16,13 +16,13 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
</Dependency-->
- <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview6.19229.1">
+ <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview6.19257.8">
<Uri>https://github.com/dotnet/corefx</Uri>
- <Sha>173a2a165316af9a4e211ceab8c8d9692de8a528</Sha>
+ <Sha>2c75f5a09f770f3118e09abc35bdf88c1c7120b0</Sha>
</Dependency>
- <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview6.19229.1">
+ <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview6.19257.8">
<Uri>https://github.com/dotnet/corefx</Uri>
- <Sha>173a2a165316af9a4e211ceab8c8d9692de8a528</Sha>
+ <Sha>2c75f5a09f770f3118e09abc35bdf88c1c7120b0</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27620-01">
<Uri>https://github.com/dotnet/core-setup</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index cbb5102b04..10eb47c060 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,8 +9,9 @@
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19179.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.0-alpha-004</MicrosoftNetFrameworkReferenceAssembliesVersion>
- <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview6.19229.1</MicrosoftPrivateCoreFxNETCoreAppVersion>
- <MicrosoftNETCorePlatformsVersion>3.0.0-preview6.19229.1</MicrosoftNETCorePlatformsVersion>
+ <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview6.19257.8</MicrosoftPrivateCoreFxNETCoreAppVersion>
+ <MicrosoftNETCorePlatformsVersion>3.0.0-preview6.19257.8</MicrosoftNETCorePlatformsVersion>
+ <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview6.19257.8</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftNETCoreAppVersion>3.0.0-preview5-27620-01</MicrosoftNETCoreAppVersion>
<optimizationIBCCoreCLRVersion>99.99.99-master-20190505.1</optimizationIBCCoreCLRVersion>
<optimizationPGOCoreCLRVersion>99.99.99-master-20190505.1</optimizationPGOCoreCLRVersion>
diff --git a/tests/CoreFX/CoreFX.issues.rsp b/tests/CoreFX/CoreFX.issues.rsp
index 8872676ba8..28b1ed7b53 100644
--- a/tests/CoreFX/CoreFX.issues.rsp
+++ b/tests/CoreFX/CoreFX.issues.rsp
@@ -432,3 +432,6 @@
-nomethod System.Security.Cryptography.X509Certificates.Tests.X509Certificate2UITests.DisplayCertificate_InvalidInput
-nomethod System.Security.Cryptography.X509Certificates.Tests.X509Certificate2UITests.SelectFromCollection_InvalidInput
-nomethod System.Security.Cryptography.X509Certificates.Tests.X509Certificate2UITests.SelectFromCollection_InvalidInput_WithHwnd
+
+# Disable Microsoft.Bcl.AsyncInterfaces tests
+-noclass System.Threading.Tasks.Sources.Tests.ManualResetValueTaskSourceTests
diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj
index c5f095db65..cdbf8306b9 100644
--- a/tests/src/Common/CoreFX/CoreFX.depproj
+++ b/tests/src/Common/CoreFX/CoreFX.depproj
@@ -13,7 +13,6 @@
<SystemCompositionVersions>1.3.0-preview3-26501-04</SystemCompositionVersions>
<MicrosoftDiagnosticsTracingTraceVentVersion>2.0.19</MicrosoftDiagnosticsTracingTraceVentVersion>
<MicrosoftDotnetPlatformAbstractionsVersion>2.1.0</MicrosoftDotnetPlatformAbstractionsVersion>
- <MicrosoftPrivateCoreFxTestUtilitiesPackageVersion>4.6.0-preview1-26817-04</MicrosoftPrivateCoreFxTestUtilitiesPackageVersion>
</PropertyGroup>
<!-- Switch RuntimeIdentifier according to currently running OSGroup -->
@@ -140,7 +139,9 @@
<PackageReference Include="System.Json">
<Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
</PackageReference>
-
+ <PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
+ <Version>$(MicrosoftBclAsyncInterfacesVersion)</Version>
+ </PackageReference>
</ItemGroup>
<ItemGroup Condition="'$(OSGroup)' == 'Windows_NT'">
<!-- Windows Dependencies -->
diff --git a/tests/src/JIT/SIMD/VectorCopyToArray.cs b/tests/src/JIT/SIMD/VectorCopyToArray.cs
index 3a931fb5bb..9d4eea501d 100644
--- a/tests/src/JIT/SIMD/VectorCopyToArray.cs
+++ b/tests/src/JIT/SIMD/VectorCopyToArray.cs
@@ -39,7 +39,7 @@ internal partial class VectorTest
caught = false;
try
{
- v1.CopyTo(null);
+ v1.CopyTo((T[])null);
}
catch (NullReferenceException)
{
diff --git a/tests/src/JIT/config/benchmark/benchmark.csproj b/tests/src/JIT/config/benchmark/benchmark.csproj
index 15099d74d4..50a90458d4 100644
--- a/tests/src/JIT/config/benchmark/benchmark.csproj
+++ b/tests/src/JIT/config/benchmark/benchmark.csproj
@@ -47,7 +47,7 @@
<Version>4.5.2</Version>
</PackageReference>
<PackageReference Include="System.Numerics.Vectors">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
+ <Version>4.5.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection">
<Version>4.4.0-beta-24913-02</Version>
diff --git a/tests/src/performance/performance.csproj b/tests/src/performance/performance.csproj
index 21896dae26..e676ac43ec 100644
--- a/tests/src/performance/performance.csproj
+++ b/tests/src/performance/performance.csproj
@@ -41,7 +41,7 @@
<Version>4.4.0-beta-24913-02</Version>
</PackageReference>
<PackageReference Include="System.Numerics.Vectors">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppVersion)</Version>
+ <Version>4.5.0</Version>
</PackageReference>
<PackageReference Include="System.Reflection">
<Version>4.4.0-beta-24913-02</Version>