[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] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Juan Sebastian Hoyos Ayala <juan.hoyos@microsoft.com>

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index aa2d7fa97fd0c05f055ef29f3e77a3bedb18d532..142ad06a30f6e95ada31941d31af37797788bac8 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -10,19 +10,19 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24306.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24314.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
+      <Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24306.4">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24314.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
+      <Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24306.4">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24314.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7507f80c8db285bbc9939c1dff522a761cf4edc0</Sha>
+      <Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="7.0.0-beta.22316.2" Pinned="true">
       <Uri>https://github.com/dotnet/arcade</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
index 207e55cb1558415f784dccd12d093f59dae92d38..af0f2722de8ebf23e6086b13a78320f22a94a2c0 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -51,7 +51,7 @@
     <SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
     <SystemTextJsonVersion>6.0.8</SystemTextJsonVersion>
     <XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24306.4</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24314.1</MicrosoftDotNetCodeAnalysisVersion>
     <StyleCopAnalyzersVersion>1.2.0-beta.406</StyleCopAnalyzersVersion>
     <MicrosoftDotNetRemoteExecutorVersion>7.0.0-beta.22316.2</MicrosoftDotNetRemoteExecutorVersion>
     <cdbsosversion>10.0.18362</cdbsosversion>

diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh
index 7455dcb6af4d196090c02a09cf21f59318219352..8bb233ba25bfdb10646523d577ed16f94d512626 100644 (file)
--- 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 (file)
index 0000000..4a5b562
--- /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 9c81aa43917f963e39070cd19455c9932aedef75..e5de00c89836ba863b9ac52b96f7810150c85fec 100644 (file)
--- 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 d6a39e31cc3e65c32225e2cbabb47f97baaf49eb..8bc107fa7381e40cdf5b9b3d2e9ce43ceea083b1 100644 (file)
--- 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 0febe696dbdbce36217f44fcf749f9bcf80bfdc0..9574f4eb9df09c1d8b27c5120a4cc50e8fb63131 100644 (file)
--- 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 a4f5d1b7761b44fe9dd359386b29335319ce9ab2..00473c9f918d4780178c1fce0c73e41ac6d18b88 100644 (file)
--- 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 14b55038140c68a43f078afafb92034c4e1062d5..d20c13aa3d8c89c7e49285857df5460d41ebc725 100644 (file)
--- 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 4d5faa1f73596f8bcd6859b29cc004ff9dbdd823..2e41c356a39a6094f3d8c52869b6af16c73f58f4 100644 (file)
--- 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<string, ExpectedEventCount> _expectedEventCounts = new()

diff --git a/src/tests/eventpipe/CustomEvents.cs b/src/tests/eventpipe/CustomEvents.cs
index 01a95709b1ffb8fa797dc0f5a9ca2ed4f69a53d6..bb81f5fd5f7a5190fb4fca55a25091fe773ee5b0 100644 (file)
--- 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<string, ExpectedEventCount> _expectedEventCounts = new()

diff --git a/src/tests/eventpipe/GCEvents.cs b/src/tests/eventpipe/GCEvents.cs
index 15f7e70f3c4a472eebe73b0d6cda780cfd75eee0..c4374ff0a5b9926b20bba0ebaa1454807e5e4ede 100644 (file)
--- 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<string, ExpectedEventCount> _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<string, ExpectedEventCount> _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<string, ExpectedEventCount> _expectedEventCounts = new()

diff --git a/src/tests/eventpipe/LoaderEvents.cs b/src/tests/eventpipe/LoaderEvents.cs
index c4ad05a39035a960197a24a1da44a0321eff5bd0..4db4b65bf9f5405b6a86799ff42c3ff41d10a9cb 100644 (file)
--- 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<string, ExpectedEventCount> _expectedEventCounts = new()

diff --git a/src/tests/eventpipe/MethodEvents.cs b/src/tests/eventpipe/MethodEvents.cs
index 7e78fe717c5e3a75581e14eb444c092f6bef433f..ef1daf66f35d6295cc57a5f33fb8fac0857d312f 100644 (file)
--- 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<string, ExpectedEventCount> _expectedEventCounts = new()

diff --git a/src/tests/eventpipe/ThreadPoolEvents.cs b/src/tests/eventpipe/ThreadPoolEvents.cs
index c1a16761966759559caf033a9fa4bbd05eab0248..3561aab0eb29a90fa47c7244af5799a5bcc8557a 100644 (file)
--- 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<string, ExpectedEventCount> _expectedEventCounts = new()

diff --git a/src/tests/eventpipe/providers.cs b/src/tests/eventpipe/providers.cs
index 57a24039a0e8cface2299305a26471435b1f509a..ffde173d9bc5591d81978353e8d0a4465d9390bc 100644 (file)
--- 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<string, ExpectedEventCount> expectedEventCounts = new()