From: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 07:29:26 +0000 (-0700) Subject: [main] Update dependencies from dotnet/arcade (#4737) X-Git-Tag: accepted/tizen/unified/20241231.014852~40^2~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=613e3fa562273609aa08857b76744269aae44671;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git [main] Update dependencies from dotnet/arcade (#4737) This pull request updates the following dependencies [marker]: <> (Begin:6d3f346d-45bf-4275-0e83-08d8e40a189f) ## From https://github.com/dotnet/arcade - **Subscription**: 6d3f346d-45bf-4275-0e83-08d8e40a189f - **Build**: 20240614.1 - **Date Produced**: June 14, 2024 3:44:05 PM UTC - **Commit**: 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - **Branch**: refs/heads/main [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 9.0.0-beta.24306.4 to 9.0.0-beta.24314.1][2] - **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.24306.4 to 9.0.0-beta.24314.1][2] - **Microsoft.DotNet.CodeAnalysis**: [from 9.0.0-beta.24306.4 to 9.0.0-beta.24314.1][2] [2]: https://github.com/dotnet/arcade/compare/7507f80c8d...92a725aa4d [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 9.0.100-preview.5.24307.3 [marker]: <> (End:6d3f346d-45bf-4275-0e83-08d8e40a189f) --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Juan Sebastian Hoyos Ayala --- diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa2d7fa97..142ad06a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,19 +10,19 @@ - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 - + https://github.com/dotnet/arcade - 7507f80c8db285bbc9939c1dff522a761cf4edc0 + 92a725aa4d9d6c13dc5229597b51b0b165b8b535 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 207e55cb1..af0f2722d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 6.0.0 6.0.8 2.0.3 - 9.0.0-beta.24306.4 + 9.0.0-beta.24314.1 1.2.0-beta.406 7.0.0-beta.22316.2 10.0.18362 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 7455dcb6a..8bb233ba2 100644 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -131,6 +131,7 @@ __AlpineKeys=' __Keyring= __SkipSigCheck=0 __UseMirror=0 +__UseDeb822Format=0 __UnprocessedBuildArgs= while :; do @@ -181,7 +182,6 @@ while :; do __AlpinePackages="${__AlpinePackages// lldb-dev/}" __QEMUArch=riscv64 __UbuntuArch=riscv64 - __UbuntuRepo="http://deb.debian.org/debian" __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" unset __LLDB_Package @@ -288,6 +288,12 @@ while :; do __CodeName=jammy fi ;; + noble) # Ubuntu 24.04 + if [[ "$__CodeName" != "jessie" ]]; then + __CodeName=noble + fi + __UseDeb822Format=1 + ;; jessie) # Debian 8 __CodeName=jessie @@ -732,8 +738,11 @@ elif [[ -n "$__CodeName" ]]; then fi # shellcheck disable=SC2086 + echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" - cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list" + mkdir -p "$__RootfsDir/etc/apt/sources.list.d/" + grep -q "Types:" "$__CrossDir/$__BuildArch/sources.list.$__CodeName" && filename="$__CodeName.sources" || filename="$__CodeName.list" + cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list.d/$filename" chroot "$__RootfsDir" apt-get update chroot "$__RootfsDir" apt-get -f -y install # shellcheck disable=SC2086 diff --git a/eng/common/cross/riscv64/sources.list.noble b/eng/common/cross/riscv64/sources.list.noble new file mode 100644 index 000000000..4a5b56256 --- /dev/null +++ b/eng/common/cross/riscv64/sources.list.noble @@ -0,0 +1,11 @@ +Types: deb +URIs: http://ports.ubuntu.com/ubuntu-ports/ +Suites: noble noble-updates noble-backports +Components: main universe restricted multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg + +Types: deb +URIs: http://ports.ubuntu.com/ubuntu-ports/ +Suites: noble-security +Components: main universe restricted multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index 9c81aa439..e5de00c89 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -5,6 +5,13 @@ param( [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are ) +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +$disableConfigureToolsetImport = $true +. $PSScriptRoot\..\tools.ps1 + try { & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg } diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index d6a39e31c..8bc107fa7 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -43,7 +43,7 @@ try { --azdev-pat $AzdoToken ` --bar-uri $MaestroApiEndPoint ` --password $MaestroToken ` - --disable-interactive-auth ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 0febe696d..9574f4eb9 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -653,7 +653,7 @@ function GetNuGetPackageCachePath() { $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\' } else { $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\' - $env:RESTORENOCACHE = $true + $env:RESTORENOHTTPCACHE = $true } } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index a4f5d1b77..00473c9f9 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -347,14 +347,14 @@ function InitializeBuildTool { fi } -# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 +# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116 function GetNuGetPackageCachePath { if [[ -z ${NUGET_PACKAGES:-} ]]; then if [[ "$use_global_nuget_cache" == true ]]; then - export NUGET_PACKAGES="$HOME/.nuget/packages" + export NUGET_PACKAGES="$HOME/.nuget/packages/" else - export NUGET_PACKAGES="$repo_root/.packages" - export RESTORENOCACHE=true + export NUGET_PACKAGES="$repo_root/.packages/" + export RESTORENOHTTPCACHE=true fi fi diff --git a/global.json b/global.json index 14b550381..d20c13aa3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.4.24267.66", + "dotnet": "9.0.100-preview.5.24307.3", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreApp60Version)", @@ -16,6 +16,6 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24306.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24314.1" } } diff --git a/src/tests/eventpipe/ContentionEvents.cs b/src/tests/eventpipe/ContentionEvents.cs index 4d5faa1f7..2e41c356a 100644 --- a/src/tests/eventpipe/ContentionEvents.cs +++ b/src/tests/eventpipe/ContentionEvents.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Threading; +using System.Threading.Tasks; using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; @@ -36,7 +37,7 @@ namespace EventPipe.UnitTests.ContentionValidation } [Fact] - public async void Contention_ProducesEvents() + public async Task Contention_ProducesEvents() { await RemoteTestExecutorHelper.RunTestCaseAsync(() => { Dictionary _expectedEventCounts = new() diff --git a/src/tests/eventpipe/CustomEvents.cs b/src/tests/eventpipe/CustomEvents.cs index 01a95709b..bb81f5fd5 100644 --- a/src/tests/eventpipe/CustomEvents.cs +++ b/src/tests/eventpipe/CustomEvents.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.Tracing; +using System.Threading.Tasks; using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Xunit; @@ -30,7 +31,7 @@ namespace EventPipe.UnitTests.CustomEventsValidation } [Fact] - public async void CustomEventProducesEventsWithNoKeywords() + public async Task CustomEventProducesEventsWithNoKeywords() { await RemoteTestExecutorHelper.RunTestCaseAsync(() => { Dictionary _expectedEventCounts = new() diff --git a/src/tests/eventpipe/GCEvents.cs b/src/tests/eventpipe/GCEvents.cs index 15f7e70f3..c4374ff0a 100644 --- a/src/tests/eventpipe/GCEvents.cs +++ b/src/tests/eventpipe/GCEvents.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Runtime.InteropServices; +using System.Threading.Tasks; using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; @@ -35,7 +36,7 @@ namespace EventPipe.UnitTests.GCEventsValidation } [Fact] - public async void GCCollect_ProducesEvents() + public async Task GCCollect_ProducesEvents() { await RemoteTestExecutorHelper.RunTestCaseAsync(() => { Dictionary _expectedEventCounts = new() @@ -117,7 +118,7 @@ namespace EventPipe.UnitTests.GCEventsValidation } [Fact] - public async void GCWaitForPendingFinalizers_ProducesEvents() + public async Task GCWaitForPendingFinalizers_ProducesEvents() { await RemoteTestExecutorHelper.RunTestCaseAsync(() => { Dictionary _expectedEventCounts = new() @@ -167,7 +168,7 @@ namespace EventPipe.UnitTests.GCEventsValidation } [Fact] - public async void GCCollect_ProducesVerboseEvents() + public async Task GCCollect_ProducesVerboseEvents() { await RemoteTestExecutorHelper.RunTestCaseAsync(() => { Dictionary _expectedEventCounts = new() diff --git a/src/tests/eventpipe/LoaderEvents.cs b/src/tests/eventpipe/LoaderEvents.cs index c4ad05a39..4db4b65bf 100644 --- a/src/tests/eventpipe/LoaderEvents.cs +++ b/src/tests/eventpipe/LoaderEvents.cs @@ -8,6 +8,7 @@ using System.IO; using System.Reflection; using System.Runtime.Loader; using System.Threading; +using System.Threading.Tasks; using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; @@ -32,7 +33,7 @@ namespace EventPipe.UnitTests.LoaderEventsValidation } [Fact] - public async void AssemblyLoad_ProducesEvents() + public async Task AssemblyLoad_ProducesEvents() { await RemoteTestExecutorHelper.RunTestCaseAsync(() => { Dictionary _expectedEventCounts = new() diff --git a/src/tests/eventpipe/MethodEvents.cs b/src/tests/eventpipe/MethodEvents.cs index 7e78fe717..ef1daf66f 100644 --- a/src/tests/eventpipe/MethodEvents.cs +++ b/src/tests/eventpipe/MethodEvents.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Threading; +using System.Threading.Tasks; using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; @@ -34,7 +35,7 @@ namespace EventPipe.UnitTests.MethodEventsValidation } [Fact] - public async void MethodVerbose_ProducesEvents() + public async Task MethodVerbose_ProducesEvents() { await RemoteTestExecutorHelper.RunTestCaseAsync(() => { Dictionary _expectedEventCounts = new() diff --git a/src/tests/eventpipe/ThreadPoolEvents.cs b/src/tests/eventpipe/ThreadPoolEvents.cs index c1a167619..3561aab0e 100644 --- a/src/tests/eventpipe/ThreadPoolEvents.cs +++ b/src/tests/eventpipe/ThreadPoolEvents.cs @@ -24,7 +24,7 @@ namespace EventPipe.UnitTests.ThreadPoolValidation } [Fact] - public async void ThreadPool_ProducesEvents() + public async Task ThreadPool_ProducesEvents() { await RemoteTestExecutorHelper.RunTestCaseAsync(() => { Dictionary _expectedEventCounts = new() diff --git a/src/tests/eventpipe/providers.cs b/src/tests/eventpipe/providers.cs index 57a24039a..ffde173d9 100644 --- a/src/tests/eventpipe/providers.cs +++ b/src/tests/eventpipe/providers.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.Tracing; +using System.Threading.Tasks; using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Xunit; @@ -31,7 +32,7 @@ namespace EventPipe.UnitTests.ProviderValidation } [Fact] - public async void UserDefinedEventSource_ProducesEvents() + public async Task UserDefinedEventSource_ProducesEvents() { await RemoteTestExecutorHelper.RunTestCaseAsync(() => { Dictionary expectedEventCounts = new()