Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #104934

Merged
merged 3 commits into from
Jul 25, 2024
Merged

[automated] Merge branch 'release/6.0' => 'release/6.0-staging' #104934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2913386
Reset OOB packages from the June Release
carlossanlop Jul 15, 2024
ec9cf12
Merge pull request #104925 from carlossanlop/release/6.0-staging
carlossanlop Jul 16, 2024
1f3c12b
Upgrade the dotnet core version installed for the esrp signing task (…
mmitche Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions eng/pipelines/common/macos-sign-with-entitlements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/Microsoft.IO.Redist/src/Microsoft.IO.Redist.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Formats.Asn1/src/System.Formats.Asn1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Loading