From 50f2780c1367941c09f6fc319759c258590d104b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Oct 2023 16:18:06 +0000 Subject: [PATCH 01/11] Update dependencies from https://github.com/dotnet/arcade build 20231023.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23518.2 -> To Version 9.0.0-beta.23523.2 --- eng/Version.Details.xml | 76 ++++++++++++++++---------------- eng/Versions.props | 32 +++++++------- eng/common/cross/toolchain.cmake | 8 ++-- global.json | 6 +-- 4 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d18bf4c0139c..d52b1d0f402c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b @@ -117,73 +117,73 @@ d66a09c8b11e1235273c8e6cd946e5c8e247f189 - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 3fc757d9b48e116713d1e0e3a3bd111a588905cb - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 759d9b9d068ee79bd021aef0e48e14400389623b https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 477e04d50570f..7bed21fe425a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23524.12 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 2.5.1-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 2.5.3-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 + 9.0.0-beta.23523.2 6.0.0-preview.1.102 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index cb0aaa7606345..00288a300653a 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/13.1.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") diff --git a/global.json b/global.json index a473434ed1a1d..e3e26ec411338 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-rtm.23506.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23518.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23518.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23523.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23523.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23523.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23523.1" From 232c4dd1c5b8d124d5fe1dbe7206e16568a255d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Oct 2023 09:07:48 +0000 Subject: [PATCH 02/11] Update dependencies from https://github.com/dotnet/arcade build 20231024.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23518.2 -> To Version 9.0.0-beta.23524.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23516.1 -> To Version 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Helix.Sdk --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- global.json | 6 ++-- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d52b1d0f402c2..d54bba331c56b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,83 +107,83 @@ - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/xliff-tasks - d66a09c8b11e1235273c8e6cd946e5c8e247f189 + 83531fff1a39abe38de53e2e6b702bc1bb9c3bb4 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness 3fc757d9b48e116713d1e0e3a3bd111a588905cb - + https://github.com/dotnet/arcade - 759d9b9d068ee79bd021aef0e48e14400389623b + 3b9d8a14dfad67dc3a5c18734db967d3ad173537 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 7bed21fe425a9..cf8b0cec02eeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23524.12 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 2.5.3-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 - 9.0.0-beta.23523.2 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 2.5.3-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 + 9.0.0-beta.23524.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index e3e26ec411338..115783d448aa7 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-rtm.23506.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23523.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23523.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23523.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23524.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23524.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23524.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23523.1" From 78f3a8d968bd9aac52fbb557a35c4ee40b9029a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Oct 2023 12:05:12 +0000 Subject: [PATCH 03/11] Update dependencies from https://github.com/dotnet/arcade build 20231024.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23518.2 -> To Version 9.0.0-beta.23524.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23516.1 -> To Version 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Helix.Sdk From db026527446f8841b494bb97a20c2601ecfeab67 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Oct 2023 12:07:14 +0000 Subject: [PATCH 04/11] Update dependencies from https://github.com/dotnet/xharness build 20231025.2 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 8.0.0-prerelease.23523.1 -> To Version 8.0.0-prerelease.23525.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5dbf8980ea163..1eb895ea313e2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.23523.1", + "version": "8.0.0-prerelease.23525.2", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d54bba331c56b..e659b263f3dda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -318,17 +318,17 @@ https://github.com/dotnet/runtime 2959e1acd09aec0f1e59db9cbe41f3701b0bd4dd - + https://github.com/dotnet/xharness - 3fc757d9b48e116713d1e0e3a3bd111a588905cb + abaa77ecc150bc450f4865df3ae31c3f5b9c1490 - + https://github.com/dotnet/xharness - 3fc757d9b48e116713d1e0e3a3bd111a588905cb + abaa77ecc150bc450f4865df3ae31c3f5b9c1490 - + https://github.com/dotnet/xharness - 3fc757d9b48e116713d1e0e3a3bd111a588905cb + abaa77ecc150bc450f4865df3ae31c3f5b9c1490 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index cf8b0cec02eeb..3e2309aba5dca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,9 +178,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 8.0.0-prerelease.23523.1 - 8.0.0-prerelease.23523.1 - 8.0.0-prerelease.23523.1 + 8.0.0-prerelease.23525.2 + 8.0.0-prerelease.23525.2 + 8.0.0-prerelease.23525.2 9.0.0-alpha.0.23523.3 3.12.0 4.1.0 From 462413b18424500eb9f6b214f0f343fe89101a0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Oct 2023 12:30:06 +0000 Subject: [PATCH 05/11] Update dependencies from https://github.com/dotnet/sdk build 20231025.7 Microsoft.DotNet.ApiCompat.Task From Version 9.0.100-alpha.1.23524.12 -> To Version 9.0.100-alpha.1.23525.7 --- 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 e659b263f3dda..6a46429a1141e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -379,9 +379,9 @@ https://github.com/dotnet/roslyn-analyzers b4ed6a3093cfd3c8d353214ce97aaa7d24cf2df1 - + https://github.com/dotnet/sdk - 520797bdd9cf4ea016f28b14fa810aa295c931d6 + 7dff4feaada8b59d3eecf6ec662dc5c85f947e62 diff --git a/eng/Versions.props b/eng/Versions.props index 3e2309aba5dca..d430256433992 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ 0.2.0 - 9.0.100-alpha.1.23524.12 + 9.0.100-alpha.1.23525.7 9.0.0-beta.23524.1 9.0.0-beta.23524.1 From 3c8e07cfdd27dca66df2354767a779c534c8158e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Oct 2023 12:06:00 +0000 Subject: [PATCH 06/11] Update dependencies from https://github.com/dotnet/arcade build 20231025.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.23518.2 -> To Version 9.0.0-beta.23525.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23516.1 -> To Version 1.0.0-beta.23523.1 (parent: Microsoft.DotNet.Helix.Sdk --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- eng/common/tools.ps1 | 4 +-- eng/common/tools.sh | 4 +-- global.json | 6 ++-- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a46429a1141e..aa090c299bfc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,9 +107,9 @@ - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae @@ -117,73 +117,73 @@ 83531fff1a39abe38de53e2e6b702bc1bb9c3bb4 - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae https://github.com/dotnet/runtime-assets @@ -330,9 +330,9 @@ https://github.com/dotnet/xharness abaa77ecc150bc450f4865df3ae31c3f5b9c1490 - + https://github.com/dotnet/arcade - 3b9d8a14dfad67dc3a5c18734db967d3ad173537 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index d430256433992..80dfb9d35dcdb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23525.7 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 2.5.3-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 - 9.0.0-beta.23524.1 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 2.5.3-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 6.0.0-preview.1.102 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91f859..e8def7e6a85f2 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -158,7 +158,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we do not need all ASP.NET packages restored. - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + $env:DOTNET_NOLOGO=1 # Disable telemetry on CI. if ($ci) { @@ -228,7 +228,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' - Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d478943341d..710e64df967fd 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -112,7 +112,7 @@ function InitializeDotNetCli { export DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we want to control all package sources - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_NOLOGO=1 # Disable telemetry on CI if [[ $ci == true ]]; then @@ -165,7 +165,7 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" - Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" + Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value _InitializeDotNetCli="$dotnet_root" diff --git a/global.json b/global.json index 115783d448aa7..b9ab9626f2361 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-rtm.23506.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23524.1", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23524.1", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23524.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23525.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23525.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23525.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23523.1" From c534184ad3c95229584e4821c38f90a545498476 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Oct 2023 12:08:05 +0000 Subject: [PATCH 07/11] Update dependencies from https://github.com/dotnet/xharness build 20231026.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 8.0.0-prerelease.23523.1 -> To Version 9.0.0-prerelease.23526.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1eb895ea313e2..968403269807c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.23525.2", + "version": "9.0.0-prerelease.23526.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa090c299bfc6..c4537381711d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -318,17 +318,17 @@ https://github.com/dotnet/runtime 2959e1acd09aec0f1e59db9cbe41f3701b0bd4dd - + https://github.com/dotnet/xharness - abaa77ecc150bc450f4865df3ae31c3f5b9c1490 + ab9528860ac51bb0aa6112fa2605b18c926594ef - + https://github.com/dotnet/xharness - abaa77ecc150bc450f4865df3ae31c3f5b9c1490 + ab9528860ac51bb0aa6112fa2605b18c926594ef - + https://github.com/dotnet/xharness - abaa77ecc150bc450f4865df3ae31c3f5b9c1490 + ab9528860ac51bb0aa6112fa2605b18c926594ef https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 80dfb9d35dcdb..8033d0b662865 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,9 +178,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 8.0.0-prerelease.23525.2 - 8.0.0-prerelease.23525.2 - 8.0.0-prerelease.23525.2 + 9.0.0-prerelease.23526.1 + 9.0.0-prerelease.23526.1 + 9.0.0-prerelease.23526.1 9.0.0-alpha.0.23523.3 3.12.0 4.1.0 From 716d2174cca26d7c0e29cda60b288ea76f9e55ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Oct 2023 12:29:45 +0000 Subject: [PATCH 08/11] Update dependencies from https://github.com/dotnet/sdk build 20231025.29 Microsoft.DotNet.ApiCompat.Task From Version 9.0.100-alpha.1.23524.12 -> To Version 9.0.100-alpha.1.23525.29 --- 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 c4537381711d3..278d57999a271 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -379,9 +379,9 @@ https://github.com/dotnet/roslyn-analyzers b4ed6a3093cfd3c8d353214ce97aaa7d24cf2df1 - + https://github.com/dotnet/sdk - 7dff4feaada8b59d3eecf6ec662dc5c85f947e62 + 92a2dbef8611cf00d92317e66611848143cdbfed diff --git a/eng/Versions.props b/eng/Versions.props index 8033d0b662865..e624284c9bc45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ 0.2.0 - 9.0.100-alpha.1.23525.7 + 9.0.100-alpha.1.23525.29 9.0.0-beta.23525.2 9.0.0-beta.23525.2 From c8cdfc664571a5605d82d7905c73f601acaba8f6 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Thu, 26 Oct 2023 09:09:02 -0700 Subject: [PATCH 09/11] Try inheriting from LongLivedMarshalByRefObject --- .../tests/SingleFileTestRunner/SingleFileTestRunner.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs b/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs index 4f99005491b79..92b1359e60b68 100644 --- a/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs +++ b/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs @@ -72,16 +72,16 @@ public static int Main(string[] args) if (args[i].Equals("-notrait", StringComparison.OrdinalIgnoreCase)) { var traitKeyValue = args[i + 1].Split("=", StringSplitOptions.TrimEntries); - + if (!noTraits.TryGetValue(traitKeyValue[0], out List values)) { noTraits.Add(traitKeyValue[0], values = new List()); } - + values.Add(traitKeyValue[1]); i++; } - + if (args[i].Equals("-xml", StringComparison.OrdinalIgnoreCase)) { xmlResultFileName = args[i + 1].Trim(); @@ -167,7 +167,7 @@ public static int Main(string[] args) } } -internal class ConsoleDiagnosticMessageSink : IMessageSink +internal class ConsoleDiagnosticMessageSink : IMessageSink, LongLivedMarshalByRefObject { public bool OnMessage(IMessageSinkMessage message) { From cbc4ceb91b78bef46af5837827acf491128b6fe0 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Thu, 26 Oct 2023 10:39:05 -0700 Subject: [PATCH 10/11] Resolve XUnit ambiguity --- .../Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs b/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs index 92b1359e60b68..0f176f089119d 100644 --- a/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs +++ b/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs @@ -167,7 +167,7 @@ public static int Main(string[] args) } } -internal class ConsoleDiagnosticMessageSink : IMessageSink, LongLivedMarshalByRefObject +internal class ConsoleDiagnosticMessageSink : IMessageSink, Xunit.LongLivedMarshalByRefObject { public bool OnMessage(IMessageSinkMessage message) { From af79ffd387d8bb072b2561239bf6d72dd8a178a8 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Thu, 26 Oct 2023 10:41:19 -0700 Subject: [PATCH 11/11] Just disable the warning --- .../tests/SingleFileTestRunner/SingleFileTestRunner.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs b/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs index 0f176f089119d..8afbf22547ddd 100644 --- a/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs +++ b/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs @@ -167,7 +167,9 @@ public static int Main(string[] args) } } -internal class ConsoleDiagnosticMessageSink : IMessageSink, Xunit.LongLivedMarshalByRefObject +// This is about running on desktop FX, which we don't do +#pragma warning disable xUnit3000 +internal class ConsoleDiagnosticMessageSink : IMessageSink { public bool OnMessage(IMessageSinkMessage message) { @@ -178,3 +180,4 @@ public bool OnMessage(IMessageSinkMessage message) return false; } } +#pragma warning restore xUnit3000