From c59519c0acaa6e8a87f76bf22c2eaa35414afbb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 18 Jan 2021 22:25:53 -0500 Subject: [PATCH] [master] Update dependencies from dotnet/runtime dotnet/xharness (#47119) * Update dependencies from https://github.com/dotnet/runtime build 20210118.2 Microsoft.NETCore.DotNetHost , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.ILAsm , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Runtime.CompilerServices.Unsafe , System.Text.Json From Version 6.0.0-alpha.1.21060.3 -> To Version 6.0.0-alpha.1.21068.2 * Update dependencies from https://github.com/dotnet/xharness build 20210118.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21065.1 -> To Version 1.0.0-prerelease.21068.1 * Update dependencies from https://github.com/dotnet/xharness build 20210118.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21065.1 -> To Version 1.0.0-prerelease.21068.2 * Update dependencies from https://github.com/dotnet/xharness build 20210118.3 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21065.1 -> To Version 1.0.0-prerelease.21068.3 Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- global.json | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 701c21585ac..89da08dee56 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21065.1", + "version": "1.0.0-prerelease.21068.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87a40625c30..3e19dbaf2ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,45 +166,45 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 4e13df4c4ee210850d134ec972569d64fedaa11a + 5c5bb6a340d04a476045d37436530297eff189b7 - + https://github.com/dotnet/runtime - 4e13df4c4ee210850d134ec972569d64fedaa11a + 5c5bb6a340d04a476045d37436530297eff189b7 - + https://github.com/dotnet/runtime - 4e13df4c4ee210850d134ec972569d64fedaa11a + 5c5bb6a340d04a476045d37436530297eff189b7 - + https://github.com/dotnet/runtime - 4e13df4c4ee210850d134ec972569d64fedaa11a + 5c5bb6a340d04a476045d37436530297eff189b7 - + https://github.com/dotnet/runtime - 4e13df4c4ee210850d134ec972569d64fedaa11a + 5c5bb6a340d04a476045d37436530297eff189b7 - + https://github.com/dotnet/runtime - 4e13df4c4ee210850d134ec972569d64fedaa11a + 5c5bb6a340d04a476045d37436530297eff189b7 - + https://github.com/dotnet/runtime - 4e13df4c4ee210850d134ec972569d64fedaa11a + 5c5bb6a340d04a476045d37436530297eff189b7 https://github.com/mono/linker 9978bd03eab26081f5a353b84e516af5f33e88e7 - + https://github.com/dotnet/xharness - ed5fbe0f7cbfc59b70ca078d9d9dd987044eb43e + ee50e1b0f769766598c0ad5071da888e66ec717a - + https://github.com/dotnet/xharness - ed5fbe0f7cbfc59b70ca078d9d9dd987044eb43e + ee50e1b0f769766598c0ad5071da888e66ec717a diff --git a/eng/Versions.props b/eng/Versions.props index dc26d92d872..d9f843a36e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,11 +63,11 @@ 5.9.0-preview.2 6.0.0-alpha.1.20612.4 - 6.0.0-alpha.1.21060.3 - 6.0.0-alpha.1.21060.3 + 6.0.0-alpha.1.21068.2 + 6.0.0-alpha.1.21068.2 3.1.0 - 6.0.0-alpha.1.21060.3 + 6.0.0-alpha.1.21068.2 1.2.0-beta.304 4.5.1 @@ -95,14 +95,14 @@ 4.7.0 4.7.0 4.7.0 - 6.0.0-alpha.1.21060.3 - 6.0.0-alpha.1.21060.3 + 6.0.0-alpha.1.21068.2 + 6.0.0-alpha.1.21068.2 4.3.0 4.5.4 4.5.0 1.1.1 4.3.0 - 6.0.0-alpha.1.21060.3 + 6.0.0-alpha.1.21068.2 5.0.0-beta.21062.1 5.0.0-beta.21062.1 @@ -141,8 +141,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21065.1 - 1.0.0-prerelease.21065.1 + 1.0.0-prerelease.21068.3 + 1.0.0-prerelease.21068.3 2.4.1 2.4.2 1.3.0 diff --git a/global.json b/global.json index 51190f33517..9262b906604 100644 --- a/global.json +++ b/global.json @@ -17,7 +17,7 @@ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21062.10", "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21062.10", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.21060.3", + "Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.21068.2", "Microsoft.Build.NoTargets": "2.0.1", "Microsoft.Build.Traversal": "2.1.1" } -- GitLab