diff options
| author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2019-06-04 09:20:49 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-06-04 09:20:49 -0700 |
| commit | 3c01e17de0c6651d4049c5ed5e4ac2d8ee5ae8c9 (patch) | |
| tree | 9b55b5e2d5cb8e20564ba349b12e30fe036d4114 | |
| parent | b3ff5135ecba8d47cca9c02550d04e592b2e2310 (diff) | |
| download | coreclr-3c01e17de0c6651d4049c5ed5e4ac2d8ee5ae8c9.tar.gz coreclr-3c01e17de0c6651d4049c5ed5e4ac2d8ee5ae8c9.tar.bz2 coreclr-3c01e17de0c6651d4049c5ed5e4ac2d8ee5ae8c9.zip | |
[master] Update dependencies from dotnet/corefx (#24883)
* Update dependencies from https://github.com/dotnet/corefx build 20190603.11
- Microsoft.Bcl.AsyncInterfaces - 1.0.0-preview7.19303.11
- Microsoft.NETCore.Platforms - 3.0.0-preview7.19303.11
- Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-preview7.19303.11
* Add Microsoft.Diagnostics.Runtime to CoreFx.depproj
* Remove removed commands from RunTests.cmd/sh
| -rw-r--r-- | eng/Version.Details.xml | 12 | ||||
| -rw-r--r-- | eng/Versions.props | 6 | ||||
| -rw-r--r-- | eng/helixcorefxtests.proj | 4 | ||||
| -rw-r--r-- | tests/src/Common/CoreFX/CoreFX.depproj | 7 |
4 files changed, 18 insertions, 11 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66274016c3..85fd9c2b58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,17 +19,17 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>d2599acd9703ef747dfb4329ec3e3beff182e755</Sha> </Dependency> - <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview6.19279.8"> + <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview7.19303.11"> <Uri>https://github.com/dotnet/corefx</Uri> - <Sha>e23119d577e644d2c2a25419c88c1181681358e0</Sha> + <Sha>6d5959cbc7d489406f8f85dba0a42f06d4a0ea9b</Sha> </Dependency> - <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview6.19279.8"> + <Dependency Name="Microsoft.NETCore.Platforms" Version="3.0.0-preview7.19303.11"> <Uri>https://github.com/dotnet/corefx</Uri> - <Sha>e23119d577e644d2c2a25419c88c1181681358e0</Sha> + <Sha>6d5959cbc7d489406f8f85dba0a42f06d4a0ea9b</Sha> </Dependency> - <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0-preview6.19279.8"> + <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0-preview7.19303.11"> <Uri>https://github.com/dotnet/corefx</Uri> - <Sha>e23119d577e644d2c2a25419c88c1181681358e0</Sha> + <Sha>6d5959cbc7d489406f8f85dba0a42f06d4a0ea9b</Sha> </Dependency> <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview7-27803-11"> <Uri>https://github.com/dotnet/core-setup</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index b6c301123b..e5ac7a7715 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,9 +18,9 @@ <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19304.1</MicrosoftDotNetBuildTasksPackagingVersion> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion> <!-- corefx --> - <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview6.19279.8</MicrosoftPrivateCoreFxNETCoreAppVersion> - <MicrosoftNETCorePlatformsVersion>3.0.0-preview6.19279.8</MicrosoftNETCorePlatformsVersion> - <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview6.19279.8</MicrosoftBclAsyncInterfacesVersion> + <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview7.19303.11</MicrosoftPrivateCoreFxNETCoreAppVersion> + <MicrosoftNETCorePlatformsVersion>3.0.0-preview7.19303.11</MicrosoftNETCorePlatformsVersion> + <MicrosoftBclAsyncInterfacesVersion>1.0.0-preview7.19303.11</MicrosoftBclAsyncInterfacesVersion> <!-- core-setup --> <MicrosoftNETCoreAppVersion>3.0.0-preview7-27803-11</MicrosoftNETCoreAppVersion> <!-- dotnet-core-internal-tooling --> diff --git a/eng/helixcorefxtests.proj b/eng/helixcorefxtests.proj index bd9fc695d5..166eafe6b9 100644 --- a/eng/helixcorefxtests.proj +++ b/eng/helixcorefxtests.proj @@ -49,8 +49,8 @@ The arguments passed in to the run script in order are the runtime directory, the dotnet root directory (for helix submissions same as the runtime directory) and the global tools directory. --> - <HelixCommand Condition="'$(TargetsWindows)' == 'true'">call RunTests.cmd -r %HELIX_CORRELATION_PAYLOAD% -d %HELIX_CORRELATION_PAYLOAD% -g %HELIX_CORRELATION_PAYLOAD%\tools --rsp-file %HELIX_CORRELATION_PAYLOAD%\CoreFX.issues.rsp </HelixCommand> - <HelixCommand Condition="'$(TargetsWindows)' != 'true'">./RunTests.sh -r $HELIX_CORRELATION_PAYLOAD -d $HELIX_CORRELATION_PAYLOAD -g $HELIX_CORRELATION_PAYLOAD/tools --rsp-file $HELIX_CORRELATION_PAYLOAD/CoreFX.issues.rsp </HelixCommand> + <HelixCommand Condition="'$(TargetsWindows)' == 'true'">call RunTests.cmd -r %HELIX_CORRELATION_PAYLOAD% --rsp-file %HELIX_CORRELATION_PAYLOAD%\CoreFX.issues.rsp </HelixCommand> + <HelixCommand Condition="'$(TargetsWindows)' != 'true'">./RunTests.sh -r $HELIX_CORRELATION_PAYLOAD --rsp-file $HELIX_CORRELATION_PAYLOAD/CoreFX.issues.rsp </HelixCommand> </PropertyGroup> <ItemGroup> diff --git a/tests/src/Common/CoreFX/CoreFX.depproj b/tests/src/Common/CoreFX/CoreFX.depproj index cdbf8306b9..0cc06f66ac 100644 --- a/tests/src/Common/CoreFX/CoreFX.depproj +++ b/tests/src/Common/CoreFX/CoreFX.depproj @@ -13,6 +13,7 @@ <SystemCompositionVersions>1.3.0-preview3-26501-04</SystemCompositionVersions> <MicrosoftDiagnosticsTracingTraceVentVersion>2.0.19</MicrosoftDiagnosticsTracingTraceVentVersion> <MicrosoftDotnetPlatformAbstractionsVersion>2.1.0</MicrosoftDotnetPlatformAbstractionsVersion> + <MicrosoftDiagnosticsRuntimePackageVersion>1.0.5</MicrosoftDiagnosticsRuntimePackageVersion> </PropertyGroup> <!-- Switch RuntimeIdentifier according to currently running OSGroup --> @@ -164,6 +165,12 @@ <Version>$(MicrosoftDotnetPlatformAbstractionsVersion)</Version> </PackageReference> </ItemGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.Diagnostics.Runtime"> + <Version>$(MicrosoftDiagnosticsRuntimePackageVersion)</Version> + </PackageReference> + </ItemGroup> <ItemGroup> <PackageToInclude Include="@(PackageReference -> '%(Identity)' )"/> |