From 75f83464af09e441a1a52cf4f6fe8251477273c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Dec 2020 00:48:43 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20201215.4 (#46190) [master] Update dependencies from dotnet/arcade - Merge branch 'master' into darc-master-7182afa7-4616-4185-bb0f-bf6d141d0210 --- eng/Version.Details.xml | 68 ++++++++++----------- eng/Versions.props | 24 ++++---- eng/common/performance/microbenchmarks.proj | 2 +- global.json | 10 +-- 4 files changed, 52 insertions(+), 52 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 89c196c46d9767..8d7cdd020fabab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,73 +6,73 @@ - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 - + https://github.com/dotnet/arcade - b2d5bf0342fa65d70ed2c3ddbdb3841d7ca0b382 + 7d638bb082f374f7c8ddbada79f757662df4a246 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ba5851f4cbfa72..8ef37c99b5e304 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,18 +53,18 @@ 6.0.0-preview1.20513.4 3.8.0-4.20503.2 - 6.0.0-beta.20614.8 - 6.0.0-beta.20614.8 - 6.0.0-beta.20614.8 - 6.0.0-beta.20614.8 - 6.0.0-beta.20614.8 - 6.0.0-beta.20614.8 - 2.5.1-beta.20614.8 - 6.0.0-beta.20614.8 - 6.0.0-beta.20614.8 - 6.0.0-beta.20614.8 - 6.0.0-beta.20614.8 - 6.0.0-beta.20614.8 + 6.0.0-beta.20615.4 + 6.0.0-beta.20615.4 + 6.0.0-beta.20615.4 + 6.0.0-beta.20615.4 + 6.0.0-beta.20615.4 + 6.0.0-beta.20615.4 + 2.5.1-beta.20615.4 + 6.0.0-beta.20615.4 + 6.0.0-beta.20615.4 + 6.0.0-beta.20615.4 + 6.0.0-beta.20615.4 + 6.0.0-beta.20615.4 6.0.0-alpha.1.20612.4 6.0.0-alpha.1.20616.14 diff --git a/eng/common/performance/microbenchmarks.proj b/eng/common/performance/microbenchmarks.proj index 94b6efbc9297de..318ca5f1b8d4c3 100644 --- a/eng/common/performance/microbenchmarks.proj +++ b/eng/common/performance/microbenchmarks.proj @@ -141,4 +141,4 @@ 4:00 - \ No newline at end of file + diff --git a/global.json b/global.json index 5b1ab8d9b9cba2..31094a6ababcb5 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20614.8", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20614.8", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20614.8", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20614.8", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20614.8", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20615.4", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20615.4", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20615.4", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20615.4", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.20615.4", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "6.0.0-alpha.1.20616.14", "Microsoft.Build.NoTargets": "2.0.1",