From bbc77c2d6137d3aff442edb719ccc406614fa0da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2020 12:45:04 -0800 Subject: [PATCH] [release/5.0.1xx-preview1] Update dependencies from dotnet/sdk (#6553) * Update dependencies from https://github.com/dotnet/sdk build 20200224.4 - Microsoft.DotNet.MSBuildSdkResolver - 5.0.100-preview.1.20124.4 - Microsoft.NET.Sdk - 5.0.100-preview.1.20124.4 * Include runtime from dependency flow In order to run integration tests from dotnet/sdk that depend on it Co-authored-by: Daniel Plaisted --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- global.json | 7 ++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e719edac9..d3ea9e920 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,13 +75,13 @@ https://github.com/dotnet/templating 4c1a4ba9c52eccd5bf50e35426135cd835a2240a - + https://github.com/dotnet/sdk - d3c8b4ea11401837dfc9b1d128a908694de1a8b4 + 7acd75b9b92fff3b10743e96adfbb9efac7dbdf3 - + https://github.com/dotnet/sdk - d3c8b4ea11401837dfc9b1d128a908694de1a8b4 + 7acd75b9b92fff3b10743e96adfbb9efac7dbdf3 diff --git a/eng/Versions.props b/eng/Versions.props index a5bbe3005..a04f95215 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,14 +50,14 @@ - 5.0.100-preview.1.20120.5 + 5.0.100-preview.1.20124.4 0.2.0 - 5.0.100-preview.1.20120.5 + 5.0.100-preview.1.20124.4 $(MicrosoftNETSdkPackageVersion) diff --git a/global.json b/global.json index 6a66b8d46..88130d68d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,11 @@ { "tools": { - "dotnet": "5.0.100-alpha1-015949" + "dotnet": "5.0.100-preview.1.20119.7", + "runtimes": { + "dotnet": [ + "$(MicrosoftNETCoreAppRuntimePackageVersion)" + ] + } }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20117.3"