From c2eb9e54a3a4f2639c21c0168b174cf7e095b6a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Jun 2021 12:05:17 +0000 Subject: [PATCH 01/29] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210614.4 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21313.4 -> To Version 1.0.0-prerelease.21314.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2485b69e1147a..90553bdbb60f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,21 +190,21 @@ https://github.com/dotnet/arcade 85a65ea1fca1d0867f699fed44d191358270bf6a - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f + 2fe17f26ad44632cf806991ef75e50658535f256 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f + 2fe17f26ad44632cf806991ef75e50658535f256 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f + 2fe17f26ad44632cf806991ef75e50658535f256 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 4e5bea15eb5a9c8cf9142195b1c9c78437a5b27f + 2fe17f26ad44632cf806991ef75e50658535f256 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 7c4e7f2107e9a..ff250719db302 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -119,10 +119,10 @@ 6.0.0-beta.21307.1 6.0.0-beta.21307.1 - 1.0.0-prerelease.21313.4 - 1.0.0-prerelease.21313.4 - 1.0.0-prerelease.21313.4 - 1.0.0-prerelease.21313.4 + 1.0.0-prerelease.21314.4 + 1.0.0-prerelease.21314.4 + 1.0.0-prerelease.21314.4 + 1.0.0-prerelease.21314.4 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From dc7b25b1f9bc956069e01d7efd46c93430d94909 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Jun 2021 12:06:26 +0000 Subject: [PATCH 02/29] Update dependencies from https://github.com/dotnet/arcade build 20210614.1 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21311.3 -> To Version 6.0.0-beta.21314.1 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- global.json | 8 ++--- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90553bdbb60f9..86a3d77b6cce4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://github.com/dotnet/arcade - 4a2b475948d498b89fedef7cf890883f49bc1ea3 + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness d6f8a4ad30908fb210390380eae97264e4fbe8ce - + https://github.com/dotnet/arcade - 85a65ea1fca1d0867f699fed44d191358270bf6a + fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ff250719db302..10fe09a40003b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,19 +49,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 2.5.1-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 - 6.0.0-beta.21311.3 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 2.5.1-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 5.9.0-preview.2 diff --git a/global.json b/global.json index df8f7ead63774..f3ed6a6728e2c 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.21311.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21314.1", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21311.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21311.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21311.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21314.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21314.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21314.1", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21314.1" From 1ae7f1e56b3b21823637200a625d784144da7dd1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Jun 2021 12:07:08 +0000 Subject: [PATCH 03/29] Update dependencies from https://github.com/dotnet/icu build 20210614.1 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-preview.6.21307.1 -> To Version 6.0.0-preview.6.21314.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86a3d77b6cce4..45a6e33fa1883 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - d7db669b70f4dd67ec001c192f9809c218cab88b + 8782598ff869582ffe53c0a0dfda2dfcd41382ae diff --git a/eng/Versions.props b/eng/Versions.props index 10fe09a40003b..418e969880388 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,7 +162,7 @@ 6.0.100-preview.6.21310.3 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-preview.6.21307.1 + 6.0.0-preview.6.21314.1 11.1.0-alpha.1.21308.1 11.1.0-alpha.1.21308.1 From 1be2e5830ae68252d299acd227a1a584cf5bc191 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Jun 2021 14:07:05 +0000 Subject: [PATCH 04/29] Update dependencies from https://github.com/dotnet/llvm-project build 20210614.1 runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk , runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 11.1.0-alpha.1.21308.1 -> To Version 11.1.0-alpha.1.21314.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45a6e33fa1883..39812c534c3f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,37 +110,37 @@ https://github.com/dotnet/runtime-assets 0612b036e67746930105231b605c4df9ac6ed47e - + https://github.com/dotnet/llvm-project - a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 + 4f0293e0a254a2f014643ecbe973b81f26c87fd4 - + https://github.com/dotnet/llvm-project - a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 + 4f0293e0a254a2f014643ecbe973b81f26c87fd4 - + https://github.com/dotnet/llvm-project - a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 + 4f0293e0a254a2f014643ecbe973b81f26c87fd4 - + https://github.com/dotnet/llvm-project - a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 + 4f0293e0a254a2f014643ecbe973b81f26c87fd4 - + https://github.com/dotnet/llvm-project - a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 + 4f0293e0a254a2f014643ecbe973b81f26c87fd4 - + https://github.com/dotnet/llvm-project - a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 + 4f0293e0a254a2f014643ecbe973b81f26c87fd4 - + https://github.com/dotnet/llvm-project - a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 + 4f0293e0a254a2f014643ecbe973b81f26c87fd4 - + https://github.com/dotnet/llvm-project - a76e596b96a1b9b4bc7a213f9a8335bcd9189b67 + 4f0293e0a254a2f014643ecbe973b81f26c87fd4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 418e969880388..123f5af7c7ca8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,14 +164,14 @@ 6.0.0-preview.6.21314.1 - 11.1.0-alpha.1.21308.1 - 11.1.0-alpha.1.21308.1 - 11.1.0-alpha.1.21308.1 - 11.1.0-alpha.1.21308.1 - 11.1.0-alpha.1.21308.1 - 11.1.0-alpha.1.21308.1 - 11.1.0-alpha.1.21308.1 - 11.1.0-alpha.1.21308.1 + 11.1.0-alpha.1.21314.1 + 11.1.0-alpha.1.21314.1 + 11.1.0-alpha.1.21314.1 + 11.1.0-alpha.1.21314.1 + 11.1.0-alpha.1.21314.1 + 11.1.0-alpha.1.21314.1 + 11.1.0-alpha.1.21314.1 + 11.1.0-alpha.1.21314.1 6.0.0-preview.6.21275.1 $(MicrosoftNETRuntimeEmscripten2021Nodewinx64Version) From 9f913a163f7f489aace1070f3d908335e5719220 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Jun 2021 14:07:41 +0000 Subject: [PATCH 05/29] Update dependencies from https://github.com/dotnet/runtime-assets build 20210614.1 System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Runtime.TimeZoneData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 6.0.0-beta.21307.1 -> To Version 6.0.0-beta.21314.1 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39812c534c3f8..b4e9caafeabd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -74,41 +74,41 @@ https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 0612b036e67746930105231b605c4df9ac6ed47e + 8d7b898b96cbdb868cac343e938173105287ed9e - + https://github.com/dotnet/runtime-assets - 0612b036e67746930105231b605c4df9ac6ed47e + 8d7b898b96cbdb868cac343e938173105287ed9e - + https://github.com/dotnet/runtime-assets - 0612b036e67746930105231b605c4df9ac6ed47e + 8d7b898b96cbdb868cac343e938173105287ed9e - + https://github.com/dotnet/runtime-assets - 0612b036e67746930105231b605c4df9ac6ed47e + 8d7b898b96cbdb868cac343e938173105287ed9e - + https://github.com/dotnet/runtime-assets - 0612b036e67746930105231b605c4df9ac6ed47e + 8d7b898b96cbdb868cac343e938173105287ed9e - + https://github.com/dotnet/runtime-assets - 0612b036e67746930105231b605c4df9ac6ed47e + 8d7b898b96cbdb868cac343e938173105287ed9e - + https://github.com/dotnet/runtime-assets - 0612b036e67746930105231b605c4df9ac6ed47e + 8d7b898b96cbdb868cac343e938173105287ed9e - + https://github.com/dotnet/runtime-assets - 0612b036e67746930105231b605c4df9ac6ed47e + 8d7b898b96cbdb868cac343e938173105287ed9e - + https://github.com/dotnet/runtime-assets - 0612b036e67746930105231b605c4df9ac6ed47e + 8d7b898b96cbdb868cac343e938173105287ed9e https://github.com/dotnet/llvm-project diff --git a/eng/Versions.props b/eng/Versions.props index 123f5af7c7ca8..4a21f4e6ad8cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -109,15 +109,15 @@ 4.3.0 6.0.0-preview.6.21314.1 - 6.0.0-beta.21307.1 - 6.0.0-beta.21307.1 - 6.0.0-beta.21307.1 - 6.0.0-beta.21307.1 - 6.0.0-beta.21307.1 - 6.0.0-beta.21307.1 - 6.0.0-beta.21307.1 - 6.0.0-beta.21307.1 - 6.0.0-beta.21307.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 + 6.0.0-beta.21314.1 1.0.0-prerelease.21314.4 1.0.0-prerelease.21314.4 From 9ed4798ddf8ee3cb80f211ab2461066b81d5c932 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Jun 2021 14:08:15 +0000 Subject: [PATCH 06/29] Update dependencies from https://github.com/mono/linker build 20210614.2 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.6.21310.3 -> To Version 6.0.100-preview.6.21314.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4e9caafeabd1..87c46bc223c90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,9 +174,9 @@ https://github.com/dotnet/runtime af5c238556e204583b129cc8f5c7338f84dc2c40 - + https://github.com/mono/linker - caeaf2a3fb3f636805fdd4881df4f9a539fff8f6 + f90f5c929054d4b4b69da0a21db4f69aa64d63af https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 4a21f4e6ad8cc..9b5aa4dd829f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,7 +159,7 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.6.21310.3 + 6.0.100-preview.6.21314.2 $(MicrosoftNETILLinkTasksVersion) 6.0.0-preview.6.21314.1 From a1c29e6e638a0170139c719c2f3e32e28f6cd78a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Jun 2021 14:08:51 +0000 Subject: [PATCH 07/29] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210614.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.1-alpha.0.21311.1 -> To Version 1.0.1-alpha.0.21314.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 87c46bc223c90..f211a7f64066f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -210,9 +210,9 @@ https://github.com/dotnet/emsdk defa37b05c734e025292c5747664e970cd2ac444 - + https://github.com/dotnet/hotreload-utils - 25b814e010cd4796cedfbcce72a274c26928f496 + 6adb8ac00a59fe409f232b8b32758aa7d10b4d1d diff --git a/eng/Versions.props b/eng/Versions.props index 9b5aa4dd829f1..fa8a12ef69316 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21314.1 1.0.0-prerelease.21314.1 - 1.0.1-alpha.0.21311.1 + 1.0.1-alpha.0.21314.1 2.4.1 2.4.2 1.3.0 From 6d56936f2621f369db6668b4bcca6786e90b70d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Jun 2021 12:13:58 +0000 Subject: [PATCH 08/29] Update dependencies from https://github.com/dotnet/icu build 20210615.3 Microsoft.NETCore.Runtime.ICU.Transport From Version 6.0.0-preview.6.21307.1 -> To Version 6.0.0-preview.7.21315.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f211a7f64066f..5245e2aa47ad9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/icu - 8782598ff869582ffe53c0a0dfda2dfcd41382ae + 59588c1257a842089d0b7df3bad1cdd69ac720e1 diff --git a/eng/Versions.props b/eng/Versions.props index fa8a12ef69316..2a0dfc827f056 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,7 +162,7 @@ 6.0.100-preview.6.21314.2 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-preview.6.21314.1 + 6.0.0-preview.7.21315.3 11.1.0-alpha.1.21314.1 11.1.0-alpha.1.21314.1 From 0cd34cf7c730a691404644a407c170145e8ca34e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Jun 2021 12:15:38 +0000 Subject: [PATCH 09/29] Update dependencies from https://github.com/dotnet/xharness build 20210616.3 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21314.1 -> To Version 1.0.0-prerelease.21316.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 02e0543e98b8e..8338832edbc2f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21314.1", + "version": "1.0.0-prerelease.21316.3", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5245e2aa47ad9..c0a5c00c2488b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -178,13 +178,13 @@ https://github.com/mono/linker f90f5c929054d4b4b69da0a21db4f69aa64d63af - + https://github.com/dotnet/xharness - d6f8a4ad30908fb210390380eae97264e4fbe8ce + 9c575c39baaeaf436edadb1401fdea41a46ca75c - + https://github.com/dotnet/xharness - d6f8a4ad30908fb210390380eae97264e4fbe8ce + 9c575c39baaeaf436edadb1401fdea41a46ca75c https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2a0dfc827f056..245e060084134 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,8 +146,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21314.1 - 1.0.0-prerelease.21314.1 + 1.0.0-prerelease.21316.3 + 1.0.0-prerelease.21316.3 1.0.1-alpha.0.21314.1 2.4.1 2.4.2 From 16a6c48aa4e39a507c27bc423a6a5d448417ead8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Jun 2021 15:01:55 +0000 Subject: [PATCH 10/29] Update dependencies from https://github.com/dotnet/runtime build 20210616.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-preview.6.21314.1 -> To Version 6.0.0-preview.7.21316.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0a5c00c2488b..d86d4e9e467b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -146,33 +146,33 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/dotnet/runtime - af5c238556e204583b129cc8f5c7338f84dc2c40 + 6b015e2e24461313622575ca56fb76d4ad469ab5 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 245e060084134..36837a3b80d8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,11 +66,11 @@ 5.9.0-preview.2 6.0.0-alpha.1.20612.4 - 6.0.0-preview.6.21314.1 - 6.0.0-preview.6.21314.1 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 3.1.0 - 6.0.0-preview.6.21314.1 + 6.0.0-preview.7.21316.2 1.2.0-beta.304 4.3.0 @@ -100,14 +100,14 @@ 4.3.1 4.7.0 4.7.0 - 6.0.0-preview.6.21314.1 - 6.0.0-preview.6.21314.1 + 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21316.2 4.3.0 4.5.4 4.5.0 1.1.1 4.3.0 - 6.0.0-preview.6.21314.1 + 6.0.0-preview.7.21316.2 6.0.0-beta.21314.1 6.0.0-beta.21314.1 diff --git a/global.json b/global.json index f3ed6a6728e2c..cff5ffcc340a6 100644 --- a/global.json +++ b/global.json @@ -19,6 +19,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21314.1", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "6.0.0-preview.6.21314.1" + "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21316.2" } } From 69ed23da1d2314cfcc064ce7846bdf0563858e69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jun 2021 12:12:55 +0000 Subject: [PATCH 11/29] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210616.6 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21313.4 -> To Version 1.0.0-prerelease.21316.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d86d4e9e467b9..454f29e2236e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,21 +190,21 @@ https://github.com/dotnet/arcade fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2fe17f26ad44632cf806991ef75e50658535f256 + fb9a7745de1ab3b2ef383a2d9c4f8326c90a4580 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2fe17f26ad44632cf806991ef75e50658535f256 + fb9a7745de1ab3b2ef383a2d9c4f8326c90a4580 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2fe17f26ad44632cf806991ef75e50658535f256 + fb9a7745de1ab3b2ef383a2d9c4f8326c90a4580 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 2fe17f26ad44632cf806991ef75e50658535f256 + fb9a7745de1ab3b2ef383a2d9c4f8326c90a4580 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 36837a3b80d8b..1316912773123 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -119,10 +119,10 @@ 6.0.0-beta.21314.1 6.0.0-beta.21314.1 - 1.0.0-prerelease.21314.4 - 1.0.0-prerelease.21314.4 - 1.0.0-prerelease.21314.4 - 1.0.0-prerelease.21314.4 + 1.0.0-prerelease.21316.6 + 1.0.0-prerelease.21316.6 + 1.0.0-prerelease.21316.6 + 1.0.0-prerelease.21316.6 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 15e989153c3140717e0329cdd84d4483041e2c9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jun 2021 12:13:59 +0000 Subject: [PATCH 12/29] Update dependencies from https://github.com/dotnet/arcade build 20210616.3 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21311.3 -> To Version 6.0.0-beta.21316.3 --- eng/Version.Details.xml | 68 +++++++++---------- eng/Versions.props | 26 +++---- .../templates/job/source-index-stage1.yml | 6 +- global.json | 8 +-- 4 files changed, 56 insertions(+), 52 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 454f29e2236e6..889b39f3b36f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness 9c575c39baaeaf436edadb1401fdea41a46ca75c - + https://github.com/dotnet/arcade - fc067a0928f1c8ca4ab3471e9f8edb592e96dec4 + d8967a1e57275aa682c7639ef95b4d148722ba4e https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 1316912773123..6831675d4764b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,19 +49,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 2.5.1-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 - 6.0.0-beta.21314.1 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 + 2.5.1-beta.21316.3 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 + 6.0.0-beta.21316.3 5.9.0-preview.2 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index a649d2b5990c0..b58d42364b9e7 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,15 +1,19 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210421.1 + sourceIndexPackageVersion: 1.0.1-20210614.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: vmImage: vs2017-win2016 + condition: '' + dependsOn: '' jobs: - job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} variables: - name: SourceIndexPackageVersion value: ${{ parameters.sourceIndexPackageVersion }} diff --git a/global.json b/global.json index cff5ffcc340a6..a477455faf3a6 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.21314.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21316.3", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21314.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21314.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21314.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21316.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21316.3", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21316.3", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21316.2" From 019fc250abebd6e94f81762eeddc7fd51c2810b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jun 2021 12:19:38 +0000 Subject: [PATCH 13/29] Update dependencies from https://github.com/mono/linker build 20210616.2 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.6.21310.3 -> To Version 6.0.100-preview.6.21316.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 889b39f3b36f1..0ebbbfda2d855 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,9 +174,9 @@ https://github.com/dotnet/runtime 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/mono/linker - f90f5c929054d4b4b69da0a21db4f69aa64d63af + fb9ef5b60a953842a597f0c71ffb862ecaae4af7 https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index 6831675d4764b..e6a6009614d86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,7 +159,7 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.6.21314.2 + 6.0.100-preview.6.21316.2 $(MicrosoftNETILLinkTasksVersion) 6.0.0-preview.7.21315.3 From 62d6a178f9f83fa70dbe985a2ecc3381f32c166d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Jun 2021 12:13:17 +0000 Subject: [PATCH 14/29] Update dependencies from https://github.com/dotnet/arcade build 20210617.1 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21311.3 -> To Version 6.0.0-beta.21317.1 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- global.json | 8 ++--- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ebbbfda2d855..6170ec5ef4492 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness 9c575c39baaeaf436edadb1401fdea41a46ca75c - + https://github.com/dotnet/arcade - d8967a1e57275aa682c7639ef95b4d148722ba4e + 5619c32997ab2d6a5ddf6d2e488c572b882f891b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index e6a6009614d86..8812373b81ebc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,19 +49,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21316.3 - 6.0.0-beta.21316.3 - 6.0.0-beta.21316.3 - 6.0.0-beta.21316.3 - 6.0.0-beta.21316.3 - 6.0.0-beta.21316.3 - 2.5.1-beta.21316.3 - 6.0.0-beta.21316.3 - 6.0.0-beta.21316.3 - 6.0.0-beta.21316.3 - 6.0.0-beta.21316.3 - 6.0.0-beta.21316.3 - 6.0.0-beta.21316.3 + 6.0.0-beta.21317.1 + 6.0.0-beta.21317.1 + 6.0.0-beta.21317.1 + 6.0.0-beta.21317.1 + 6.0.0-beta.21317.1 + 6.0.0-beta.21317.1 + 2.5.1-beta.21317.1 + 6.0.0-beta.21317.1 + 6.0.0-beta.21317.1 + 6.0.0-beta.21317.1 + 6.0.0-beta.21317.1 + 6.0.0-beta.21317.1 + 6.0.0-beta.21317.1 5.9.0-preview.2 diff --git a/global.json b/global.json index a477455faf3a6..dafd56dce3bbd 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.21316.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21317.1", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21316.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21316.3", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21316.3", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21317.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21317.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21317.1", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21316.2" From 9be421f968e5e20cf5711b1e0346279de3c8090c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Jun 2021 12:15:57 +0000 Subject: [PATCH 15/29] Update dependencies from https://github.com/dotnet/xharness build 20210617.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21314.1 -> To Version 1.0.0-prerelease.21317.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8338832edbc2f..842156378a16b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21316.3", + "version": "1.0.0-prerelease.21317.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6170ec5ef4492..296ed97ab5088 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -178,13 +178,13 @@ https://github.com/mono/linker fb9ef5b60a953842a597f0c71ffb862ecaae4af7 - + https://github.com/dotnet/xharness - 9c575c39baaeaf436edadb1401fdea41a46ca75c + 35f5981ac7ded7c1c95258c0fb86362ed78704b8 - + https://github.com/dotnet/xharness - 9c575c39baaeaf436edadb1401fdea41a46ca75c + 35f5981ac7ded7c1c95258c0fb86362ed78704b8 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 8812373b81ebc..ada2a9983c65a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,8 +146,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21316.3 - 1.0.0-prerelease.21316.3 + 1.0.0-prerelease.21317.2 + 1.0.0-prerelease.21317.2 1.0.1-alpha.0.21314.1 2.4.1 2.4.2 From f0a60c71a5d834f7dba3767006dc1a3a52777da5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Jun 2021 12:18:58 +0000 Subject: [PATCH 16/29] Update dependencies from https://github.com/mono/linker build 20210617.4 Microsoft.NET.ILLink.Tasks From Version 6.0.100-preview.6.21310.3 -> To Version 6.0.100-preview.6.21317.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 296ed97ab5088..e2c12c934ca53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,9 +174,9 @@ https://github.com/dotnet/runtime 6b015e2e24461313622575ca56fb76d4ad469ab5 - + https://github.com/mono/linker - fb9ef5b60a953842a597f0c71ffb862ecaae4af7 + c739a81ba553b00df1cb2f5b9974deae996b757a https://github.com/dotnet/xharness diff --git a/eng/Versions.props b/eng/Versions.props index ada2a9983c65a..11f724db7a54c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,7 +159,7 @@ 5.0.0-preview-20201009.2 - 6.0.100-preview.6.21316.2 + 6.0.100-preview.6.21317.4 $(MicrosoftNETILLinkTasksVersion) 6.0.0-preview.7.21315.3 From ac1b0b1237ab7a4925a33137bd514eadd6aa2c14 Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Thu, 17 Jun 2021 12:15:51 -0700 Subject: [PATCH 17/29] PInvoke warnings fixes for OOB assemblies --- .../src/ILLink/ILLink.Suppressions.xml | 2 +- .../src/ILLink/ILLink.Suppressions.xml | 20 +++++++++++++- .../src/ILLink/ILLink.Suppressions.xml | 2 +- .../src/ILLink/ILLink.Suppressions.xml | 2 +- .../src/ILLink/ILLink.Suppressions.xml | 26 +++++++------------ 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml index 533fc1cd0ed04..0504df00e7659 100644 --- a/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.Data.Odbc/src/ILLink/ILLink.Suppressions.xml @@ -5,7 +5,7 @@ ILLink IL2050 member - M:Interop.Odbc.SQLSetConnectAttrW(System.Data.Odbc.OdbcConnectionHandle,System.Data.Odbc.ODBC32.SQL_ATTR,System.Transactions.IDtcTransaction,System.Int32) + M:System.Data.Odbc.OdbcConnectionHandle.SetConnectionAttribute4(System.Data.Odbc.ODBC32.SQL_ATTR,System.Transactions.IDtcTransaction,System.Int32) ILLink diff --git a/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml index 2e52a33c8a98e..5386e4bd294fc 100644 --- a/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.Data.OleDb/src/ILLink/ILLink.Suppressions.xml @@ -5,7 +5,25 @@ ILLink IL2050 member - M:System.Data.Common.UnsafeNativeMethods.GetErrorInfo(System.Int32,System.Data.Common.UnsafeNativeMethods.IErrorInfo@) + M:System.Data.OleDb.DBPropSet.SetLastErrorInfo(System.Data.OleDb.OleDbHResult) + + + ILLink + IL2050 + member + M:System.Data.OleDb.OleDbConnection.ProcessResults(System.Data.OleDb.OleDbHResult,System.Data.OleDb.OleDbConnection,System.Object) + + + ILLink + IL2050 + member + M:System.Data.OleDb.OleDbDataAdapter.FillClose(System.Boolean,System.Object) + + + ILLink + IL2050 + member + M:System.Data.OleDb.OleDbDataAdapter.FillFromADODB(System.Object,System.Object,System.String,System.Boolean) ILLink diff --git a/src/libraries/System.DirectoryServices.AccountManagement/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.DirectoryServices.AccountManagement/src/ILLink/ILLink.Suppressions.xml index ae9db1185dd9c..7572cc7074afb 100644 --- a/src/libraries/System.DirectoryServices.AccountManagement/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.DirectoryServices.AccountManagement/src/ILLink/ILLink.Suppressions.xml @@ -5,7 +5,7 @@ ILLink IL2050 member - M:System.DirectoryServices.AccountManagement.UnsafeNativeMethods.IntADsOpenObject(System.String,System.String,System.String,System.Int32,System.Guid@,System.Object@) + M:System.DirectoryServices.AccountManagement.UnsafeNativeMethods.ADsOpenObject(System.String,System.String,System.String,System.Int32,System.Guid@,System.Object@) ILLink diff --git a/src/libraries/System.DirectoryServices/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.DirectoryServices/src/ILLink/ILLink.Suppressions.xml index 0e87e736269c4..ca9681a8e8f63 100644 --- a/src/libraries/System.DirectoryServices/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.DirectoryServices/src/ILLink/ILLink.Suppressions.xml @@ -5,7 +5,7 @@ ILLink IL2050 member - M:System.DirectoryServices.Interop.UnsafeNativeMethods.IntADsOpenObject(System.String,System.String,System.String,System.Int32,System.Guid@,System.Object@) + M:System.DirectoryServices.Interop.UnsafeNativeMethods.ADsOpenObject(System.String,System.String,System.String,System.Int32,System.Guid@,System.Object@) ILLink diff --git a/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml b/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml index ec106d4867087..e791a4e65d614 100644 --- a/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml +++ b/src/libraries/System.Drawing.Common/src/ILLink/ILLink.Suppressions.xml @@ -17,67 +17,61 @@ ILLink IL2050 member - M:System.Drawing.Icon.OleCreatePictureIndirect(System.Drawing.Icon.PICTDESC,System.Guid@,System.Boolean) + M:System.Drawing.Bitmap.#ctor(System.IO.Stream,System.Boolean) ILLink IL2050 member - M:System.Drawing.SafeNativeMethods.Gdip.GdipCreateBitmapFromStream(Interop.Ole32.IStream,System.IntPtr@) + M:System.Drawing.Icon.Save(System.IO.Stream) ILLink IL2050 member - M:System.Drawing.SafeNativeMethods.Gdip.GdipCreateBitmapFromStreamICM(Interop.Ole32.IStream,System.IntPtr@) + M:System.Drawing.Image.FromStream(System.IO.Stream,System.Boolean,System.Boolean) ILLink IL2050 member - M:System.Drawing.SafeNativeMethods.Gdip.GdipCreateMetafileFromStream(Interop.Ole32.IStream,System.IntPtr@) + M:System.Drawing.Image.InitializeFromStream(System.IO.Stream) ILLink IL2050 member - M:System.Drawing.SafeNativeMethods.Gdip.GdipGetMetafileHeaderFromStream(Interop.Ole32.IStream,System.IntPtr) + M:System.Drawing.Image.Save(System.IO.Stream,System.Drawing.Imaging.ImageCodecInfo,System.Drawing.Imaging.EncoderParameters) ILLink IL2050 member - M:System.Drawing.SafeNativeMethods.Gdip.GdipLoadImageFromStream(Interop.Ole32.IStream,System.IntPtr@) + M:System.Drawing.Imaging.Metafile.#ctor(System.IO.Stream,System.IntPtr,System.Drawing.Imaging.EmfType,System.String) ILLink IL2050 member - M:System.Drawing.SafeNativeMethods.Gdip.GdipLoadImageFromStreamICM(Interop.Ole32.IStream,System.IntPtr@) + M:System.Drawing.Imaging.Metafile.#ctor(System.IO.Stream,System.IntPtr,System.Drawing.Rectangle,System.Drawing.Imaging.MetafileFrameUnit,System.Drawing.Imaging.EmfType,System.String) ILLink IL2050 member - M:System.Drawing.SafeNativeMethods.Gdip.GdipRecordMetafileStream(Interop.Ole32.IStream,System.IntPtr,System.Drawing.Imaging.EmfType,System.Drawing.RectangleF@,System.Drawing.Imaging.MetafileFrameUnit,System.String,System.IntPtr@) + M:System.Drawing.Imaging.Metafile.#ctor(System.IO.Stream,System.IntPtr,System.Drawing.RectangleF,System.Drawing.Imaging.MetafileFrameUnit,System.Drawing.Imaging.EmfType,System.String) ILLink IL2050 member - M:System.Drawing.SafeNativeMethods.Gdip.GdipRecordMetafileStream(Interop.Ole32.IStream,System.IntPtr,System.Drawing.Imaging.EmfType,System.IntPtr,System.Drawing.Imaging.MetafileFrameUnit,System.String,System.IntPtr@) + M:System.Drawing.Imaging.Metafile.#ctor(System.IO.Stream) ILLink IL2050 member - M:System.Drawing.SafeNativeMethods.Gdip.GdipRecordMetafileStreamI(Interop.Ole32.IStream,System.IntPtr,System.Drawing.Imaging.EmfType,System.Drawing.Rectangle@,System.Drawing.Imaging.MetafileFrameUnit,System.String,System.IntPtr@) - - - ILLink - IL2050 - member - M:System.Drawing.SafeNativeMethods.Gdip.GdipSaveImageToStream(System.Runtime.InteropServices.HandleRef,Interop.Ole32.IStream,System.Guid@,System.Runtime.InteropServices.HandleRef) + M:System.Drawing.Imaging.Metafile.GetMetafileHeader(System.IO.Stream) \ No newline at end of file From a7bff9e693c3e46047cf549226fe79b4d18e5d0e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Jun 2021 12:12:28 +0000 Subject: [PATCH 18/29] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210618.5 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21313.4 -> To Version 1.0.0-prerelease.21318.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2c12c934ca53..42ba532e65ffa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,21 +190,21 @@ https://github.com/dotnet/arcade 5619c32997ab2d6a5ddf6d2e488c572b882f891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - fb9a7745de1ab3b2ef383a2d9c4f8326c90a4580 + 8591e2caf6ce33299ed779e77d7d110f74a9f834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - fb9a7745de1ab3b2ef383a2d9c4f8326c90a4580 + 8591e2caf6ce33299ed779e77d7d110f74a9f834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - fb9a7745de1ab3b2ef383a2d9c4f8326c90a4580 + 8591e2caf6ce33299ed779e77d7d110f74a9f834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - fb9a7745de1ab3b2ef383a2d9c4f8326c90a4580 + 8591e2caf6ce33299ed779e77d7d110f74a9f834 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index dcc72d70074ec..f05207588ec6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,10 +120,10 @@ 6.0.0-beta.21314.1 6.0.0-beta.21314.1 - 1.0.0-prerelease.21316.6 - 1.0.0-prerelease.21316.6 - 1.0.0-prerelease.21316.6 - 1.0.0-prerelease.21316.6 + 1.0.0-prerelease.21318.5 + 1.0.0-prerelease.21318.5 + 1.0.0-prerelease.21318.5 + 1.0.0-prerelease.21318.5 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From aaa240d676e96a8b1e3e0ed4e8bace276ca60a81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Jun 2021 12:13:29 +0000 Subject: [PATCH 19/29] Update dependencies from https://github.com/dotnet/arcade build 20210618.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21311.3 -> To Version 6.0.0-beta.21318.2 --- eng/Version.Details.xml | 68 +++++++++++++++--------------- eng/Versions.props | 26 ++++++------ eng/common/generate-locproject.ps1 | 13 ++++-- global.json | 8 ++-- 4 files changed, 61 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42ba532e65ffa..5fa81924511dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness 35f5981ac7ded7c1c95258c0fb86362ed78704b8 - + https://github.com/dotnet/arcade - 5619c32997ab2d6a5ddf6d2e488c572b882f891b + 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index f05207588ec6f..6d078dfd8282b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,19 +49,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21317.1 - 6.0.0-beta.21317.1 - 6.0.0-beta.21317.1 - 6.0.0-beta.21317.1 - 6.0.0-beta.21317.1 - 6.0.0-beta.21317.1 - 2.5.1-beta.21317.1 - 6.0.0-beta.21317.1 - 6.0.0-beta.21317.1 - 6.0.0-beta.21317.1 - 6.0.0-beta.21317.1 - 6.0.0-beta.21317.1 - 6.0.0-beta.21317.1 + 6.0.0-beta.21318.2 + 6.0.0-beta.21318.2 + 6.0.0-beta.21318.2 + 6.0.0-beta.21318.2 + 6.0.0-beta.21318.2 + 6.0.0-beta.21318.2 + 2.5.1-beta.21318.2 + 6.0.0-beta.21318.2 + 6.0.0-beta.21318.2 + 6.0.0-beta.21318.2 + 6.0.0-beta.21318.2 + 6.0.0-beta.21318.2 + 6.0.0-beta.21318.2 5.9.0-preview.2 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index de348a2e225c0..25e97ac00772d 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -25,8 +25,15 @@ Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to # Template files $jsonFiles = @() -$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern -$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$jsonTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\.+\.en\.json" } # .NET templating pattern +$jsonTemplateFiles | ForEach-Object { + $null = $_.Name -Match "(.+)\.[\w-]+\.json" # matches '[filename].[langcode].json + + $destinationFile = "$($_.Directory.FullName)\$($Matches.1).json" + $jsonFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru +} + +$jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern $xlfFiles = @() @@ -44,7 +51,7 @@ $langXlfFiles | ForEach-Object { $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru } -$locFiles = $jsonFiles + $xlfFiles +$locFiles = $jsonFiles + $jsonWinformsTemplateFiles + $xlfFiles $locJson = @{ Projects = @( diff --git a/global.json b/global.json index dafd56dce3bbd..9d629754cbb65 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.21317.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21318.2", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21317.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21317.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21317.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21318.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21318.2", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21318.2", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21316.2" From 9291f0aa1657ae76f2d85b8710de1726e61c9f5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Jun 2021 12:56:55 +0000 Subject: [PATCH 20/29] Update dependencies from https://github.com/dotnet/xharness build 20210618.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21314.1 -> To Version 1.0.0-prerelease.21318.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 842156378a16b..5c64b00310c9c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21317.2", + "version": "1.0.0-prerelease.21318.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5fa81924511dd..cdba23ecb9030 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -178,13 +178,13 @@ https://github.com/mono/linker c739a81ba553b00df1cb2f5b9974deae996b757a - + https://github.com/dotnet/xharness - 35f5981ac7ded7c1c95258c0fb86362ed78704b8 + c1f8287aa98f6975a18bdc60692343d638540dec - + https://github.com/dotnet/xharness - 35f5981ac7ded7c1c95258c0fb86362ed78704b8 + c1f8287aa98f6975a18bdc60692343d638540dec https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 6d078dfd8282b..ed61b6af6efb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,8 +147,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21317.2 - 1.0.0-prerelease.21317.2 + 1.0.0-prerelease.21318.2 + 1.0.0-prerelease.21318.2 1.0.1-alpha.0.21314.1 2.4.1 2.4.2 From afe994f640951336dff2dde924b6889dbf7ba680 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 20 Jun 2021 12:12:21 +0000 Subject: [PATCH 21/29] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210619.4 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21313.4 -> To Version 1.0.0-prerelease.21319.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cdba23ecb9030..da59714c7b731 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,21 +190,21 @@ https://github.com/dotnet/arcade 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 8591e2caf6ce33299ed779e77d7d110f74a9f834 + d3148c7482231123675b41e4cc6de8b0787b60fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 8591e2caf6ce33299ed779e77d7d110f74a9f834 + d3148c7482231123675b41e4cc6de8b0787b60fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 8591e2caf6ce33299ed779e77d7d110f74a9f834 + d3148c7482231123675b41e4cc6de8b0787b60fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 8591e2caf6ce33299ed779e77d7d110f74a9f834 + d3148c7482231123675b41e4cc6de8b0787b60fe https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index ed61b6af6efb7..70fa1502eb707 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,10 +120,10 @@ 6.0.0-beta.21314.1 6.0.0-beta.21314.1 - 1.0.0-prerelease.21318.5 - 1.0.0-prerelease.21318.5 - 1.0.0-prerelease.21318.5 - 1.0.0-prerelease.21318.5 + 1.0.0-prerelease.21319.4 + 1.0.0-prerelease.21319.4 + 1.0.0-prerelease.21319.4 + 1.0.0-prerelease.21319.4 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 09b9165e8f4cf62b39dbce2431c44538f9c0039e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 20 Jun 2021 12:49:04 +0000 Subject: [PATCH 22/29] Update dependencies from https://github.com/dotnet/arcade build 20210619.2 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.GenFacades , Microsoft.DotNet.GenAPI , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SharedFramework.Sdk From Version 6.0.0-beta.21311.3 -> To Version 6.0.0-beta.21319.2 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- global.json | 8 ++--- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da59714c7b731..97b8ea95d5dc0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness c1f8287aa98f6975a18bdc60692343d638540dec - + https://github.com/dotnet/arcade - 4a2adbaf2da67d8951fbc19d4c257a6fd51741c2 + a3377cccde8639089f99107e2ba5df2c8cbe6394 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 70fa1502eb707..f38b653c2a7af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,19 +49,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21318.2 - 6.0.0-beta.21318.2 - 6.0.0-beta.21318.2 - 6.0.0-beta.21318.2 - 6.0.0-beta.21318.2 - 6.0.0-beta.21318.2 - 2.5.1-beta.21318.2 - 6.0.0-beta.21318.2 - 6.0.0-beta.21318.2 - 6.0.0-beta.21318.2 - 6.0.0-beta.21318.2 - 6.0.0-beta.21318.2 - 6.0.0-beta.21318.2 + 6.0.0-beta.21319.2 + 6.0.0-beta.21319.2 + 6.0.0-beta.21319.2 + 6.0.0-beta.21319.2 + 6.0.0-beta.21319.2 + 6.0.0-beta.21319.2 + 2.5.1-beta.21319.2 + 6.0.0-beta.21319.2 + 6.0.0-beta.21319.2 + 6.0.0-beta.21319.2 + 6.0.0-beta.21319.2 + 6.0.0-beta.21319.2 + 6.0.0-beta.21319.2 5.9.0-preview.2 diff --git a/global.json b/global.json index 9d629754cbb65..8dbd6ba7627bf 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.21318.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21319.2", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21318.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21318.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21318.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21319.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21319.2", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21319.2", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21316.2" From 85d6e207a1782f8c003430e3ba3f41d0fd3aef2f Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 21 Jun 2021 10:12:23 +0200 Subject: [PATCH 23/29] Update testPackages.proj --- src/libraries/pkg/test/testPackages.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index 03492c30ee0f9..da1a848bc2de6 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -75,7 +75,7 @@ - + From faab7614c8149d0571cc25b7da05c635d50ab5fa Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 21 Jun 2021 10:12:52 +0200 Subject: [PATCH 24/29] Update testPackages.proj --- src/libraries/pkg/test/testPackages.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/pkg/test/testPackages.proj b/src/libraries/pkg/test/testPackages.proj index da1a848bc2de6..83ad6233b6432 100644 --- a/src/libraries/pkg/test/testPackages.proj +++ b/src/libraries/pkg/test/testPackages.proj @@ -75,7 +75,7 @@ - + From 190ca6bce65d5d7e0dad08665d8d4aa3e03e4343 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Jun 2021 12:10:01 +0000 Subject: [PATCH 25/29] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210620.4 optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.21313.4 -> To Version 1.0.0-prerelease.21320.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97b8ea95d5dc0..45381af05b64a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -190,21 +190,21 @@ https://github.com/dotnet/arcade a3377cccde8639089f99107e2ba5df2c8cbe6394 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d3148c7482231123675b41e4cc6de8b0787b60fe + f291c7f87a563f29ff2a9af7378495769d97389c - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d3148c7482231123675b41e4cc6de8b0787b60fe + f291c7f87a563f29ff2a9af7378495769d97389c - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d3148c7482231123675b41e4cc6de8b0787b60fe + f291c7f87a563f29ff2a9af7378495769d97389c - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d3148c7482231123675b41e4cc6de8b0787b60fe + f291c7f87a563f29ff2a9af7378495769d97389c https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index f38b653c2a7af..bf567a8869936 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,10 +120,10 @@ 6.0.0-beta.21314.1 6.0.0-beta.21314.1 - 1.0.0-prerelease.21319.4 - 1.0.0-prerelease.21319.4 - 1.0.0-prerelease.21319.4 - 1.0.0-prerelease.21319.4 + 1.0.0-prerelease.21320.4 + 1.0.0-prerelease.21320.4 + 1.0.0-prerelease.21320.4 + 1.0.0-prerelease.21320.4 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 2665b5d2d927ddad9f7e5fad4d44e965b653641d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Jun 2021 13:01:52 +0000 Subject: [PATCH 26/29] Update dependencies from https://github.com/dotnet/runtime build 20210621.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-preview.6.21314.1 -> To Version 6.0.0-preview.7.21321.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ global.json | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45381af05b64a..6c79c11a592c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -146,33 +146,33 @@ https://github.com/dotnet/runtime 38017c3935de95d0335bac04f4901ddfc2718656 - + https://github.com/dotnet/runtime - 6b015e2e24461313622575ca56fb76d4ad469ab5 + f891033db5b8ebf651176a3dcc3bec74a217f85e - + https://github.com/dotnet/runtime - 6b015e2e24461313622575ca56fb76d4ad469ab5 + f891033db5b8ebf651176a3dcc3bec74a217f85e - + https://github.com/dotnet/runtime - 6b015e2e24461313622575ca56fb76d4ad469ab5 + f891033db5b8ebf651176a3dcc3bec74a217f85e - + https://github.com/dotnet/runtime - 6b015e2e24461313622575ca56fb76d4ad469ab5 + f891033db5b8ebf651176a3dcc3bec74a217f85e - + https://github.com/dotnet/runtime - 6b015e2e24461313622575ca56fb76d4ad469ab5 + f891033db5b8ebf651176a3dcc3bec74a217f85e - + https://github.com/dotnet/runtime - 6b015e2e24461313622575ca56fb76d4ad469ab5 + f891033db5b8ebf651176a3dcc3bec74a217f85e - + https://github.com/dotnet/runtime - 6b015e2e24461313622575ca56fb76d4ad469ab5 + f891033db5b8ebf651176a3dcc3bec74a217f85e https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index bf567a8869936..86c7258d41c06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,11 +66,11 @@ 5.9.0-preview.2 6.0.0-alpha.1.20612.4 - 6.0.0-preview.7.21316.2 - 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21321.2 + 6.0.0-preview.7.21321.2 3.1.0 - 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21321.2 5.0.0 4.3.0 @@ -104,11 +104,11 @@ 5.0.0 5.0.0 4.8.1 - 6.0.0-preview.7.21316.2 - 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21321.2 + 6.0.0-preview.7.21321.2 4.5.4 4.5.0 - 6.0.0-preview.7.21316.2 + 6.0.0-preview.7.21321.2 6.0.0-beta.21314.1 6.0.0-beta.21314.1 diff --git a/global.json b/global.json index 8dbd6ba7627bf..5f4ad206db462 100644 --- a/global.json +++ b/global.json @@ -19,6 +19,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21319.2", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21316.2" + "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21321.2" } } From 987a4ce1f6e8a896120b177da92018e9f5802af0 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Tue, 22 Jun 2021 11:46:08 +0200 Subject: [PATCH 27/29] Update dependencies from https://github.com/dotnet/arcade build 20210621.1 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- global.json | 8 ++--- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c79c11a592c1..7678c87d1beea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 https://github.com/microsoft/vstest @@ -186,9 +186,9 @@ https://github.com/dotnet/xharness c1f8287aa98f6975a18bdc60692343d638540dec - + https://github.com/dotnet/arcade - a3377cccde8639089f99107e2ba5df2c8cbe6394 + 36b148348ee8312f6369c0c56b0d0fe07deec603 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 86c7258d41c06..1af96208f79e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,19 +49,19 @@ 3.10.0-2.final 3.10.0-2.final - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 - 2.5.1-beta.21319.2 - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 - 6.0.0-beta.21319.2 + 6.0.0-beta.21321.1 + 6.0.0-beta.21321.1 + 6.0.0-beta.21321.1 + 6.0.0-beta.21321.1 + 6.0.0-beta.21321.1 + 6.0.0-beta.21321.1 + 2.5.1-beta.21321.1 + 6.0.0-beta.21321.1 + 6.0.0-beta.21321.1 + 6.0.0-beta.21321.1 + 6.0.0-beta.21321.1 + 6.0.0-beta.21321.1 + 6.0.0-beta.21321.1 5.9.0-preview.2 diff --git a/global.json b/global.json index 5f4ad206db462..433797e811628 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.21319.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21321.1", "Microsoft.DotNet.PackageValidation": "1.0.0-preview.6.21274.7", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21319.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21319.2", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21319.2", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21321.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21321.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21321.1", "Microsoft.Build.NoTargets": "3.0.4", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-preview.7.21321.2" From 7892b007af4bf2f668d7face3b63bb2b9f9696ed Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Tue, 22 Jun 2021 11:51:21 +0200 Subject: [PATCH 28/29] Fix xml --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a48d4ecdd3ee4..41f02f10fd78d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,7 +215,7 @@ 6adb8ac00a59fe409f232b8b32758aa7d10b4d1d - https://github.com/dotnet/runtime-assets + https://github.com/dotnet/runtime-assets 8d7b898b96cbdb868cac343e938173105287ed9e From 30b07530d4b82b703106485682620acb163fe378 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Tue, 22 Jun 2021 11:52:47 +0200 Subject: [PATCH 29/29] Update dependencies from https://github.com/dotnet/xharness build 20210622.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5c64b00310c9c..6428121a0fec7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21318.2", + "version": "1.0.0-prerelease.21322.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41f02f10fd78d..e8995dca95d92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -178,13 +178,13 @@ https://github.com/mono/linker c739a81ba553b00df1cb2f5b9974deae996b757a - + https://github.com/dotnet/xharness - c1f8287aa98f6975a18bdc60692343d638540dec + 0bb4a23b1b686e8fefde9d4c860b26a8fafc303e - + https://github.com/dotnet/xharness - c1f8287aa98f6975a18bdc60692343d638540dec + 0bb4a23b1b686e8fefde9d4c860b26a8fafc303e https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index bdeaf626b145a..3bc9edaa1b14c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,8 +148,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21318.2 - 1.0.0-prerelease.21318.2 + 1.0.0-prerelease.21322.2 + 1.0.0-prerelease.21322.2 1.0.1-alpha.0.21314.1 2.4.1 2.4.2