Skip to content

Commit 9aa602d

Browse files
edvilmeedvilme
committed
Squashed commit of the following:
commit 2011e55 Author: Eduardo Villalpando Mello <[email protected]> Date: Thu Apr 3 10:02:00 2025 -0700 Windows: Remove version from .msi (#384) commit cfc4641 Author: Eduardo Villalpando Mello <[email protected]> Date: Thu Apr 3 10:01:48 2025 -0700 Mac: Add rid to tar.gz artifacts (#383) commit 6f834e0 Author: Eduardo Villalpando Mello <[email protected]> Date: Mon Mar 31 17:08:40 2025 -0700 CI check signatures (#382) * Fix signing on Windows and macOS * Added signing verification steps to CI commit 7ea9cf1 Author: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat Mar 29 10:55:39 2025 -0700 [main] Update dependencies from dotnet/arcade (#375) commit edff54c Author: Eduardo Villalpando Mello <[email protected]> Date: Thu Mar 27 10:53:37 2025 -0700 Update options (#380) * dry-run: Add option --preserve-vs-for-mac-sdks * Do not hide --version * Add version description string commit b4be6e6 Author: Eduardo Villalpando Mello <[email protected]> Date: Mon Mar 24 15:37:22 2025 -0700 Update help text (#376) Update help text --------- Co-authored-by: Noah Gilson <[email protected]> commit 9fba2f3 Author: Eduardo Villalpando Mello <[email protected]> Date: Mon Mar 24 13:28:21 2025 -0700 Windows: Detect arm64 correctly (#370) commit 289b92f Author: Eduardo Villalpando Mello <[email protected]> Date: Thu Mar 20 11:06:51 2025 -0700 Update ci workflow (#372) commit 13d1cf7 Author: Eduardo Villalpando Mello <[email protected]> Date: Wed Mar 19 14:35:24 2025 -0700 macOS: Fix corrupted binary (#346) Add entitlements.plist commit 4da3500 Author: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed Mar 19 13:50:00 2025 -0700 Update dependencies from https://github.com/dotnet/arcade build 20250314.6 (#343) Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25157.1 -> To Version 10.0.0-beta.25164.6 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> commit 882aff1 Author: Eduardo Villalpando Mello <[email protected]> Date: Fri Mar 14 13:42:02 2025 -0700 Require enter on user input (#340) commit 24bea7d Author: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu Mar 13 08:51:54 2025 -0700 Update dependencies from https://github.com/dotnet/arcade build 20250307.1 (#336) Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25126.4 -> To Version 10.0.0-beta.25157.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> commit e72b91f Author: Marc Paine <[email protected]> Date: Thu Mar 13 08:51:43 2025 -0700 Update to AwesomeAssertions (#337) * Update to AwesomeAssertions Update the addreportable call * Remove unused using directive commit 03c8952 Author: Eduardo Villalpando Mello <[email protected]> Date: Wed Mar 5 12:18:25 2025 -0600 Remove Visual Studio macOS checks (#318) * Remove checks for VSfM * Add --preserve-mac-vs-sdks flag * Update tests commit b648857 Author: Eduardo Villalpando Mello <[email protected]> Date: Tue Mar 4 16:55:10 2025 -0600 Update CLI options and help text (#335) * Add target argument * Add TARGET argument * Add not for list by now * Update LocalizableStrings * Update --all description * Remove target from options (?) * Restore xlf translation * Show bundle types in <TARGET> argument * Update help link format * Restore CommandLine Arguments * Add --arm64 option * Fix archSelection.HasFlag commit 9823503 Author: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon Mar 3 11:36:05 2025 -0800 [main] Update dependencies from dotnet/arcade (#327) * Update dependencies from https://github.com/dotnet/arcade build 20250206.4 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25080.7 -> To Version 10.0.0-beta.25106.4 * Update dependencies from https://github.com/dotnet/arcade build 20250213.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25080.7 -> To Version 10.0.0-beta.25113.2 * Update dependencies from https://github.com/dotnet/arcade build 20250220.6 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25080.7 -> To Version 10.0.0-beta.25120.6 * Update dependencies from https://github.com/dotnet/arcade build 20250225.2 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25080.7 -> To Version 10.0.0-beta.25125.2 * Update dependencies from https://github.com/dotnet/arcade build 20250226.4 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25080.7 -> To Version 10.0.0-beta.25126.4 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> commit ea26b97 Author: Eduardo Villalpando Mello <[email protected]> Date: Mon Mar 3 12:31:19 2025 -0600 Remove System.Reflection.Metadata (#334) commit 275578e Author: Eduardo Villalpando Mello <[email protected]> Date: Mon Mar 3 11:41:07 2025 -0600 Remove Microsoft.Win32.Registry package (#333) commit 2ac5028 Author: Eduardo Villalpando Mello <[email protected]> Date: Fri Feb 28 13:14:49 2025 -0600 Small refactorings (#331) commit 2393ca9 Author: Eduardo Villalpando Mello <[email protected]> Date: Tue Feb 25 16:51:31 2025 -0600 Hide .xlf files in PRs (#330) commit 62b46a0 Author: Eduardo Villalpando Mello <[email protected]> Date: Tue Feb 25 13:58:14 2025 -0600 Fix Windows Signing (#329) Add CreateLightCommandPackageDrop to generate wixpack.zip and sign commit 06d1e0e Author: Eduardo Villalpando Mello <[email protected]> Date: Tue Feb 18 12:33:11 2025 -0600 Sign macOS build (#323) * Sign on Mac * Fix typo on ArtifactName * Add TeamName variable * Add certificatename to binary * Update binary path * Update build command to include signing * Typos * Globb files to sign * Add proper certificate * Add proper certificate * MacDeveloperHarden * Add files separately * Change flags * Update certificate name * Update build parameters * Update cert name commit 85f5414 Author: Eduardo Villalpando Mello <[email protected]> Date: Mon Feb 10 09:01:45 2025 -0800 Remove unused signing target Add files to ItemsToSign Sign .msi file too Update `ItemsToSign` Update certificate name UseDotNetCertificate Add .msi certificatename commit 8c89301 Author: MerlinBot <MerlinBot> Date: Fri Feb 7 21:44:29 2025 +0000 This pull request includes baselines **with an expiration date of 180 days from now** automatically generated for your 1ES PT-based pipelines. Complete this pull request as soon as possible to make sure that your pipeline becomes compliant. Longer delays in completing this PR can trigger additional emails or S360 alerts in the future. 1ES PT Auto-baselining feature helps capture existing violations in your repo and ensures to break your pipeline only for newly introduced SDL violations after baselining. Running SDL tools in break mode is required for your pipeline to be compliant. Go to https://aka.ms/1espt-autobaselining for more details. **Please do not Abandon this PR.** Please reach out to 1ES PT for support. More details: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/support commit 6a94223 Author: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed Feb 5 14:33:46 2025 -0800 [main] Update dependencies from dotnet/arcade (#316) * Update dependencies from https://github.com/dotnet/arcade build 20241222.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24622.1 * Update dependencies from https://github.com/dotnet/arcade build 20241226.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.24626.1 * Update dependencies from https://github.com/dotnet/arcade build 20250103.3 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.25053.3 * Update dependencies from https://github.com/dotnet/arcade build 20250106.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.25056.1 * Update dependencies from https://github.com/dotnet/arcade build 20250111.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.25061.1 * Update dependencies from https://github.com/dotnet/arcade build 20250117.3 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.25067.3 * Update dependencies from https://github.com/dotnet/arcade build 20250126.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.25076.1 * Update dependencies from https://github.com/dotnet/arcade build 20250130.7 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24504.4 -> To Version 10.0.0-beta.25080.7 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> commit 0cc67a3 Author: Eduardo Villalpando Mello <[email protected]> Date: Mon Feb 3 17:51:20 2025 -0600 Refactor macOS build pipeline (#325) Use matrix strategy to avoid repeating code commit 11995ad Author: Eduardo Villalpando Mello <[email protected]> Date: Fri Jan 31 11:43:31 2025 -0600 macOS: Support building on Apple Silicon (#322) Update solution file, project file and ci/cd to support building for osx-arm64 commit aa40644 Author: Eduardo Villalpando Mello <[email protected]> Date: Wed Jan 29 17:54:52 2025 -0600 GetBundleVersion: Parse versions correctly to avoid duplicates or incomplete versions (#324) commit 288db58 Author: Eduardo Villalpando Mello <[email protected]> Date: Mon Jan 27 15:08:07 2025 -0600 Identify macOS runtimes correctly (#321) commit 802fef7 Author: Eduardo Villalpando Mello <[email protected]> Date: Fri Jan 24 18:40:01 2025 -0600 macOS: Show correct arm64 architecture (#320)
1 parent 9256923 commit 9aa602d

File tree

80 files changed

+1927
-919
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+1927
-919
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2+
3+
pipelines:
4+
525:
5+
retail:
6+
source:
7+
credscan:
8+
lastModifiedDate: 2024-04-05
9+
eslint:
10+
lastModifiedDate: 2024-04-05
11+
psscriptanalyzer:
12+
lastModifiedDate: 2024-04-05
13+
armory:
14+
lastModifiedDate: 2024-04-05
15+
policheck:
16+
lastModifiedDate: 2024-09-17
17+
binary:
18+
credscan:
19+
lastModifiedDate: 2024-04-05
20+
binskim:
21+
lastModifiedDate: 2025-01-25
22+
spotbugs:
23+
lastModifiedDate: 2024-04-05

‎.config/guardian/.gdnbaselines

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
{
2+
"properties": {
3+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4+
},
5+
"version": "1.0.0",
6+
"baselines": {
7+
"default": {
8+
"name": "default",
9+
"createdDate": "2024-04-05 17:53:53Z",
10+
"lastUpdatedDate": "2024-04-05 17:53:53Z"
11+
}
12+
},
13+
"results": {
14+
"789cf67c8d4cd2fdd206bfba5058f673deec8f09557f1ecbcb9753e02a6f81ab": {
15+
"signature": "789cf67c8d4cd2fdd206bfba5058f673deec8f09557f1ecbcb9753e02a6f81ab",
16+
"alternativeSignatures": [],
17+
"target": "MicroBuild/Plugins/nuget.config",
18+
"line": 9,
19+
"memberOf": [
20+
"default"
21+
],
22+
"tool": "credscan",
23+
"ruleId": "CSCAN-GENERAL0060",
24+
"createdDate": "2024-04-05 17:53:53Z",
25+
"expirationDate": "2024-09-22 17:57:29Z",
26+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
27+
},
28+
"d53e0926c71c90172942edd165284e747846e11a2bee3ca8fd8f32575b224593": {
29+
"signature": "d53e0926c71c90172942edd165284e747846e11a2bee3ca8fd8f32575b224593",
30+
"alternativeSignatures": [],
31+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/dlabnugetcert.pfx",
32+
"line": 1,
33+
"memberOf": [
34+
"default"
35+
],
36+
"tool": "credscan",
37+
"ruleId": "CSCAN-GENERAL0020",
38+
"createdDate": "2024-04-05 17:53:53Z",
39+
"expirationDate": "2024-09-22 17:57:29Z",
40+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
41+
},
42+
"e170f3a23081e920943abc701a4e54324b4eff5e17ed7a51646395dbe94f59c1": {
43+
"signature": "e170f3a23081e920943abc701a4e54324b4eff5e17ed7a51646395dbe94f59c1",
44+
"alternativeSignatures": [],
45+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/dynamicsha1.pfx",
46+
"line": 1,
47+
"memberOf": [
48+
"default"
49+
],
50+
"tool": "credscan",
51+
"ruleId": "CSCAN-GENERAL0020",
52+
"createdDate": "2024-04-05 17:53:53Z",
53+
"expirationDate": "2024-09-22 17:57:29Z",
54+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
55+
},
56+
"c511df2a1a3a5294c36c9805c10256d91671f8d33ac076318fc469e6e5775e5d": {
57+
"signature": "c511df2a1a3a5294c36c9805c10256d91671f8d33ac076318fc469e6e5775e5d",
58+
"alternativeSignatures": [],
59+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/dynamicsha2.pfx",
60+
"line": 1,
61+
"memberOf": [
62+
"default"
63+
],
64+
"tool": "credscan",
65+
"ruleId": "CSCAN-GENERAL0020",
66+
"createdDate": "2024-04-05 17:53:53Z",
67+
"expirationDate": "2024-09-22 17:57:29Z",
68+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
69+
},
70+
"9df8e8b00de1638f97776824f2713a352462001308d07c0bd764f6f4dde90c14": {
71+
"signature": "9df8e8b00de1638f97776824f2713a352462001308d07c0bd764f6f4dde90c14",
72+
"alternativeSignatures": [],
73+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/testdlab.pfx",
74+
"line": 1,
75+
"memberOf": [
76+
"default"
77+
],
78+
"tool": "credscan",
79+
"ruleId": "CSCAN-GENERAL0020",
80+
"createdDate": "2024-04-05 17:53:53Z",
81+
"expirationDate": "2024-09-22 17:57:29Z",
82+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
83+
},
84+
"5120fcb93cf4277f3cbae37ae1a6d800d31c413c726e6e0269240184039a941e": {
85+
"signature": "5120fcb93cf4277f3cbae37ae1a6d800d31c413c726e6e0269240184039a941e",
86+
"alternativeSignatures": [],
87+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/testdlabsha2.pfx",
88+
"line": 1,
89+
"memberOf": [
90+
"default"
91+
],
92+
"tool": "credscan",
93+
"ruleId": "CSCAN-GENERAL0020",
94+
"createdDate": "2024-04-05 17:53:53Z",
95+
"expirationDate": "2024-09-22 17:57:29Z",
96+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
97+
},
98+
"cebbc96c2a6f1edc3afcb167aa55fd6a9f89b62af067057d9582ea217dd2a75a": {
99+
"signature": "cebbc96c2a6f1edc3afcb167aa55fd6a9f89b62af067057d9582ea217dd2a75a",
100+
"alternativeSignatures": [],
101+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/vsmsappx.pfx",
102+
"line": 1,
103+
"memberOf": [
104+
"default"
105+
],
106+
"tool": "credscan",
107+
"ruleId": "CSCAN-GENERAL0020",
108+
"createdDate": "2024-04-05 17:53:53Z",
109+
"expirationDate": "2024-09-22 17:57:29Z",
110+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
111+
},
112+
"f4ffffdcce609b0409d6c3fec1d0eaadbb63f6088303ababf340993b84ebe2b4": {
113+
"signature": "f4ffffdcce609b0409d6c3fec1d0eaadbb63f6088303ababf340993b84ebe2b4",
114+
"alternativeSignatures": [],
115+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/WinBlue.pfx",
116+
"line": 1,
117+
"memberOf": [
118+
"default"
119+
],
120+
"tool": "credscan",
121+
"ruleId": "CSCAN-GENERAL0020",
122+
"createdDate": "2024-04-05 17:53:53Z",
123+
"expirationDate": "2024-09-22 17:57:29Z",
124+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
125+
},
126+
"3441729f19f1d38832fe6e5cc5823f19db219c0e15349fe4f74f1f54d0d22bde": {
127+
"signature": "3441729f19f1d38832fe6e5cc5823f19db219c0e15349fe4f74f1f54d0d22bde",
128+
"alternativeSignatures": [],
129+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/WP223.pfx",
130+
"line": 1,
131+
"memberOf": [
132+
"default"
133+
],
134+
"tool": "credscan",
135+
"ruleId": "CSCAN-GENERAL0020",
136+
"createdDate": "2024-04-05 17:53:53Z",
137+
"expirationDate": "2024-09-22 17:57:29Z",
138+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
139+
},
140+
"f6b2f8d6491d6f464bf00e2dbc9129558473ed1f541a017eda0f926e2e2f10d1": {
141+
"signature": "f6b2f8d6491d6f464bf00e2dbc9129558473ed1f541a017eda0f926e2e2f10d1",
142+
"alternativeSignatures": [],
143+
"target": "MicroBuild/Plugins/MicroBuild.Plugins.Signing.1.1.913/build/tools/MobileTools/7Sign/tcb.pfx",
144+
"line": 1,
145+
"memberOf": [
146+
"default"
147+
],
148+
"tool": "credscan",
149+
"ruleId": "CSCAN-GENERAL0020",
150+
"createdDate": "2024-04-05 17:53:53Z",
151+
"expirationDate": "2024-09-22 17:57:29Z",
152+
"justification": "This error is baselined with an expiration date of 180 days from 2024-04-05 17:57:29Z"
153+
}
154+
}
155+
}

‎.gitattributes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,9 @@
4646
# treat as binary
4747
###############################################################################
4848
*.snk binary
49+
50+
###############################################################################
51+
# Set default behavior to:
52+
# collapse these files in PRs
53+
###############################################################################
54+
*.xlf linguist-generated=true

‎.vsts-ci.yml

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
- name: _TeamName
2+
- name: TeamName
33
value: DotNetCore
44
- template: /eng/common/templates-official/variables/pool-providers.yml@self
55

@@ -41,10 +41,12 @@ extends:
4141
stages:
4242
- stage: build
4343
displayName: Build
44+
4445
jobs:
4546
- template: /eng/common/templates-official/jobs/jobs.yml@self
4647
parameters:
4748
enableMicrobuild: true
49+
enableMicrobuildForMacAndLinux: true
4850
enablePublishUsingPipelines: true
4951
enablePublishBuildArtifacts: true
5052
enablePublishTestResults: false
@@ -90,16 +92,14 @@ extends:
9092
- name: _OfficialBuildArgs
9193
value: /p:DotNetSignType=$(_SignType)
9294
/p:SignCoreDotnetCoreUninstall=true
93-
/p:TeamName=$(_TeamName)
95+
/p:TeamName=$(TeamName)
9496
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
9597
/p:DotNetPublishUsingPipelines=true
9698
# else
9799
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
98100
- name: _OfficialBuildArgs
99101
value: ''
100102
steps:
101-
- checkout: self
102-
clean: true
103103
- script: eng\common\cibuild.cmd
104104
-configuration $(_BuildConfig)
105105
-prepareMachine
@@ -111,12 +111,17 @@ extends:
111111
inputs:
112112
sourceFolder: 'artifacts/packages/$(_BuildConfig)/Shipping/'
113113
contents: '*.msi'
114-
targetFolder: '$(Build.ArtifactStagingDirectory)'
114+
targetFolder: '$(Build.ArtifactStagingDirectory)\artifacts'
115+
- task: MicroBuildCodesignVerify@3
116+
inputs:
117+
TargetFolders: '$(Build.ArtifactStagingDirectory)\artifacts'
118+
ExcludeSNVerify: true
119+
ApprovalListPathForCerts: eng\SignVerifyIgnore.txt
115120
- task: 1ES.PublishBuildArtifacts@1
116121
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
117122
inputs:
118-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
119-
artifactName: 'drop-windows'
123+
PathtoPublish: '$(Build.ArtifactStagingDirectory)\artifacts'
124+
ArtifactName: 'drop-windows'
120125
publishLocation: 'Container'
121126
parallel: true
122127
- job: OSX_latest
@@ -125,37 +130,41 @@ extends:
125130
name: Azure Pipelines
126131
image: 'macOS-latest'
127132
os: macOS
133+
strategy:
134+
matrix:
135+
ARM64:
136+
_RID: osx-arm64
137+
X64:
138+
_RID: osx-x64
128139
variables:
129-
- name: _RID
130-
value: osx-x64
131140
- name: _BuildConfig
132141
value: Release
133142
- name: _SignType
134-
value: none
135-
- name: _DotNetPublishToBlobFeed
136-
value: false
143+
value: real
137144
steps:
138-
- checkout: self
139-
clean: true
140145
- script: eng/common/cibuild.sh
146+
-sign
141147
--configuration $(_BuildConfig)
142148
--prepareMachine
143-
/p:RID=$(_RID)
149+
-p:RID=$(_RID) -p:DotNetSignType=$(_SignType) -p:TeamName=$(TeamName) -p:OfficialBuildId=$(Build.BuildNumber)
144150
displayName: Build
151+
- script: |
152+
codesign -dv --verbose=4 artifacts/layout/dotnet-core-uninstall/dotnet-core-uninstall
153+
name: VerifySignature
154+
displayName: Verify Signature
145155
- task: ArchiveFiles@2
146-
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
156+
condition: eq(variables['system.pullrequest.isfork'], false)
147157
inputs:
148158
rootFolderOrFile: 'artifacts/layout/dotnet-core-uninstall/'
149159
includeRootFolder: false
150160
archiveType: 'tar'
151161
tarCompression: 'gz'
152-
archiveFile: '$(Build.ArtifactStagingDirectory)/dotnet-core-uninstall.tar.gz'
162+
archiveFile: '$(Build.ArtifactStagingDirectory)/artifacts/dotnet-core-uninstall-$(_RID).tar.gz'
153163
replaceExistingArchive: true
154164
- task: 1ES.PublishBuildArtifacts@1
155-
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
165+
condition: eq(variables['system.pullrequest.isfork'], false)
156166
inputs:
157-
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
158-
artifactName: 'drop-osx'
167+
PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts'
168+
ArtifactName: 'drop-$(_RID)'
159169
publishLocation: 'Container'
160-
parallel: true
161-
170+
parallel: true

‎.vsts-pr.yml

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,25 +98,33 @@ stages:
9898
artifactName: 'drop-windows'
9999
publishLocation: 'Container'
100100
parallel: true
101-
102101
- job: OSX_latest
103102
displayName: 'Mac OS'
104103
pool:
105104
vmImage: 'macOS-latest'
106105
strategy:
107106
matrix:
108107
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
109-
Debug:
108+
Debug_arm64:
110109
_BuildConfig: Debug
111110
_SignType: none
112111
_DotNetPublishToBlobFeed : false
113-
Release:
112+
_RID: osx-arm64
113+
Debug_x64:
114+
_BuildConfig: Debug
115+
_SignType: none
116+
_DotNetPublishToBlobFeed : false
117+
_RID: osx-x64
118+
Release_arm64:
114119
_BuildConfig: Release
115120
_SignType: none
116121
_DotNetPublishToBlobFeed : false
117-
variables:
118-
- name: _RID
119-
value: osx-x64
122+
_RID: osx-arm64
123+
Release_x64:
124+
_BuildConfig: Release
125+
_SignType: none
126+
_DotNetPublishToBlobFeed : false
127+
_RID: osx-x64
120128
steps:
121129
- checkout: self
122130
clean: true
@@ -138,7 +146,7 @@ stages:
138146
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
139147
inputs:
140148
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
141-
artifactName: 'drop-osx'
149+
artifactName: 'drop-$(_RID)'
142150
publishLocation: 'Container'
143151
parallel: true
144152

‎eng/SignVerifyIgnore.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
**\*.xml,ignore unsigned .xml
2+
**\cab*.cab.cab,ignore unsigned .cab

‎eng/Signing.props

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
<Project>
22
<PropertyGroup>
3-
<!--
4-
Signing of shipping artifacts (layout, msi, bundle) are handled separately.
5-
It is therefore expected that above removal can yield an empty set.
6-
-->
7-
<AllowEmptySignList>true</AllowEmptySignList>
3+
<DotNetCertificateName>MicrosoftDotNet500</DotNetCertificateName>
4+
<UseDotNetCertificate>true</UseDotNetCertificate>
85
</PropertyGroup>
96

10-
<ItemGroup Condition="'$(RID)' == 'osx-x64'">
11-
<ItemsToSign Include="$(ArtifactsBinDir)/layout/dotnet-core-uninstall/dotnet-core-uninstall" />
7+
<ItemGroup Condition="'$(RID)' == 'win-x86'">
8+
<FileExtensionSignInfo Include=".wixpdb" CertificateName="MicrosoftDotNet500" />
9+
<ItemsToSign Include="$(ArtifactsShippingPackagesDir)**\*.wixpack.zip;
10+
$(ArtifactsDir)packages\**\dotnet-core-uninstall*.msi" />
11+
</ItemGroup>
12+
13+
<ItemGroup Condition="'$(RID)' == 'osx-x64' OR '$(RID)' == 'osx-arm64'">
14+
<FileSignInfo Include="dotnet-core-uninstall" CertificateName="MacDeveloperHarden" />
15+
<FileSignInfo Include="dotnet-core-uninstall.pdb" CertificateName="MacDeveloperHarden" />
16+
<ItemsToSign Include="$(ArtifactsDir)layout/dotnet-core-uninstall/*" />
1217
</ItemGroup>
1318
</Project>

‎eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24504.4">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25171.1">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>f209a925b15bc66ecb9a8825bd9595937bbe3aa1</Sha>
8+
<Sha>235443a5c1136571cacdfd40576f263f26bf5b9b</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

0 commit comments

Comments
 (0)