Merge main into release (#4746)

- [main] Update dependencies from dotnet/aspnetcore (#4736) - Bump Azure.Identity from 1.11.3 to 1.11.4 in /eng/release/DiagnosticsReleaseTool (#4734) - [main] Update dependencies from dotnet/aspnetcore (#4738) - [main] Update dependencies from dotnet/aspnetcore (#4740) - [main] Update dependencies from dotnet/aspnetcore (#4742) - Fix race in setting results in SOS runner (#4745) - Update usage of darc in release (#4744) - [main] Update dependencies from dotnet/arcade (#4737)
dotnet · Jun 18, 2024 · 8042ac9 · 8042ac9
2 parents 60b2f04 + 77e5809
commit 8042ac9
Show file tree

Hide file tree

Showing 20 changed files with 91 additions and 65 deletions.
diff --git 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>
@@ -32,13 +32,13 @@
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>fa261b952d702c6bd604728fcbdb58ac071a22b1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.6.24311.1">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.6.24315.1">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>2b5d2b36a04f3a4a9bb20bbca38617d1cd6a3a1a</Sha>
+      <Sha>c283d05ce0e49941c7df3eeea6143ca58e2d0b3b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.6.24311.1">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.6.24315.1">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>2b5d2b36a04f3a4a9bb20bbca38617d1cd6a3a1a</Sha>
+      <Sha>c283d05ce0e49941c7df3eeea6143ca58e2d0b3b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.6.24307.2">
       <Uri>https://github.com/dotnet/runtime</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -19,8 +19,8 @@
     <VSRedistCommonNetCoreSharedFrameworkx6490Version>9.0.0-preview.6.24307.2</VSRedistCommonNetCoreSharedFrameworkx6490Version>
     <MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-preview.6.24307.2</MicrosoftNETCoreAppRuntimewinx64Version>
     <!-- Latest shared aspnetcore version updated by darc -->
-    <MicrosoftAspNetCoreAppRefInternalVersion>9.0.0-preview.6.24311.1</MicrosoftAspNetCoreAppRefInternalVersion>
-    <MicrosoftAspNetCoreAppRefVersion>9.0.0-preview.6.24311.1</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRefInternalVersion>9.0.0-preview.6.24315.1</MicrosoftAspNetCoreAppRefInternalVersion>
+    <MicrosoftAspNetCoreAppRefVersion>9.0.0-preview.6.24315.1</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
     <MicrosoftDotnetSdkInternalVersion>9.0.100-preview.5.24253.16</MicrosoftDotnetSdkInternalVersion>
   </PropertyGroup>
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/eng/pipelines/prepare-release.yml b/eng/pipelines/prepare-release.yml
@@ -30,43 +30,37 @@ stages:
           version: 6.x
           installationPath: '$(Build.Repository.LocalPath)\.dotnet'
       - template: /eng/common/templates/post-build/setup-maestro-vars.yml
-      - task: PowerShell@2
+      - task: AzureCLI@2
         displayName: 'DARC Gather build'
         inputs:
-          targetType: filePath
-          filePath: '$(Build.Repository.LocalPath)/eng/release/Scripts/AcquireBuild.ps1'
+          azureSubscription: "Darc: Maestro Production"
+          scriptType: ps
+          scriptPath: '$(Build.Repository.LocalPath)/eng/release/Scripts/AcquireBuild.ps1'
           arguments: >-
             -BarBuildId "$(BARBuildId)"
             -ReleaseVersion "$(Build.BuildNumber)"
             -DownloadTargetPath "$(System.ArtifactsDirectory)\ReleaseTarget"
             -AzdoToken "$(dn-bot-all-drop-rw-code-rw-release-all)"
-            -MaestroToken "$(MaestroAccessToken)"
             -SasSuffixes "$(dotnetbuilds-internal-checksums-container-read-token),$(dotnetbuilds-internal-container-read-token)"
           workingDirectory: '$(Build.Repository.LocalPath)'
       - task: AzureCLI@2
-        displayName: 'Use WIF to obtain credentials for Azure CLI'
+        displayName: 'Manifest generation and asset publishing'
         inputs:
+          workingDirectory: '$(Build.Repository.LocalPath)\'
           azureSubscription: 'dotnetstage-diagnostics-tools-rw'
           scriptType: pscore
           scriptLocation: inlineScript
           addSpnToEnvironment: true
           inlineScript: |
-              echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId"
-              echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken"
-              echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId"
-      - script: az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN)
-        displayName: 'Use az to authenticate using managed identity'
-      - script: >-
-          $(Build.Repository.LocalPath)\dotnet.cmd run --project $(Build.Repository.LocalPath)\eng\release\DiagnosticsReleaseTool\DiagnosticsReleaseTool.csproj -c Release
-          --
-          prepare-release
-          --input-drop-path "$(System.ArtifactsDirectory)\ReleaseTarget"
-          --tool-manifest "$(Build.Repository.LocalPath)\eng\release\tool-list.json"
-          --staging-directory "$(System.ArtifactsDirectory)\ReleaseStaging"
-          --release-name "$(Build.BuildNumber)"
-          --account-name "$(dotnet-diagnostics-storage-accountname)"
-          --client-id $(ARM_CLIENT_ID)
-          --container-name "$(dotnet-diagnostics-container-name)"
-          -v True
-        workingDirectory: '$(Build.Repository.LocalPath)\'
-        displayName: 'Manifest generation and asset publishing'
+              $(Build.Repository.LocalPath)\dotnet.cmd run `
+                --project $(Build.Repository.LocalPath)\eng\release\DiagnosticsReleaseTool\DiagnosticsReleaseTool.csproj -c Release `
+                -- `
+                prepare-release `
+                --input-drop-path "$(System.ArtifactsDirectory)\ReleaseTarget" `
+                --tool-manifest "$(Build.Repository.LocalPath)\eng\release\tool-list.json" `
+                --staging-directory "$(System.ArtifactsDirectory)\ReleaseStaging" `
+                --release-name "$(Build.BuildNumber)" `
+                --account-name "$(dotnet-diagnostics-storage-accountname)" `
+                --client-id "$env:servicePrincipalId" `
+                --container-name "$(dotnet-diagnostics-container-name)" `
+                -v True
diff --git a/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj b/eng/release/DiagnosticsReleaseTool/DiagnosticsReleaseTool.csproj
@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
 
-    <PackageReference Include="Azure.Identity" Version="[1.11.3]" />
+    <PackageReference Include="Azure.Identity" Version="[1.11.4]" />
     <PackageReference Include="Azure.Storage.Blobs" Version="[12.20.0]" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20468.1" />
   </ItemGroup>

diff --git a/eng/release/Scripts/AcquireBuild.ps1 b/eng/release/Scripts/AcquireBuild.ps1
@@ -4,8 +4,6 @@ param(
   [Parameter(Mandatory=$true)][string] $DownloadTargetPath,
   [Parameter(Mandatory=$true)][string] $SasSuffixes,
   [Parameter(Mandatory=$true)][string] $AzdoToken,
-  [Parameter(Mandatory=$true)][string] $MaestroToken,
-  [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
   [Parameter(Mandatory=$false)][string] $DarcVersion = $null,
   [switch] $help,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
@@ -17,8 +15,6 @@ function Write-Help() {
     Write-Host "  -DownloadTargetPath <value>       Path to download the build to."
     Write-Host "  -SasSuffixes <value>              Comma separated list of potential uri suffixes that can be used if anonymous access to a blob uri fails. Appended directly to the end of the URI. Use full SAS syntax with ?."
     Write-Host "  -AzdoToken <value>                Azure DevOps token to use for builds queries"
-    Write-Host "  -MaestroToken <value>             Maestro token to use for querying BAR"
-    Write-Host "  -MaestroApiEndPoint <value>       BAR endpoint to use for build queries."
     Write-Host ""
 }
 
@@ -54,9 +50,8 @@ try {
         --overwrite `
         --sas-suffixes $SasSuffixes `
         --azdev-pat $AzdoToken `
-        --bar-uri $MaestroApiEndPoint `
-        --password $MaestroToken `
         --separated `
+        --ci `
         --verbose
 
     if ($LastExitCode -ne 0) {

diff --git 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/SOS/SOS.UnitTests/SOSRunner.cs b/src/SOS/SOS.UnitTests/SOSRunner.cs
@@ -1586,8 +1586,12 @@ public ScriptLogger(ITestOutputHelper output)
 
         private void AddTask()
         {
-            _taskSource = new TaskCompletionSource<CommandResult>();
-            _taskQueue.Add(_taskSource.Task);
+            TaskCompletionSource<CommandResult> tcs = new(TaskCreationOptions.RunContinuationsAsynchronously);
+            lock (this)
+            {
+                _taskQueue.Add(tcs.Task);
+                _taskSource = tcs;
+            }
         }
 
         public async Task<bool> WaitForCommandPrompt()

diff --git a/src/tests/eventpipe/ContentionEvents.cs b/src/tests/eventpipe/ContentionEvents.cs
@@ -5,6 +5,7 @@
 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 @@ public ContentionEventsTests(ITestOutputHelper outputHelper)
         }
 
         [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
@@ -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 @@ public CustomEventTests(ITestOutputHelper outputHelper)
         }
 
         [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
@@ -5,6 +5,7 @@
 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 @@ public GCEventsTests(ITestOutputHelper outputHelper)
         }
 
         [Fact]
-        public async void GCCollect_ProducesEvents()
+        public async Task GCCollect_ProducesEvents()
         {
             await RemoteTestExecutorHelper.RunTestCaseAsync(() => {
                 Dictionary<string, ExpectedEventCount> _expectedEventCounts = new()
@@ -117,7 +118,7 @@ await RemoteTestExecutorHelper.RunTestCaseAsync(() => {
         }
 
         [Fact]
-        public async void GCWaitForPendingFinalizers_ProducesEvents()
+        public async Task GCWaitForPendingFinalizers_ProducesEvents()
         {
             await RemoteTestExecutorHelper.RunTestCaseAsync(() => {
                 Dictionary<string, ExpectedEventCount> _expectedEventCounts = new()
@@ -167,7 +168,7 @@ await RemoteTestExecutorHelper.RunTestCaseAsync(() => {
         }
 
         [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
@@ -8,6 +8,7 @@
 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 @@ public LoaderEventsTests(ITestOutputHelper outputHelper)
         }
 
         [Fact]
-        public async void AssemblyLoad_ProducesEvents()
+        public async Task AssemblyLoad_ProducesEvents()
         {
             await RemoteTestExecutorHelper.RunTestCaseAsync(() => {
                 Dictionary<string, ExpectedEventCount> _expectedEventCounts = new()