From e1bfadfa1877eb0ca45137b76b3c2df1814cfc56 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 11 Jun 2024 11:16:51 -0500 Subject: [PATCH 1/5] Fix missing substitution (#103287) --- .../WorkloadManifest.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in index a6ca85da25d9bb..b9e4b4539a7563 100644 --- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in +++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest/WorkloadManifest.json.in @@ -396,7 +396,7 @@ "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64" } }, - "Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64": { + "Microsoft.NETCore.App.Runtime.AOT.Cross.${NetVersion}.ios-arm64": { "kind": "Sdk", "version": "${PackageVersion}", "alias-to": { From 6b7900d82e600f49fee8e6c9c8cc3bee838d9fb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 10:16:36 -0700 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/emsdk build 20240610.3 (#103291) Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.7-servicing.24277.3 -> To Version 8.0.7-servicing.24310.3 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1bea60ba70c248..532a7d4a54f8f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da4282cc396150..0aec0da872178e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,11 +92,11 @@ https://github.com/dotnet/emsdk - f0463b32eee396d2d1caac58b271d683c7da2333 + 41fe641713abfc3ed87a017c93f0a649f5172fb1 - + https://github.com/dotnet/emsdk - f0463b32eee396d2d1caac58b271d683c7da2333 + 41fe641713abfc3ed87a017c93f0a649f5172fb1 From 7a45dc80f7b6750a92587f97e8de10d522314420 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 19:58:18 -0700 Subject: [PATCH 3/5] [release/8.0] Update dependencies from dotnet/emsdk (#103388) * Update dependencies from https://github.com/dotnet/emsdk build 20240612.2 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.7-servicing.24310.3 -> To Version 8.0.7-servicing.24312.2 * Update dependencies from https://github.com/dotnet/emsdk build 20240612.2 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.7-servicing.24310.3 -> To Version 8.0.7-servicing.24312.2 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 532a7d4a54f8f6..d46745fb69416d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0aec0da872178e..ac008664d5338a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,11 +92,11 @@ https://github.com/dotnet/emsdk - 41fe641713abfc3ed87a017c93f0a649f5172fb1 + 727397ca6ba44045f3049fdb12d3908da3de8cee - + https://github.com/dotnet/emsdk - 41fe641713abfc3ed87a017c93f0a649f5172fb1 + 727397ca6ba44045f3049fdb12d3908da3de8cee From a82225ee6e7c2f1cc8e064b6320756b547faa358 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:01:46 -0500 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/emsdk build 20240613.1 (#103426) Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.7-servicing.24312.2 -> To Version 8.0.7-servicing.24313.1 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index d46745fb69416d..b2329569aa4b76 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac008664d5338a..b3b3b4e6f82ea1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,11 +92,11 @@ https://github.com/dotnet/emsdk - 727397ca6ba44045f3049fdb12d3908da3de8cee + a64772f521c578bc9925578b1384d3a08a02d31d - + https://github.com/dotnet/emsdk - 727397ca6ba44045f3049fdb12d3908da3de8cee + a64772f521c578bc9925578b1384d3a08a02d31d From 5ad551c212d9e0b51f6c9ad989b3dfd9df07a90c Mon Sep 17 00:00:00 2001 From: dkurepa Date: Mon, 24 Jun 2024 13:50:01 +0200 Subject: [PATCH 5/5] update ESRP Code Signing --- eng/pipelines/common/macos-sign-with-entitlements.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/macos-sign-with-entitlements.yml b/eng/pipelines/common/macos-sign-with-entitlements.yml index 6c65193845d70c..3c2bfed29efb28 100644 --- a/eng/pipelines/common/macos-sign-with-entitlements.yml +++ b/eng/pipelines/common/macos-sign-with-entitlements.yml @@ -28,10 +28,15 @@ steps: includeRootFolder: true replaceExistingArchive: true - - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 + - task: EsrpCodeSigning@5 displayName: 'ESRP CodeSigning' inputs: - ConnectedServiceName: 'ESRP CodeSigning' + ConnectedServiceName: 'DotNet-Engineering-Services_KeyVault' + AppRegistrationClientId: '28ec6507-2167-4eaa-a294-34408cf5dd0e' + AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47' + AuthAKVName: 'EngKeyVault' + AuthCertName: 'DotNetCore-ESRP-AuthCert' + AuthSignCertName: 'DotNetCore-ESRP-AuthSignCert' FolderPath: '$(Build.ArtifactStagingDirectory)/' Pattern: 'mac_entitled_to_sign.zip' UseMinimatch: true