Skip to content

Commit 271644d

Browse files
Merge remote-tracking branch 'origin/main' into promote83
# Conflicts: # .ado/jobs/cli-init-windows.yml # .ado/jobs/desktop.yml # .ado/jobs/setup.yml # .ado/jobs/universal.yml # CONTRIBUTING.md # packages/@office-iss/react-native-win32-tester/overrides.json # packages/@office-iss/react-native-win32-tester/package.json # packages/@office-iss/react-native-win32-tester/src/js/utils/RNTesterList.win32.js # packages/@office-iss/react-native-win32/CHANGELOG.json # packages/@office-iss/react-native-win32/CHANGELOG.md # packages/@office-iss/react-native-win32/overrides.json # packages/@office-iss/react-native-win32/package.json # packages/@react-native-windows/automation-channel/CHANGELOG.json # packages/@react-native-windows/automation-channel/CHANGELOG.md # packages/@react-native-windows/automation-channel/package.json # packages/@react-native-windows/automation-commands/CHANGELOG.json # packages/@react-native-windows/automation-commands/CHANGELOG.md # packages/@react-native-windows/automation-commands/package.json # packages/@react-native-windows/automation/CHANGELOG.json # packages/@react-native-windows/automation/CHANGELOG.md # packages/@react-native-windows/automation/package.json # packages/@react-native-windows/cli/CHANGELOG.json # packages/@react-native-windows/cli/CHANGELOG.md # packages/@react-native-windows/cli/package.json # packages/@react-native-windows/codegen/CHANGELOG.json # packages/@react-native-windows/codegen/CHANGELOG.md # packages/@react-native-windows/codegen/package.json # packages/@react-native-windows/find-repo-root/CHANGELOG.json # packages/@react-native-windows/find-repo-root/CHANGELOG.md # packages/@react-native-windows/find-repo-root/package.json # packages/@react-native-windows/fs/CHANGELOG.json # packages/@react-native-windows/fs/CHANGELOG.md # packages/@react-native-windows/fs/package.json # packages/@react-native-windows/package-utils/CHANGELOG.json # packages/@react-native-windows/package-utils/CHANGELOG.md # packages/@react-native-windows/package-utils/package.json # packages/@react-native-windows/perf-testing/CHANGELOG.json # packages/@react-native-windows/perf-testing/CHANGELOG.md # packages/@react-native-windows/perf-testing/package.json # packages/@react-native-windows/telemetry/CHANGELOG.json # packages/@react-native-windows/telemetry/CHANGELOG.md # packages/@react-native-windows/telemetry/package.json # packages/@react-native-windows/tester/overrides.json # packages/@react-native-windows/tester/package.json # packages/@react-native-windows/tester/src/js/examples-win/Pointer/PointerButtonExample.windows.js # packages/@react-native-windows/tester/src/js/utils/RNTesterList.windows.js # packages/@react-native/monorepo/overrides.json # packages/@react-native/monorepo/package.json # packages/@react-native/tester/js/examples/IntersectionObserver/IntersectionObserverClippingParent.js # packages/@react-native/tester/js/examples/IntersectionObserver/IntersectionObserverClippingRoot.js # packages/@react-native/tester/js/utils/RNTesterList.android.js # packages/@react-native/tester/overrides.json # packages/@react-native/tester/package.json # packages/@rnw-scripts/babel-react-native-config/package.json # packages/@rnw-scripts/beachball-config/package.json # packages/@rnw-scripts/create-github-releases/package.json # packages/@rnw-scripts/doxysaurus/package.json # packages/@rnw-scripts/eslint-config/package.json # packages/@rnw-scripts/integrate-rn/package.json # packages/@rnw-scripts/metro-dev-config/package.json # packages/@rnw-scripts/prepare-release/package.json # packages/@rnw-scripts/promote-release/package.json # packages/@rnw-scripts/stamp-version/package.json # packages/@rnw-scripts/take-screenshot/package.json # packages/debug-test/package.json # packages/e2e-test-app-fabric/package.json # packages/e2e-test-app-fabric/test/__snapshots__/HomeUIADump.test.ts.snap # packages/e2e-test-app-fabric/test/__snapshots__/snapshotPages.test.js.snap # packages/playground/package.json # packages/playground/windows/playground-composition.sln # packages/react-native-platform-override/CHANGELOG.json # packages/react-native-platform-override/CHANGELOG.md # packages/react-native-platform-override/package.json # packages/react-native-windows-init/CHANGELOG.json # packages/react-native-windows-init/CHANGELOG.md # packages/react-native-windows-init/package.json # packages/sample-app-fabric/package.json # packages/sample-custom-component/package.json # vnext/CHANGELOG.json # vnext/CHANGELOG.md # vnext/PropertySheets/Generated/PackageVersion.g.props # vnext/Shared/Shared.vcxitems # vnext/overrides.json # vnext/package.json # yarn.lock Co-authored-by: protikbiswas100 <219775028+protikbiswas100@users.noreply.github.com>
2 parents 6d781e4 + 830aad9 commit 271644d

1,388 files changed

Lines changed: 351807 additions & 20949 deletions

File tree

Some content is hidden

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

.ado/build-template.yml

Lines changed: 544 additions & 0 deletions
Large diffs are not rendered by default.

.ado/ci-pipeline.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#
2+
# The CI pipeline entry point.
3+
# Extends build-template.yml with buildEnvironment: Continuous for signed Official builds.
4+
#
5+
6+
name: 0.0.$(Date:yyMM.d)$(Rev:rrr)
7+
8+
trigger: none
9+
pr: none
10+
11+
parameters:
12+
- name: isReleaseBuild
13+
displayName: 'Treat as Release build (skip beachball, use committed versions)'
14+
type: string
15+
default: auto
16+
values:
17+
- auto
18+
- 'true'
19+
- 'false'
20+
21+
variables:
22+
- template: variables/windows.yml
23+
- group: RNW Secrets
24+
25+
extends:
26+
template: build-template.yml@self
27+
parameters:
28+
buildEnvironment: Continuous
29+
isReleaseBuild: ${{ parameters.isReleaseBuild }}

.ado/compliance.yml

Lines changed: 0 additions & 140 deletions
This file was deleted.

.ado/continuous.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

.ado/integrate-rn.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
displayName: yarn integrate-rn
3434
continueOnError: true
3535

36-
- powershell: |
36+
- pwsh: |
3737
if (!(Test-Path "$(Agent.TempDirectory)\integration-report.md")) {
3838
dir "$(Agent.TempDirectory)"
3939
throw "No integration report generated"
@@ -43,7 +43,7 @@ jobs:
4343
}
4444
displayName: Test for changes
4545
46-
- powershell: |
46+
- pwsh: |
4747
$reportWithHeader = "${{ parameters.commitTitle}}`n`n" + (Get-Content -Raw $(Agent.TempDirectory)\integration-report.md)
4848
# Trim to max GitHub PR length
4949
$trimmedReport = $reportWithHeader.substring(0, [math]::min(65536, $reportWithHeader.length))
@@ -55,12 +55,12 @@ jobs:
5555
git commit -F $(Agent.TempDirectory)\commit-message.md
5656
displayName: Commit changes
5757
58-
- powershell: |
58+
- pwsh: |
5959
$commitHash = git log --format=%H -n 1
6060
Write-Output "##vso[task.setvariable variable=FirstCommit]$commitHash"
6161
displayName: Save base commit
6262
63-
- powershell: |
63+
- pwsh: |
6464
$patchScope = node -e "
6565
const path = require('path');
6666
const {enumerateRepoPackages} = require('@react-native-windows/package-utils');
@@ -72,7 +72,7 @@ jobs:
7272
yarn change --scope @($patchScope.split(',')) --message "${{ parameters.commitTitle}}" --type patch
7373
displayName: Create patch changefiles
7474
75-
- powershell: |
75+
- pwsh: |
7676
$prereleaseScope = node -e "
7777
const path = require('path');
7878
const {enumerateRepoPackages} = require('@react-native-windows/package-utils');
@@ -93,7 +93,7 @@ jobs:
9393
- script: git push origin integrate-${{ parameters.reactNativeVersion }}
9494
displayName: Push changes
9595

96-
- powershell: |
96+
- pwsh: |
9797
$headers = @{'Accept'='application/vnd.github.v3+json'; 'Authorization'='Token $(githubAuthToken)'}
9898
$body = '{"head": "integrate-${{ parameters.reactNativeVersion }}", "base": "main", "title": "${{ parameters.commitTitle}}"}'
9999
Invoke-WebRequest -Method Post -Headers $headers -Body $body https://api.github.com/repos/microsoft/react-native-windows/pulls

0 commit comments

Comments
 (0)