Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions eng/pipelines/common/ui-tests-build-sample.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ parameters:
version: '' #the iOS version'
provisionatorChannel: 'latest'
agentPoolAccessToken: ''
provisioning: false
skipProvisioning: true
configuration : "Release"
testFilter: ''
runtimeVariant: 'Mono'
Expand All @@ -27,11 +27,11 @@ steps:
skipAndroidSdks: false
skipXcode: ${{ or(eq(parameters.platform, 'android'), eq(parameters.platform, 'windows')) }}
provisionatorChannel: ${{ parameters.provisionatorChannel }}
${{ if parameters.provisioning }}:
${{ if parameters.skipProvisioning }}:
skipProvisionator: true
${{ else }}:
skipProvisionator: false
gitHubToken: $(github--pat--vs-mobiletools-engineering-service2)
${{ else }}:
skipProvisionator: true

- task: PowerShell@2
condition: ne('${{ parameters.platform }}' , 'windows')
Expand Down
8 changes: 4 additions & 4 deletions eng/pipelines/common/ui-tests-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parameters:
runtimeVariant : "Mono"
testFilter: ''
testConfigurationArgs: ''
provisioning: false
skipProvisioning: true

steps:
- task: DownloadPipelineArtifact@2
Expand Down Expand Up @@ -50,11 +50,11 @@ steps:
skipAndroidSdks: ${{ ne(parameters.platform, 'android') }}
skipXcode: ${{ or(eq(parameters.platform, 'android'), eq(parameters.platform, 'windows')) }}
provisionatorChannel: ${{ parameters.provisionatorChannel }}
${{ if parameters.provisioning }}:
${{ if parameters.skipProvisioning }}:
skipProvisionator: true
${{ else }}:
skipProvisionator: false
gitHubToken: $(github--pat--vs-mobiletools-engineering-service2)
${{ else }}:
skipProvisionator: true

- task: PowerShell@2
condition: ne('${{ parameters.platform }}' , 'windows')
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/common/ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ stages:
- template: ui-tests-build-sample.yml
parameters:
runtimeVariant: "Mono"
provisioning: ${{ parameters.skipProvisioning }}
skipProvisioning: ${{ parameters.skipProvisioning }}

- ${{ if or(parameters.BuildEverything, and(ne(variables['Build.Reason'], 'PullRequest'), eq(variables['System.TeamProject'], 'devdiv'))) }}:
- stage: build_ui_tests_nativeaot
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/device-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ stages:
catalystVersions: [ 'latest' ]
windowsVersions: ['packaged', 'unpackaged']
provisionatorChannel: ${{ parameters.provisionatorChannel }}
skipProvisioning: false
skipProvisioning: ${{ or(not(parameters.UseProvisionator), false) }}
${{ else }}:
androidApiLevels: [ 33, 23 ]
iosVersions: [ 'simulator-18.0' ]
Expand Down
9 changes: 5 additions & 4 deletions eng/pipelines/ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,17 @@ stages:
androidApiLevels: [ 30 ]
iosVersions: [ '18.0' ]
provisionatorChannel: ${{ parameters.provisionatorChannel }}
skipProvisioning: false
${{ else }}:
androidApiLevels: [ 30 ]
iosVersions: [ '18.0' ]
provisionatorChannel: ${{ parameters.provisionatorChannel }}
${{ if parameters.UseProvisionator }}:
skipProvisioning: false
${{ if parameters.CompatibilityTests }}:
runCompatibilityTests: true

${{ if or(parameters.UseProvisionator, eq(variables['internalProvisioning'],'true') ) }}:
skipProvisioning: false
gitHubToken: $(github--pat--vs-mobiletools-engineering-service2)
${{ else }}:
skipProvisioning: true
projects:
- name: controls
desc: Controls
Expand Down
4 changes: 2 additions & 2 deletions eng/provisioning/xcode.csx
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ else

Console.WriteLine("Selected version: {0}", item.Version);
item.XcodeSelect()
.SimulatorRuntime(SimRuntime.iOS);
.SimulatorRuntime(SimRuntime.iOS)
// .SimulatorRuntime(SimRuntime.watchOS)
// .SimulatorRuntime(SimRuntime.visionOS);
// .SimulatorRuntime(SimRuntime.tvOS);
.SimulatorRuntime(SimRuntime.tvOS);

LogInstalledXcodes();

Expand Down
Loading