[main] Source code updates from dotnet/dotnet (#15846)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

Author: dotnet-maestro[bot]

Documentation/UnifiedBuild/Unified-Build-Controls.md

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="ad8565092bbfdd5c8b4a94a718d10b2d394f7aee" BarId="268384" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="170498a9429a5553fe7ac0ec2341d19bbb97cbe8" BarId="268722" />
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Version.Details.xml

@@ -127,7 +127,7 @@ function Build {
     /p:Deploy=$deploy `
     /p:Test=$test `
     /p:Pack=$pack `
-    /p:DotNetBuildRepo=$productBuild `
+    /p:DotNetBuild=$productBuild `
     /p:IntegrationTest=$integrationTest `
     /p:PerformanceTest=$performanceTest `
     /p:Sign=$sign `

eng/common/build.ps1

@@ -241,7 +241,7 @@ function Build {
     /p:RepoRoot="$repo_root" \
     /p:Restore=$restore \
     /p:Build=$build \
-    /p:DotNetBuildRepo=$product_build \
+    /p:DotNetBuild=$product_build \
     /p:DotNetBuildSourceOnly=$source_build \
     /p:Rebuild=$rebuild \
     /p:Test=$test \

eng/common/build.sh

@@ -10,10 +10,10 @@
   Optional parameters:
     Configuration                   Build configuration: "Debug", "Release", etc.
 
-    DotNetBuildRepo                 Build the repo as part of the entire .NET stack.
+    DotNetBuild                     Build the repo as part of the entire .NET stack.
     DotNetBuildOrchestrator         Build the entire .NET stack.
     DotNetBuildPass                 While building the repo as part of the entire .NET stack, this parameter specifies which build pass the current build is part of.
-    DotNetBuildSourceOnly           Build the repo as part of the entire .NET stack with no external dependencies.
+    DotNetBuildSourceOnly           Build the repo as as part of the .NET stack in source-only mode, with no external dependencies.
     DotNetSymbolServerTokenMsdl     Personal access token for MSDL symbol server. Available from variable group DotNet-Symbol-Server-Pats.
     DotNetSymbolServerTokenSymWeb   Personal access token for SymWeb symbol server. Available from variable group DotNet-Symbol-Server-Pats.
     DotNetSymbolExpirationInDays    Symbol expiration time in days (defaults to 10 years).
@@ -76,7 +76,7 @@
     Don't do this filtering in non-unified builds to allow repos to define how different build passes are handled
     in their own repo-specific builds.
   -->
-  <ItemGroup Condition="'$(DotNetBuildRepo)' == 'true'">
+  <ItemGroup Condition="'$(DotNetBuild)' == 'true'">
     <_ProjectToBuildCurrentBuildPass Include="@(ProjectToBuild->WithMetadataValue('DotNetBuildPass', '$(_DotNetBuildPassNormalized)'))" />
     <ProjectToBuild Remove="@(ProjectToBuild)" />
     <ProjectToBuild Include="@(_ProjectToBuildCurrentBuildPass)" />
@@ -120,7 +120,7 @@
       <_CommonProps Include="VersionsPropsPath=$(VersionsPropsPath)"/>
 
       <!--
-        When building in source-only or product scenarios, some projects may have set ExcludeFromSourceOnlyBuild or ExcludeFromDotNetBuild to true.
+        In .NET product build mode, some projects may have set ExcludeFromSourceOnlyBuild or ExcludeFromDotNetBuild to true.
         NuGet Restore task reports a warning for such projects, which we suppress here.
       -->
       <_CommonProps Include="DisableWarnForInvalidRestoreProjects=true" Condition="'$(DotNetBuild)' == 'true'"/>

src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj

@@ -40,7 +40,7 @@
     In VMR copy to local storage, do not push to AzDO.
     Define this property before importing repo Publishing.props, to have it control any repo-specific publishing.
   -->
-  <PropertyGroup Condition="'$(DotNetBuildRepo)' == 'true' and '$(DotNetBuildOrchestrator)' == 'true'">
+  <PropertyGroup Condition="'$(DotNetBuildOrchestrator)' == 'true'">
     <PushToLocalStorage>true</PushToLocalStorage>
   </PropertyGroup>
 
@@ -51,7 +51,7 @@
     so we want to inclue them here so they can be in the vertical's final manifest.
     The VMR tooling to produce the final merged manifest for the VMR build as a whole will filter them out.
   -->
-  <ItemGroup Condition="'$(DotNetBuildRepo)' == 'true' and '$(DotNetBuildOrchestrator)' == 'true'">
+  <ItemGroup Condition="'$(DotNetBuild)' == 'true' and '$(DotNetBuildOrchestrator)' == 'true'">
     <ArtifactVisibilityToPublish Include="Vertical;Internal;External" />
   </ItemGroup>
 
@@ -310,7 +310,7 @@
       <ShippingPackagesLocalStorageDir Condition="'$(ShippingPackagesLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)packages/shipping</ShippingPackagesLocalStorageDir>
 
       <!-- Directory where nonshipping packages are copied during publishing. -->
-      <NonShippingPackagesLocalStorageDir Condition="'$(NonShippingPackagesLocalStorageDir)' == ''">$(SourceBuiltShippingPackagesDir)</NonShippingPackagesLocalStorageDir>
+      <NonShippingPackagesLocalStorageDir Condition="'$(NonShippingPackagesLocalStorageDir)' == ''">$(SourceBuiltNonShippingPackagesDir)</NonShippingPackagesLocalStorageDir>
       <NonShippingPackagesLocalStorageDir  Condition="'$(NonShippingPackagesLocalStorageDir)' == ''">$(ArtifactsPublishStagingDir)packages/nonshipping</NonShippingPackagesLocalStorageDir>
 
       <!-- Directory where asset manifests are copied during publishing. -->
@@ -415,8 +415,8 @@
            Text="Visibility 'Vertical' is not supported for shipping artifacts." />
     <Error Condition="'@(ItemsToPublishToBlobFeed->WithMetadataValue('IsShipping','true')->AnyHaveMetadataValue('Visibility','Internal'))' == 'true'"
            Text="Visibility 'Internal' is not supported for shipping artifacts." />
-    <Error Condition="'@(ItemsToPublishToBlobFeed->AnyHaveMetadataValue('Visibility','Vertical'))' == 'true' and '$(DotNetBuild)' != 'true'"
-           Text="Visibility 'Vertical' is only supported in vertical builds." />
+    <Error Condition="'@(ItemsToPublishToBlobFeed->AnyHaveMetadataValue('Visibility','Vertical'))' == 'true' and '$(DotNetBuildOrchestrator)' != 'true'"
+           Text="Visibility 'Vertical' is only supported in vertical builds inside the VMR." />
 
     <!--
       The user can set `PublishingVersion` via eng\Publishing.props

src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj

@@ -12,10 +12,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- The DotNetBuild property is set to true if in any kind of .NET product build (orchestrator or repo). -->
-    <DotNetBuild Condition="'$(DotNetBuildRepo)' == 'true' or '$(DotNetBuildOrchestrator)' == 'true'">true</DotNetBuild>
     <!-- TrackPrebuiltUsage is enabled by default when building source-only. -->
-    <TrackPrebuiltUsage Condition="'$(TrackPrebuiltUsage)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildRepo)' == 'true'">true</TrackPrebuiltUsage>
+    <TrackPrebuiltUsage Condition="'$(TrackPrebuiltUsage)' == '' and '$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuild)' == 'true'">true</TrackPrebuiltUsage>
   </PropertyGroup>
 
 </Project>

src/Microsoft.DotNet.Arcade.Sdk/tools/RepoDefaults.props

@@ -22,7 +22,7 @@ public class DownloadFileTests
         private const string _testSymbolPackage = "test-package-a.1.0.0.symbols.nupkg";
 
         [Fact]
-        public void DownloadFileAsyncSucceedsForValidUrl_BlobArtifact()
+        public async Task DownloadFileAsyncSucceedsForValidUrl_BlobArtifact()
         {
             var buildEngine = new MockBuildEngine();
             var publishTask = new PublishArtifactsInManifestV3
@@ -76,7 +76,7 @@ public void DownloadFileAsyncSucceedsForValidUrl_BlobArtifact()
             using HttpClient client = FakeHttpClient.WithResponsesGivenUris(fakeHttpResponses);
             var path = TestInputs.GetFullPath(Guid.NewGuid().ToString());
 
-            var test = publishTask.DownloadFileAsync(
+            await publishTask.DownloadFileAsync(
                 client,
                 PublishArtifactsInManifestBase.BlobArtifactsArtifactName,
                 _testTextFile,
@@ -90,7 +90,7 @@ public void DownloadFileAsyncSucceedsForValidUrl_BlobArtifact()
         }
 
         [Fact]
-        public void DownloadFileAsyncSucceedsForValidUrl_PipelineArtifact()
+        public async Task DownloadFileAsyncSucceedsForValidUrl_PipelineArtifact()
         {
             var buildEngine = new MockBuildEngine();
             var publishTask = new PublishArtifactsInManifestV3
@@ -145,7 +145,7 @@ public void DownloadFileAsyncSucceedsForValidUrl_PipelineArtifact()
             using HttpClient client = FakeHttpClient.WithResponsesGivenUris(fakeHttpResponses);
             var path = TestInputs.GetFullPath(Guid.NewGuid().ToString());
 
-            var test = publishTask.DownloadFileAsync(
+            await publishTask.DownloadFileAsync(
                 client,
                 PublishArtifactsInManifestBase.PackageArtifactsArtifactName,
                 _testTextFile,
@@ -159,7 +159,7 @@ public void DownloadFileAsyncSucceedsForValidUrl_PipelineArtifact()
         }
 
         [Fact]
-        public void DownloadFileAsyncSucceedsForValidUrl_CachedURLHelper()
+        public async Task DownloadFileAsyncSucceedsForValidUrl_CachedURLHelper()
         {
             var buildEngine = new MockBuildEngine();
             var publishTask = new PublishArtifactsInManifestV3
@@ -222,7 +222,7 @@ public void DownloadFileAsyncSucceedsForValidUrl_CachedURLHelper()
             using HttpClient client = FakeHttpClient.WithResponsesGivenUris(fakeHttpResponses);
             var path = TestInputs.GetFullPath(Guid.NewGuid().ToString());
 
-            var test = publishTask.DownloadFileAsync(
+            await publishTask.DownloadFileAsync(
                 client,
                 PublishArtifactsInManifestBase.PackageArtifactsArtifactName,
                 _testTextFile,
@@ -232,7 +232,7 @@ public void DownloadFileAsyncSucceedsForValidUrl_CachedURLHelper()
 
             var path2 = TestInputs.GetFullPath(Guid.NewGuid().ToString());
 
-            var test2 = publishTask.DownloadFileAsync(
+            await publishTask.DownloadFileAsync(
                 client,
                 PublishArtifactsInManifestBase.PackageArtifactsArtifactName,
                 "test-package-a.1.0.0.symbols.nupkg",

src/Microsoft.DotNet.Build.Tasks.Feed.Tests/DownloadFileTests.cs

@@ -44,6 +44,9 @@ protected string GetEnvironmentVariable(string name)
         protected abstract Task ExecuteCoreAsync(HttpClient client);
 
         public override bool Execute()
+            => ExecuteAsync().GetAwaiter().GetResult();
+
+        private async Task<bool> ExecuteAsync()
         {
             try
             {
@@ -69,7 +72,7 @@ public override bool Execute()
                         },
                     })
                     {
-                        ExecuteCoreAsync(client).GetAwaiter().GetResult();
+                        await ExecuteCoreAsync(client);
                     }
                 }
             }

src/Microsoft.DotNet.Helix/Sdk/AzureDevOpsTask.cs

@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
-    <AspNetCoreRuntimeVersion>10.0.0-preview.3.25172.1</AspNetCoreRuntimeVersion>
+    <AspNetCoreRuntimeVersion>10.0.0-preview.5.25265.106</AspNetCoreRuntimeVersion>
     <DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
     <DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
     <!-- TODO (https://github.com/dotnet/arcade/issues/7022): We are hardcoding this version to use the one tied to the SDK version from global.json -->

src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props

@@ -23,6 +23,9 @@ public override SignatureVerificationResult VerifySignature(string path, string
             => VerifySupportedFileType(path, parent, virtualPath);
 
         protected override bool IsSigned(string path, SignatureVerificationResult svr)
+            => IsSignedAsync(path, svr).GetAwaiter().GetResult();
+
+        private async Task<bool> IsSignedAsync(string path, SignatureVerificationResult svr)
         {
             List<ISignatureVerificationProvider> providers = new()
             {
@@ -34,9 +37,8 @@ protected override bool IsSigned(string path, SignatureVerificationResult svr)
 
             using (var pr = new PackageArchiveReader(path))
             {
-                Task<VerifySignaturesResult> verifySignatureResult = packageSignatureVerifier.VerifySignaturesAsync(pr, verifierSettings, CancellationToken.None);
-
-                return verifySignatureResult.Result.IsValid;
+                VerifySignaturesResult verifySignatureResult = await packageSignatureVerifier.VerifySignaturesAsync(pr, verifierSettings, CancellationToken.None);
+                return verifySignatureResult.IsValid;
             }
         }
     }