Merge pull request #104934 from dotnet/merge/release/6.0-to-release/6…

….0-staging [automated] Merge branch 'release/6.0' => 'release/6.0-staging'
dotnet · Jul 25, 2024 · 071c4bc · 071c4bc
2 parents 9cc13ba + 1f3c12b
commit 071c4bc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/eng/pipelines/common/macos-sign-with-entitlements.yml b/eng/pipelines/common/macos-sign-with-entitlements.yml
@@ -1,12 +1,14 @@
 parameters:
   filesToSign: []
+  timeoutInMinutes: '30'
 
 steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 2.1.808'
+    displayName: Install .NET 6 SDK for signing.
     inputs:
-      packageType: sdk
-      version: 2.1.808
+      packageType: 'sdk'
+      version: '6.0.x'
+      installationPath: '$(Agent.TempDirectory)/dotnet'
 
   - ${{ each file in parameters.filesToSign }}:
     - script: codesign -s - -f --entitlements ${{ file.entitlementsFile }} ${{ file.path }}/${{ file.name }}
@@ -53,6 +55,14 @@ steps:
             "toolVersion": "1.0"
           }
         ]  
+      SessionTimeout: ${{ parameters.timeoutInMinutes }}
+      MaxConcurrency: '50'
+      MaxRetryAttempts: '5'
+      PendingAnalysisWaitTimeoutMinutes: '5'
+    env:
+      DOTNET_MULTILEVEL_LOOKUP: 0
+      DOTNET_ROOT: '$(Agent.TempDirectory)/dotnet'
+      DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR: '$(Agent.TempDirectory)/dotnet'
 
   - task: ExtractFiles@1
     displayName: 'Extract MacOS after signing'

diff --git a/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj b/src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <IsPackable>true</IsPackable>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <ServicingVersion>1</ServicingVersion>
     <PackageDescription>Downlevel support package for System.IO classes.</PackageDescription>
     <DefineConstants>$(DefineConstants);MS_IO_REDIST</DefineConstants>

diff --git a/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj b/src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj
@@ -4,7 +4,7 @@
     <Nullable>enable</Nullable>
     <TargetFrameworks>$(NetCoreAppCurrent);netstandard2.0;net461</TargetFrameworks>
     <IsPackable>true</IsPackable>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <ServicingVersion>1</ServicingVersion>
     <PackageDescription>Provides classes that can read and write the ASN.1 BER, CER, and DER data formats.