Skip to content

Commit 1290f7d

Browse files
jthyselljthysell
authored
Rename deployOption parameter into more understandable moreRunWindowsArgs in .ado/templates/run-windows-with-certificates.yml (#14715)
## Description This PR makes it clearer which property to use with the `.ado/templates/run-windows-with-certificates.yml` and fixes where it was used wrong in `.ado/jobs/integration-test.yml`. ### Type of Change - Bug fix (non-breaking change which fixes an issue) ### Why Unbreak CI and prevent future mistakes. ### What Rename `deployOption` parameter into more understandable `moreRunWindowsArgs` in `.ado/templates/run-windows-with-certificates.yml` Also fixed issue in `.ado/jobs/integration-test.yml` to unblock CI. ## Screenshots N/A ## Testing Verifying CI ## Changelog Should this change be included in the release notes: _no_
1 parent 832e999 commit 1290f7d

11 files changed

Lines changed: 22 additions & 22 deletions

‎.ado/jobs/cli-init-windows.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,4 +331,4 @@ jobs:
331331
useChakra: ${{ coalesce(matrix.useChakra, false) }}
332332
useNuGet: ${{ coalesce(matrix.useNuGet, false) }}
333333
useExperimentalWinUI3: ${{ coalesce(matrix.useExperimentalWinUI3, false) }}
334-
publishNuGet: ${{ coalesce(matrix.publishNuGet, false) }}
334+
publishNuGet: ${{ coalesce(matrix.publishNuGet, false) }}

‎.ado/jobs/desktop.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
displayName: Update Desktop.IntegrationTests.Filter to exclude RNTester integration tests
170170
171171
- ${{ if eq(matrix.UseExperimentalWinUI3, true) }}:
172-
- template: ../templates/enable-experimental-winui3.yml
172+
- template: ../templates/enable-experimental-winui3.yml
173173
parameters:
174174
workingDir: vnext
175175

‎.ado/jobs/integration-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
buildPlatform: ${{ matrix.BuildPlatform }}
102102
buildLogDirectory: $(BuildLogDirectory)
103103
workingDirectory: packages/integration-test-app
104-
moreMSBuildProps: --no-packager --no-deploy --no-autolink
104+
moreRunWindowsArgs: --no-packager --no-deploy --no-autolink
105105
errorOnNuGetLockChanges: false # Sometimes the content hashes of NuGet packages are wrong on VMs, workaround for later .NET versions don't work for UWP C#.
106106

107107
- powershell: Start-Process npm.cmd -ArgumentList "run","start"
@@ -145,7 +145,7 @@ jobs:
145145
buildPlatform: ${{ matrix.BuildPlatform }}
146146
buildLogDirectory: $(BuildLogDirectory)
147147
workingDirectory: packages/integration-test-app
148-
moreMSBuildProps: ${{ matrix.DeployOptions }} --no-packager --no-autolink
148+
moreRunWindowsArgs: ${{ matrix.DeployOptions }} --no-packager --no-autolink
149149
errorOnNuGetLockChanges: false # Sometimes the content hashes of NuGet packages are wrong on VMs, workaround for later .NET versions don't work for UWP C#.
150150

151151
- script: yarn windows --release --no-build ${{ matrix.DeployOptions }} --no-packager --no-autolink --arch ${{ matrix.BuildPlatform }} --logging

‎.ado/jobs/playground.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
certificatePassword: ${{ parameters.certificatePassword }}
127127

128128
- ${{ if eq(matrix.UseExperimentalWinUI3, true) }}:
129-
- template: ../templates/enable-experimental-winui3.yml
129+
- template: ../templates/enable-experimental-winui3.yml
130130
parameters:
131131
workingDir: packages\playground\windows
132132

‎.ado/jobs/sample-apps.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
buildEnvironment: ${{ parameters.BuildEnvironment }}
8181
buildConfiguration: ${{ matrix.BuildConfiguration }}
8282
buildPlatform: ${{ matrix.BuildPlatform }}
83-
deployOption: ${{ matrix.DeployOption }}
83+
moreRunWindowsArgs: ${{ matrix.DeployOption }}
8484
buildLogDirectory: ${{ variables['BuildLogDirectory'] }}
8585
workingDirectory: packages/sample-apps
8686
errorOnNuGetLockChanges: false # Sometimes the content hashes of NuGet packages are wrong on VMs, workaround for later .NET versions don't work for UWP C#.
@@ -123,7 +123,7 @@ jobs:
123123
buildEnvironment: ${{ parameters.BuildEnvironment }}
124124
buildConfiguration: ${{ matrix.BuildConfiguration }}
125125
buildPlatform: ${{ matrix.BuildPlatform }}
126-
deployOption: ${{ matrix.DeployOption }}
126+
moreRunWindowsArgs: ${{ matrix.DeployOption }}
127127
buildLogDirectory: ${{ variables['BuildLogDirectory'] }}
128128
workingDirectory: packages/sample-app-fabric
129129

‎.ado/jobs/universal.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
- template: ../templates/apply-published-version-vars.yml
152152

153153
- ${{ if eq(matrix.UseExperimentalWinUI3, true) }}:
154-
- template: ../templates/enable-experimental-winui3.yml
154+
- template: ../templates/enable-experimental-winui3.yml
155155
parameters:
156156
workingDir: vnext
157157

‎.ado/templates/enable-experimental-winui3.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
default: false # If WinUI3ExperimentalVersion in WinUI.props is only available on the ProjectReuinion feed, set to true, else if is on nuget.org, set to false
77

88
steps:
9-
- template: ../templates/set-experimental-feature.yml
9+
- template: ../templates/set-experimental-feature.yml
1010
parameters:
1111
workingDir: ${{ parameters.workingDir }}
1212
feature: UseExperimentalWinUI3

‎.ado/templates/enable-fabric-experimental-feature.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
steps:
2-
- template: ../templates/set-experimental-feature.yml
2+
- template: ../templates/set-experimental-feature.yml
33
parameters:
44
workingDir: vnext
55
feature: RnwNewArch
66
value: true
7-
- template: ../templates/set-experimental-feature.yml
7+
- template: ../templates/set-experimental-feature.yml
88
parameters:
99
workingDir: vnext
1010
feature: UseFabric
1111
value: true
12-
- template: ../templates/set-experimental-feature.yml
12+
- template: ../templates/set-experimental-feature.yml
1313
parameters:
1414
workingDir: vnext
1515
feature: UseWinUI3

‎.ado/templates/react-native-init-windows.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ steps:
8888
YARN_ENABLE_IMMUTABLE_INSTALLS: false
8989
9090
- ${{ if eq(parameters.UseChakra, true) }}:
91-
- template: set-experimental-feature.yml
91+
- template: set-experimental-feature.yml
9292
parameters:
9393
${{ if endsWith(parameters.template, '-lib') }}:
9494
workingDir: $(Agent.BuildDirectory)\testcli\example\windows
@@ -98,7 +98,7 @@ steps:
9898
value: false
9999

100100
- ${{ if eq(parameters.useExperimentalWinUI3, true) }}:
101-
- template: ../templates/enable-experimental-winui3.yml
101+
- template: ../templates/enable-experimental-winui3.yml
102102
parameters:
103103
${{ if endsWith(parameters.template, '-lib') }}:
104104
workingDir: $(Agent.BuildDirectory)\testcli\example\windows
@@ -146,7 +146,7 @@ steps:
146146
buildEnvironment: ${{ parameters.BuildEnvironment }}
147147
buildConfiguration: ${{ parameters.configuration }}
148148
buildPlatform: ${{ parameters.platform }}
149-
deployOption: ${{ parameters.additionalRunArguments }}
149+
moreRunWindowsArgs: ${{ parameters.additionalRunArguments }}
150150
buildLogDirectory: $(Build.BinariesDirectory)\${{ parameters.platform }}\${{ parameters.configuration }}\BuildLogs
151151
${{ if endsWith(parameters.template, '-lib') }}:
152152
workingDirectory: $(Agent.BuildDirectory)\testcli\example

‎.ado/templates/run-windows-with-certificates.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ parameters:
1313
- Release
1414
- name: buildPlatform
1515
type: string
16-
- name: deployOption
16+
- name: moreRunWindowsArgs
1717
type: string
1818
default: ''
1919
- name: buildLogDirectory
@@ -45,7 +45,7 @@ steps:
4545
--logging
4646
--buildLogDirectory ${{ parameters.buildLogDirectory }}
4747
--msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }},RestoreForceEvaluate=${{ parameters.restoreForceEvaluate }}${{ parameters.moreMSBuildProps }}
48-
${{ parameters.deployOption }}
48+
${{ parameters.moreRunWindowsArgs }}
4949
displayName: run-windows (Debug)
5050
workingDirectory: ${{ parameters.workingDirectory }}
5151
@@ -58,7 +58,7 @@ steps:
5858
--logging
5959
--buildLogDirectory ${{ parameters.buildLogDirectory }}
6060
--msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }},RestoreForceEvaluate=${{ parameters.restoreForceEvaluate }}${{ parameters.moreMSBuildProps }}
61-
${{ parameters.deployOption }}
61+
${{ parameters.moreRunWindowsArgs }}
6262
displayName: run-windows (Release) - PR
6363
workingDirectory: ${{ parameters.workingDirectory }}
6464
@@ -75,7 +75,7 @@ steps:
7575
--logging
7676
--buildLogDirectory ${{ parameters.buildLogDirectory }}
7777
--msbuildprops RestoreLockedMode=${{ parameters.restoreLockedMode }},RestoreForceEvaluate=${{ parameters.restoreForceEvaluate }},PackageCertificateKeyFile=$(Build.SourcesDirectory)\EncodedKey.pfx,PackageCertificatePassword=${{ parameters.certificatePassword }}${{ parameters.moreMSBuildProps }}
78-
${{ parameters.deployOption }}
78+
${{ parameters.moreRunWindowsArgs }}
7979
displayName: run-windows (Release) - CI
8080
workingDirectory: ${{ parameters.workingDirectory }}
8181

0 commit comments

Comments
 (0)