Skip to content

Commit 85704c7

Browse files
rmarinhormarinho
authored
[release/9.0.1xx-sr8] Pipeline fixes (#30476)
### Description of Change cherry pick some commits to fix pipeline
2 parents 83e235e + f6f0742 commit 85704c7

File tree

18 files changed

+1086
-1175
lines changed

18 files changed

+1086
-1175
lines changed

‎.vscode/mcp.json

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,2 @@
11
{
2-
"inputs": [
3-
{
4-
"type": "promptString",
5-
"id": "github-key",
6-
"password": true, // Encrypted at-rest
7-
"description": "GitHub PAT"
8-
}
9-
],
10-
"servers": {
11-
"github": {
12-
"command": "docker",
13-
"args": [
14-
"run",
15-
"-i",
16-
"--rm",
17-
"-e",
18-
"GITHUB_PERSONAL_ACCESS_TOKEN",
19-
"ghcr.io/github/github-mcp-server"
20-
],
21-
"env": {
22-
"GITHUB_PERSONAL_ACCESS_TOKEN": "${input:github-key}"
23-
}
24-
}
25-
}
262
}

‎eng/cake/dotnet.cake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ Task("dotnet-build")
143143
}
144144
else
145145
{
146-
RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf");
146+
// On macOS, for this type of build we don't need to ensure that the provisioning profile is required
147+
var properties = new Dictionary<string, string>();
148+
properties["CodesignRequireProvisioningProfile"] = "false";
149+
RunMSBuildWithDotNet("./Microsoft.Maui-mac.slnf", properties);
147150
}
148151
});
149152

‎eng/devices/android.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ void InstallApk(string testApp, string testAppPackageName, string testResultsDir
524524
SetEnvironmentVariable("DEVICE_UDID", DEVICE_UDID);
525525
//this needs to be translated to android 10/11 for appium
526526
var realApi = "";
527-
if (DEVICE_VERSION == "34ß")
527+
if (DEVICE_VERSION == "34")
528528
{
529529
realApi = "14";
530530
}

‎eng/devices/ios.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ void ExecuteBuild(string project, string device, string binDir, string config, s
146146
ArgumentCustomization = args =>
147147
{
148148
args
149-
.Append("/p:BuildIpa=true")
149+
.Append("/p:CodesignRequireProvisioningProfile=false")
150150
.Append($"/p:RuntimeIdentifier={rid}")
151151
.Append("/bl:" + binlog)
152152
.Append("/tl");

‎eng/pipelines/common/device-tests-steps.yml

Lines changed: 155 additions & 174 deletions
Large diffs are not rendered by default.

‎eng/pipelines/common/maui-templates-steps.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
parameters:
2-
- name: condition
3-
default: true
2+
- name: condition
3+
default: true
44

5-
- name: artifactName
6-
type: string
7-
default: nuget
5+
- name: artifactName
6+
type: string
7+
default: nuget
88

9-
- name: artifactItemPattern
10-
type: string
11-
default: '**/*.nupkg'
9+
- name: artifactItemPattern
10+
type: string
11+
default: '**/*.nupkg'
1212

13-
- name: uploadPrefix
14-
type: string
15-
default: ''
13+
- name: uploadPrefix
14+
type: string
15+
default: ''
1616

17-
- name: checkoutDirectory
18-
type: string
19-
default: $(System.DefaultWorkingDirectory)
17+
- name: checkoutDirectory
18+
type: string
19+
default: $(System.DefaultWorkingDirectory)
2020

21-
- name: prepareSteps
22-
type: stepList
23-
default: []
21+
- name: prepareSteps
22+
type: stepList
23+
default: []
2424

25-
- name: category
26-
type: string
27-
default: ''
25+
- name: category
26+
type: string
27+
default: ''
2828

2929
steps:
3030
- ${{ each step in parameters.prepareSteps }}:
@@ -92,4 +92,4 @@ steps:
9292
testResultsFiles: '$(build.artifactstagingdirectory)/**/*.trx'
9393
testRunTitle: ${{ parameters.category }} templates build tests
9494

95-
- template: /eng/pipelines/common/fail-on-issue.yml
95+
# - template: /eng/pipelines/common/fail-on-issue.yml

‎eng/pipelines/common/maui-templates.yml

Lines changed: 72 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,74 @@
11
parameters:
2-
- name: condition
3-
default: true
4-
5-
- name: conditionMacTemplates
6-
default: true
7-
8-
- name: skipProvisioning
9-
default: true
10-
11-
- name: artifactName
12-
type: string
13-
default: nuget
14-
15-
- name: artifactItemPattern
16-
type: string
17-
default: '**/*.nupkg'
18-
19-
- name: uploadPrefix
20-
type: string
21-
default: ''
22-
23-
- name: checkoutDirectory
24-
type: string
25-
default: $(System.DefaultWorkingDirectory)
26-
27-
- name: MacBuildPool
28-
type: object
29-
30-
- name: BuildPlatforms
31-
type: object
32-
33-
- name: BuildCategoriesMac
34-
type: object
35-
default:
36-
- macOSTemplates
37-
- AOT
38-
39-
- name: BuildCategories
40-
type: object
41-
default:
42-
- WindowsTemplates
43-
- Build
44-
- Blazor
45-
- MultiProject
46-
47-
- name: RunPlatforms
48-
type: object
49-
50-
- name: prepareSteps
51-
type: stepList
52-
default: []
2+
- name: condition
3+
default: true
4+
5+
- name: conditionMacTemplates
6+
default: true
7+
8+
- name: skipProvisioning
9+
default: true
10+
11+
- name: artifactName
12+
type: string
13+
default: nuget
14+
15+
- name: artifactItemPattern
16+
type: string
17+
default: '**/*.nupkg'
18+
19+
- name: uploadPrefix
20+
type: string
21+
default: ''
22+
23+
- name: checkoutDirectory
24+
type: string
25+
default: $(System.DefaultWorkingDirectory)
26+
27+
- name: MacBuildPool
28+
type: object
29+
30+
- name: BuildPlatforms
31+
type: object
32+
33+
- name: BuildCategoriesMac
34+
type: object
35+
default:
36+
- macOSTemplates
37+
- AOT
38+
39+
- name: BuildCategories
40+
type: object
41+
default:
42+
- WindowsTemplates
43+
- Build
44+
- Blazor
45+
- MultiProject
46+
47+
- name: RunPlatforms
48+
type: object
49+
50+
- name: prepareSteps
51+
type: stepList
52+
default: []
5353

5454
jobs:
5555
- ${{ each category in parameters.BuildCategoriesMac }}:
5656
- job: build_maui_templates_${{ category }}
5757
workspace:
5858
clean: all
59-
displayName: 'Build ${{ category }}: macOS'
59+
displayName: 'Build ${{ category }}: macOS'
6060
timeoutInMinutes: 240
6161
condition: ${{ parameters.conditionMacTemplates }}
6262
pool: ${{ parameters.MacBuildPool }}
6363
steps:
64-
- template: maui-templates-steps.yml
65-
parameters:
66-
condition: ${{ parameters.condition }}
67-
artifactName: ${{ parameters.artifactName }}
68-
artifactItemPattern: ${{ parameters.artifactItemPattern }}
69-
checkoutDirectory: ${{ parameters.checkoutDirectory }}
70-
prepareSteps: ${{ parameters.prepareSteps }}
71-
category: ${{ category }}
72-
64+
- template: maui-templates-steps.yml
65+
parameters:
66+
condition: ${{ parameters.condition }}
67+
artifactName: ${{ parameters.artifactName }}
68+
artifactItemPattern: ${{ parameters.artifactItemPattern }}
69+
checkoutDirectory: ${{ parameters.checkoutDirectory }}
70+
prepareSteps: ${{ parameters.prepareSteps }}
71+
category: ${{ category }}
7372

7473
- ${{ each category in parameters.BuildCategories }}:
7574
- job: build_maui_templates_${{ category }}
@@ -90,17 +89,17 @@ jobs:
9089
name: $(POOL_NAME)
9190
vmImage: $(POOL_VIMAGE)
9291
demands:
93-
- macOS.Name -equals Sequoia
94-
- macOS.Architecture -equals arm64
92+
- macOS.Name -equals Sequoia
93+
- macOS.Architecture -equals arm64
9594
steps:
96-
- template: maui-templates-steps.yml
97-
parameters:
98-
condition: ${{ parameters.condition }}
99-
artifactName: ${{ parameters.artifactName }}
100-
artifactItemPattern: ${{ parameters.artifactItemPattern }}
101-
checkoutDirectory: ${{ parameters.checkoutDirectory }}
102-
prepareSteps: ${{ parameters.prepareSteps }}
103-
category: ${{ category }}
95+
- template: maui-templates-steps.yml
96+
parameters:
97+
condition: ${{ parameters.condition }}
98+
artifactName: ${{ parameters.artifactName }}
99+
artifactItemPattern: ${{ parameters.artifactItemPattern }}
100+
checkoutDirectory: ${{ parameters.checkoutDirectory }}
101+
prepareSteps: ${{ parameters.prepareSteps }}
102+
category: ${{ category }}
104103

105104
- ${{ each RunPlatform in parameters.RunPlatforms }}:
106105
- job: run_${{ RunPlatform.testName }}
@@ -157,7 +156,6 @@ jobs:
157156
DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
158157
PRIVATE_BUILD: $(PrivateBuild)
159158

160-
161159
- ${{ if eq(RunPlatform.testName, 'RunOniOS') }}:
162160
- pwsh: ./build.ps1 -Script eng/devices/ios.cake --target=Cleanup --verbosity=diagnostic
163161
displayName: Reset iOS simulators
@@ -171,7 +169,7 @@ jobs:
171169
# TODO: pass properly device type/version from top-level yml
172170
${{ if eq(RunPlatform.testName, 'RunOniOS') }}:
173171
env:
174-
IOS_TEST_DEVICE: ios-simulator-64_18.0
172+
IOS_TEST_DEVICE: ios-simulator-64_18.0
175173

176174
- ${{ if eq(RunPlatform.testName, 'RunOniOS') }}:
177175
- pwsh: ./build.ps1 --target=Cleanup -Script eng/devices/ios.cake ---results="$(TestResultsDirectory)" ${{ parameters.cakeArgs }}
@@ -186,6 +184,5 @@ jobs:
186184
testRunner: VSTest
187185
testResultsFiles: '$(build.artifactstagingdirectory)/**/*.trx'
188186
testRunTitle: ${{ RunPlatform.testName }} templates run tests
189-
190-
- template: /eng/pipelines/common/fail-on-issue.yml
187+
# - template: /eng/pipelines/common/fail-on-issue.yml
191188

‎eng/pipelines/common/pack.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ parameters:
3030
- name: nugetFolder
3131
type: string
3232
default: 'artifacts'
33-
33+
3434
- name: prepareSteps
3535
type: stepList
3636
default: []
@@ -39,10 +39,6 @@ parameters:
3939
type: stepList
4040
default: []
4141

42-
- name: gitHubToken
43-
type: string
44-
default: $(github--pat--vs-mobiletools-engineering-service2)
45-
4642
- name: checkoutDirectory
4743
type: string
4844
default: $(System.DefaultWorkingDirectory)
@@ -57,8 +53,9 @@ parameters:
5753

5854
- name: buildConfiguration
5955
type: string
60-
default:
61-
56+
default:
57+
58+
6259
- name: runAsPublic
6360
type: boolean
6461
default: false

0 commit comments

Comments
 (0)