From 3781d1d87134c5d80fc294b56963f968a2118f8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Aug 2021 12:11:17 +0000 Subject: [PATCH 01/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210827.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.21425.6 -> To Version 1.0.0-prerelease.21427.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 35dc3c315fc9a..b9f28b0d834e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,21 +206,21 @@ https://github.com/dotnet/arcade 809cbb58dea1d1e477ab0e12855d1758d50844a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1c4754daafb919bfb6bcd995cbaf04f1b4010cfe + c5796198644c0693c616d771b9cc1703da1f8312 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1c4754daafb919bfb6bcd995cbaf04f1b4010cfe + c5796198644c0693c616d771b9cc1703da1f8312 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1c4754daafb919bfb6bcd995cbaf04f1b4010cfe + c5796198644c0693c616d771b9cc1703da1f8312 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 1c4754daafb919bfb6bcd995cbaf04f1b4010cfe + c5796198644c0693c616d771b9cc1703da1f8312 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index a3bb8274ad658..d3b79891e7abe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,10 +127,10 @@ 7.0.0-beta.21423.2 7.0.0-beta.21423.2 - 1.0.0-prerelease.21425.6 - 1.0.0-prerelease.21425.6 - 1.0.0-prerelease.21425.6 - 1.0.0-prerelease.21425.6 + 1.0.0-prerelease.21427.6 + 1.0.0-prerelease.21427.6 + 1.0.0-prerelease.21427.6 + 1.0.0-prerelease.21427.6 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 86b27ec53f9e45eac4d253a1273fac8db65c4d96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Aug 2021 13:34:06 +0000 Subject: [PATCH 02/15] Update dependencies from https://github.com/dotnet/arcade build 20210827.6 Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Build.Tasks.Workloads , 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.21425.3 -> To Version 6.0.0-beta.21427.6 --- eng/Version.Details.xml | 72 +++++++++++------------ eng/Versions.props | 28 ++++----- eng/common/cross/toolchain.cmake | 5 +- eng/common/native/find-native-compiler.sh | 2 +- eng/common/templates/job/job.yml | 2 +- global.json | 8 +-- 6 files changed, 57 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9f28b0d834e8..a676a44b31f37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,73 +14,73 @@ - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 870d4582f5fe1a8a7ca9a14cc1de0fc88ee4d4f6 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 https://github.com/microsoft/vstest @@ -202,9 +202,9 @@ https://github.com/dotnet/xharness d78f6e0d1ed604c4409b6fdfc692dd08b27460a9 - + https://github.com/dotnet/arcade - 809cbb58dea1d1e477ab0e12855d1758d50844a8 + 474307e526160c813c9fd58060eb8356ccca6099 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index d3b79891e7abe..28738ebe272cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,20 +53,20 @@ 1.0.0-rc.1.21426.17 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 2.5.1-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 - 6.0.0-beta.21425.3 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 2.5.1-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 + 6.0.0-beta.21427.6 6.0.0-preview.1.102 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index d8f61472abb77..fc11001aa76c8 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -44,7 +44,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(CMAKE_SYSTEM_PROCESSOR "x86_64") - set(triple "x86_64-unknown-freebsd12") + set(triple "x86_64-unknown-freebsd11") elseif (ILLUMOS) set(CMAKE_SYSTEM_PROCESSOR "x86_64") set(TOOLCHAIN "x86_64-illumos") @@ -90,9 +90,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_CXX_COMPILER_TARGET ${triple}) set(CMAKE_ASM_COMPILER_TARGET ${triple}) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld") - set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld") set(CMAKE_SYSROOT "${CROSS_ROOTFS}") elseif(ILLUMOS) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") diff --git a/eng/common/native/find-native-compiler.sh b/eng/common/native/find-native-compiler.sh index 861d1931e55e3..aed19d07d506f 100644 --- a/eng/common/native/find-native-compiler.sh +++ b/eng/common/native/find-native-compiler.sh @@ -55,7 +55,7 @@ if [ -z "$CLR_CC" ]; then # Set default versions if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [ "$compiler" = "clang" ]; then versions=( 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) + if [ "$compiler" = "clang" ]; then versions=( 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 ) elif [ "$compiler" = "gcc" ]; then versions=( 9 8 7 6 5 4.9 ); fi for version in "${versions[@]}"; do diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 8669679348024..37dceb1bab0a9 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -103,7 +103,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@2 + - task: MicroBuildSigningPlugin@3 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/global.json b/global.json index bcb0e2427c644..b56f02008616c 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21425.3", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21425.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21425.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21427.6", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.6", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21427.6", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21422.3" From d736cbf5188441f7ddde4831f71640dfd1fe4128 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Aug 2021 13:34:35 +0000 Subject: [PATCH 03/15] Update dependencies from https://github.com/dotnet/xharness build 20210827.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.21426.1 -> To Version 1.0.0-prerelease.21427.1 --- .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 38b384ea45449..c2fdf6447acfb 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21426.1", + "version": "1.0.0-prerelease.21427.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a676a44b31f37..36c6210e22bd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,13 +194,13 @@ https://github.com/mono/linker 38544e820223e60d0abe2801b2856cd124679522 - + https://github.com/dotnet/xharness - d78f6e0d1ed604c4409b6fdfc692dd08b27460a9 + 2e03d2d1081b606ad3c5f79709297a9c5627854d - + https://github.com/dotnet/xharness - d78f6e0d1ed604c4409b6fdfc692dd08b27460a9 + 2e03d2d1081b606ad3c5f79709297a9c5627854d https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 28738ebe272cb..e65e67d7b32ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -154,8 +154,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21426.1 - 1.0.0-prerelease.21426.1 + 1.0.0-prerelease.21427.1 + 1.0.0-prerelease.21427.1 1.0.2-alpha.0.21425.1 2.4.1 2.4.2 From a0fb4d89f8093ab9b0a6d748cedeecc4dedf796f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Aug 2021 13:35:03 +0000 Subject: [PATCH 04/15] Update dependencies from https://github.com/dotnet/msquic build 20210826.1 System.Net.MsQuic.Transport From Version 6.0.0-preview.7.21425.1 -> To Version 6.0.0-preview.7.21426.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 36c6210e22bd1..59a87743849dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,9 +4,9 @@ https://github.com/dotnet/icu 5c8d6612b9a8f0a0279df07286c35d3dbe62b2e3 - + https://github.com/dotnet/msquic - 5a2fcca17678a0c3a84f94a927db69e759fd955d + 2966c909aa6637767f09395a5fd7a45c6e07b7e7 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index e65e67d7b32ea..f8aab669fdc00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -173,7 +173,7 @@ 7.0.0-alpha.1.21423.1 - 6.0.0-preview.7.21425.1 + 6.0.0-preview.7.21426.1 11.1.0-alpha.1.21423.1 11.1.0-alpha.1.21423.1 From 92f8224dd6b68a85f5199d6b639530e0697e22bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Aug 2021 13:35:31 +0000 Subject: [PATCH 05/15] Update dependencies from https://github.com/dotnet/hotreload-utils build 20210827.1 Microsoft.DotNet.HotReload.Utils.Generator.BuildTool From Version 1.0.2-alpha.0.21425.1 -> To Version 1.0.2-alpha.0.21427.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 59a87743849dc..dc2268fffdc3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -222,9 +222,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization c5796198644c0693c616d771b9cc1703da1f8312 - + https://github.com/dotnet/hotreload-utils - 296d9b615300fe236c54721e5a50cacd843eeaf3 + 9072cbb58b1efe912c1b112265fcab18fa2a43df https://github.com/dotnet/runtime-assets diff --git a/eng/Versions.props b/eng/Versions.props index f8aab669fdc00..195d25f768fc1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,7 +156,7 @@ 16.9.0-preview-20201201-01 1.0.0-prerelease.21427.1 1.0.0-prerelease.21427.1 - 1.0.2-alpha.0.21425.1 + 1.0.2-alpha.0.21427.1 2.4.1 2.4.2 1.3.0 From faeb51b4b429c05956e68509d4ed1a839f8a00e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Aug 2021 13:36:00 +0000 Subject: [PATCH 06/15] Update dependencies from https://github.com/dotnet/sdk build 20210828.10 Microsoft.DotNet.Compatibility From Version 1.0.0-rc.1.21426.17 -> To Version 1.0.0-rc.1.21428.10 --- 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 dc2268fffdc3e..0648fb587cc7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/roslyn-analyzers 9a1f02eff42635a5a9934735f12c722c3bfba8e8 - + https://github.com/dotnet/sdk - c9baf2d5ea9d76cbef13b0dcd51877715c9b009a + 813913938ba3893273952d966f423da72aca8963 diff --git a/eng/Versions.props b/eng/Versions.props index 195d25f768fc1..af23fd86f86a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 3.10.0 6.0.0-rc1.21413.4 - 1.0.0-rc.1.21426.17 + 1.0.0-rc.1.21428.10 6.0.0-beta.21427.6 6.0.0-beta.21427.6 From 05107f002079465fe4bd51a477522856f62f9f78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 29 Aug 2021 12:09:47 +0000 Subject: [PATCH 07/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210828.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.21425.6 -> To Version 1.0.0-prerelease.21428.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 0648fb587cc7b..5d729a3946bdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,21 +206,21 @@ https://github.com/dotnet/arcade 474307e526160c813c9fd58060eb8356ccca6099 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - c5796198644c0693c616d771b9cc1703da1f8312 + 6ea283b355c3dfca6cbc6e0c146801d945e027ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - c5796198644c0693c616d771b9cc1703da1f8312 + 6ea283b355c3dfca6cbc6e0c146801d945e027ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - c5796198644c0693c616d771b9cc1703da1f8312 + 6ea283b355c3dfca6cbc6e0c146801d945e027ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - c5796198644c0693c616d771b9cc1703da1f8312 + 6ea283b355c3dfca6cbc6e0c146801d945e027ac https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index af23fd86f86a7..21ccd69a12908 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,10 +127,10 @@ 7.0.0-beta.21423.2 7.0.0-beta.21423.2 - 1.0.0-prerelease.21427.6 - 1.0.0-prerelease.21427.6 - 1.0.0-prerelease.21427.6 - 1.0.0-prerelease.21427.6 + 1.0.0-prerelease.21428.5 + 1.0.0-prerelease.21428.5 + 1.0.0-prerelease.21428.5 + 1.0.0-prerelease.21428.5 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From 657c654c133e641f4b0372bf687ecff77f04c562 Mon Sep 17 00:00:00 2001 From: Stephen Toub Date: Sun, 29 Aug 2021 21:50:24 -0400 Subject: [PATCH 08/15] Fix IDE0062 warning in NumberFormatInfo.cs --- .../src/System/Globalization/NumberFormatInfo.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libraries/System.Private.CoreLib/src/System/Globalization/NumberFormatInfo.cs b/src/libraries/System.Private.CoreLib/src/System/Globalization/NumberFormatInfo.cs index ee7c38e7777cf..931e4b62e5a17 100644 --- a/src/libraries/System.Private.CoreLib/src/System/Globalization/NumberFormatInfo.cs +++ b/src/libraries/System.Private.CoreLib/src/System/Globalization/NumberFormatInfo.cs @@ -733,9 +733,9 @@ internal static void ValidateParseStyleInteger(NumberStyles style) if ((style & (InvalidNumberStyles | NumberStyles.AllowHexSpecifier)) != 0 && (style & ~NumberStyles.HexNumber) != 0) { - throwInvalid(style); + ThrowInvalid(style); - void throwInvalid(NumberStyles value) + static void ThrowInvalid(NumberStyles value) { if ((value & InvalidNumberStyles) != 0) { @@ -752,9 +752,9 @@ internal static void ValidateParseStyleFloatingPoint(NumberStyles style) // Check for undefined flags or hex number if ((style & (InvalidNumberStyles | NumberStyles.AllowHexSpecifier)) != 0) { - throwInvalid(style); + ThrowInvalid(style); - void throwInvalid(NumberStyles value) + static void ThrowInvalid(NumberStyles value) { if ((value & InvalidNumberStyles) != 0) { From b4cfed8201dacb9fd3eed96b3a631dd1f57bd8bc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 30 Aug 2021 11:02:03 +0200 Subject: [PATCH 09/15] Downgrade Compatibility package upgrade --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d729a3946bdd..f9956b7d694b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/roslyn-analyzers 9a1f02eff42635a5a9934735f12c722c3bfba8e8 - + https://github.com/dotnet/sdk - 813913938ba3893273952d966f423da72aca8963 + c9baf2d5ea9d76cbef13b0dcd51877715c9b009a From 0ae55cf95f861948562833af6a7504874109403b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 30 Aug 2021 11:02:30 +0200 Subject: [PATCH 10/15] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 21ccd69a12908..2b902722847be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 3.10.0 6.0.0-rc1.21413.4 - 1.0.0-rc.1.21428.10 + 1.0.0-rc.1.21426.17 6.0.0-beta.21427.6 6.0.0-beta.21427.6 From 456665a18279227e0b71b3c63e48859b3e6ed41f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Aug 2021 12:10:23 +0000 Subject: [PATCH 11/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20210829.2 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.21425.6 -> To Version 1.0.0-prerelease.21429.2 --- 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 f9956b7d694b0..16386a6185352 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,21 +206,21 @@ https://github.com/dotnet/arcade 474307e526160c813c9fd58060eb8356ccca6099 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 6ea283b355c3dfca6cbc6e0c146801d945e027ac + 1d5019e775710e07cb45e9ff1a96e6171c9c9808 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 6ea283b355c3dfca6cbc6e0c146801d945e027ac + 1d5019e775710e07cb45e9ff1a96e6171c9c9808 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 6ea283b355c3dfca6cbc6e0c146801d945e027ac + 1d5019e775710e07cb45e9ff1a96e6171c9c9808 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 6ea283b355c3dfca6cbc6e0c146801d945e027ac + 1d5019e775710e07cb45e9ff1a96e6171c9c9808 https://github.com/dotnet/hotreload-utils diff --git a/eng/Versions.props b/eng/Versions.props index 2b902722847be..9eda06bc23674 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,10 +127,10 @@ 7.0.0-beta.21423.2 7.0.0-beta.21423.2 - 1.0.0-prerelease.21428.5 - 1.0.0-prerelease.21428.5 - 1.0.0-prerelease.21428.5 - 1.0.0-prerelease.21428.5 + 1.0.0-prerelease.21429.2 + 1.0.0-prerelease.21429.2 + 1.0.0-prerelease.21429.2 + 1.0.0-prerelease.21429.2 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 From fc3194467f5eb0faffacd2342ba796d89aa6ef92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Aug 2021 12:11:00 +0000 Subject: [PATCH 12/15] Update dependencies from https://github.com/dotnet/runtime build 20210830.3 Microsoft.NETCore.ILAsm , Microsoft.NETCore.DotNetHostPolicy , Microsoft.NETCore.DotNetHost , Microsoft.NETCore.App.Runtime.win-x64 , runtime.native.System.IO.Ports , Microsoft.NET.Sdk.IL , System.Text.Json , System.Runtime.CompilerServices.Unsafe From Version 7.0.0-alpha.1.21422.3 -> To Version 7.0.0-alpha.1.21430.3 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 14 +++++++------- global.json | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16386a6185352..a79de59c34628 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -158,37 +158,37 @@ https://github.com/dotnet/llvm-project d3d2c8a945299ff90b998de4b3cdf863be0f043e - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be - + https://github.com/dotnet/runtime - 3d5d26181cd7bc07ea6c6f87710c14ccd043b415 + 9671726c0a79d5f4cab320b32da1cd4463a0d1be https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 9eda06bc23674..23362c945810b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,12 +70,12 @@ 6.0.0-preview.1.102 - 7.0.0-alpha.1.21422.3 - 7.0.0-alpha.1.21422.3 - 7.0.0-alpha.1.21422.3 + 7.0.0-alpha.1.21430.3 + 7.0.0-alpha.1.21430.3 + 7.0.0-alpha.1.21430.3 3.1.0 - 7.0.0-alpha.1.21422.3 + 7.0.0-alpha.1.21430.3 5.0.0 4.3.0 @@ -109,11 +109,11 @@ 5.0.0 5.0.0 4.8.1 - 7.0.0-alpha.1.21422.3 - 7.0.0-alpha.1.21422.3 + 7.0.0-alpha.1.21430.3 + 7.0.0-alpha.1.21430.3 4.5.4 4.5.0 - 7.0.0-alpha.1.21422.3 + 7.0.0-alpha.1.21430.3 7.0.0-beta.21423.2 7.0.0-beta.21423.2 diff --git a/global.json b/global.json index b56f02008616c..4b7128dcf66e6 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21427.6", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21422.3" + "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.21430.3" } } From 4c79b819f4faac3ffd524304b60c9274530012e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Aug 2021 13:56:33 +0000 Subject: [PATCH 13/15] Update dependencies from https://github.com/dotnet/sdk build 20210830.5 Microsoft.DotNet.Compatibility From Version 1.0.0-rc.1.21426.17 -> To Version 1.0.0-rc.1.21430.5 --- 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 a79de59c34628..c97f12324a290 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/roslyn-analyzers 9a1f02eff42635a5a9934735f12c722c3bfba8e8 - + https://github.com/dotnet/sdk - c9baf2d5ea9d76cbef13b0dcd51877715c9b009a + 5b122747d581135d3c29f8faa0290f60df2f3cea diff --git a/eng/Versions.props b/eng/Versions.props index 23362c945810b..49dd57daae7f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 3.10.0 6.0.0-rc1.21413.4 - 1.0.0-rc.1.21426.17 + 1.0.0-rc.1.21430.5 6.0.0-beta.21427.6 6.0.0-beta.21427.6 From 437b3bfddefa8e8b42507bffe68e5b60db224af1 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 30 Aug 2021 16:12:26 +0200 Subject: [PATCH 14/15] Update Version.Details.xml --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c97f12324a290..a79de59c34628 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/roslyn-analyzers 9a1f02eff42635a5a9934735f12c722c3bfba8e8 - + https://github.com/dotnet/sdk - 5b122747d581135d3c29f8faa0290f60df2f3cea + c9baf2d5ea9d76cbef13b0dcd51877715c9b009a From 5fa6e8e8235b1035b6a59ce6660a78ee5b17e9bc Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 30 Aug 2021 16:12:40 +0200 Subject: [PATCH 15/15] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 49dd57daae7f1..23362c945810b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 3.10.0 6.0.0-rc1.21413.4 - 1.0.0-rc.1.21430.5 + 1.0.0-rc.1.21426.17 6.0.0-beta.21427.6 6.0.0-beta.21427.6