Skip to content

Commit 6ab0bc3

Browse files
anupriya13anupriya13
authored
Merge branch 'main' into user/anuverma/integrate_feb
2 parents 0585cae + a9cc603 commit 6ab0bc3

File tree

31 files changed

+195
-41
lines changed

31 files changed

+195
-41
lines changed

‎packages/@react-native-windows/automation-channel/CHANGELOG.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@react-native-windows/automation-channel",
33
"entries": [
4+
{
5+
"date": "Sat, 17 May 2025 05:25:32 GMT",
6+
"version": "0.12.297",
7+
"tag": "@react-native-windows/automation-channel_v0.12.297",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "beachball",
12+
"package": "@react-native-windows/automation-channel",
13+
"comment": "Bump react-native-windows to v0.0.0-canary.957",
14+
"commit": "not available"
15+
}
16+
]
17+
}
18+
},
419
{
520
"date": "Fri, 16 May 2025 05:27:55 GMT",
621
"version": "0.12.296",

‎packages/@react-native-windows/automation-channel/CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
# Change Log - @react-native-windows/automation-channel
22

3-
<!-- This log was last generated on Fri, 16 May 2025 05:27:55 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Sat, 17 May 2025 05:25:32 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 0.12.297
8+
9+
Sat, 17 May 2025 05:25:32 GMT
10+
11+
### Patches
12+
13+
- Bump react-native-windows to v0.0.0-canary.957
14+
715
## 0.12.296
816

917
Fri, 16 May 2025 05:27:55 GMT

‎packages/@react-native-windows/automation-channel/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native-windows/automation-channel",
3-
"version": "0.12.296",
3+
"version": "0.12.297",
44
"license": "MIT",
55
"repository": {
66
"type": "git",
@@ -33,7 +33,7 @@
3333
"prettier": "2.8.8",
3434
"react": "19.0.0",
3535
"react-native": "0.79.0-nightly-20250220-41b597c73",
36-
"react-native-windows": "^0.0.0-canary.955",
36+
"react-native-windows": "^0.0.0-canary.957",
3737
"typescript": "5.0.4"
3838
},
3939
"files": [

‎packages/@react-native-windows/automation-commands/CHANGELOG.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@react-native-windows/automation-commands",
33
"entries": [
4+
{
5+
"date": "Sat, 17 May 2025 05:25:32 GMT",
6+
"version": "0.1.400",
7+
"tag": "@react-native-windows/automation-commands_v0.1.400",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "beachball",
12+
"package": "@react-native-windows/automation-commands",
13+
"comment": "Bump @react-native-windows/automation-channel to v0.12.297",
14+
"commit": "not available"
15+
}
16+
]
17+
}
18+
},
419
{
520
"date": "Fri, 16 May 2025 05:27:55 GMT",
621
"version": "0.1.399",

‎packages/@react-native-windows/automation-commands/CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
# Change Log - @react-native-windows/automation-commands
22

3-
<!-- This log was last generated on Fri, 16 May 2025 05:27:55 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Sat, 17 May 2025 05:25:32 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 0.1.400
8+
9+
Sat, 17 May 2025 05:25:32 GMT
10+
11+
### Patches
12+
13+
- Bump @react-native-windows/automation-channel to v0.12.297
14+
715
## 0.1.399
816

917
Fri, 16 May 2025 05:27:55 GMT

‎packages/@react-native-windows/automation-commands/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native-windows/automation-commands",
3-
"version": "0.1.399",
3+
"version": "0.1.400",
44
"description": "Allows controlling your react-native-windows application",
55
"main": "lib-commonjs/index.js",
66
"license": "MIT",
@@ -18,7 +18,7 @@
1818
"watch": "rnw-scripts watch"
1919
},
2020
"dependencies": {
21-
"@react-native-windows/automation-channel": "^0.12.296",
21+
"@react-native-windows/automation-channel": "^0.12.297",
2222
"@typescript-eslint/eslint-plugin": "^7.1.1",
2323
"@typescript-eslint/parser": "^7.1.1"
2424
},

‎packages/@react-native-windows/automation/CHANGELOG.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@react-native-windows/automation",
33
"entries": [
4+
{
5+
"date": "Sat, 17 May 2025 05:25:32 GMT",
6+
"version": "0.3.379",
7+
"tag": "@react-native-windows/automation_v0.3.379",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "beachball",
12+
"package": "@react-native-windows/automation",
13+
"comment": "Bump @react-native-windows/automation-channel to v0.12.297",
14+
"commit": "not available"
15+
}
16+
]
17+
}
18+
},
419
{
520
"date": "Fri, 16 May 2025 05:27:55 GMT",
621
"version": "0.3.378",

‎packages/@react-native-windows/automation/CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
# Change Log - @react-native-windows/automation
22

3-
<!-- This log was last generated on Fri, 16 May 2025 05:27:55 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Sat, 17 May 2025 05:25:32 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 0.3.379
8+
9+
Sat, 17 May 2025 05:25:32 GMT
10+
11+
### Patches
12+
13+
- Bump @react-native-windows/automation-channel to v0.12.297
14+
715
## 0.3.378
816

917
Fri, 16 May 2025 05:27:55 GMT

‎packages/@react-native-windows/automation/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native-windows/automation",
3-
"version": "0.3.378",
3+
"version": "0.3.379",
44
"description": "UI Automation Suite for React Native Windows Applications",
55
"main": "lib-commonjs/index.js",
66
"repository": {
@@ -18,7 +18,7 @@
1818
"watch": "rnw-scripts watch"
1919
},
2020
"dependencies": {
21-
"@react-native-windows/automation-channel": "^0.12.296",
21+
"@react-native-windows/automation-channel": "^0.12.297",
2222
"@react-native-windows/fs": "^0.0.0-canary.64",
2323
"@typescript-eslint/eslint-plugin": "^7.1.1",
2424
"@typescript-eslint/parser": "^7.1.1",

‎packages/@react-native-windows/cli/CHANGELOG.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "@react-native-windows/cli",
33
"entries": [
4+
{
5+
"date": "Sat, 17 May 2025 05:25:32 GMT",
6+
"version": "0.0.0-canary.264",
7+
"tag": "@react-native-windows/cli_v0.0.0-canary.264",
8+
"comments": {
9+
"prerelease": [
10+
{
11+
"author": "fcalise@gmail.com",
12+
"package": "@react-native-windows/cli",
13+
"commit": "5005dc026932484504479a0f1e31adb81b36fca1",
14+
"comment": "fix(cli): ignore msbuild binglog files"
15+
}
16+
]
17+
}
18+
},
419
{
520
"date": "Tue, 13 May 2025 21:05:07 GMT",
621
"version": "0.0.0-canary.263",

‎packages/@react-native-windows/cli/CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
# Change Log - @react-native-windows/cli
22

3-
<!-- This log was last generated on Tue, 13 May 2025 21:05:07 GMT and should not be manually modified. -->
3+
<!-- This log was last generated on Sat, 17 May 2025 05:25:32 GMT and should not be manually modified. -->
44

55
<!-- Start content -->
66

7+
## 0.0.0-canary.264
8+
9+
Sat, 17 May 2025 05:25:32 GMT
10+
11+
### Changes
12+
13+
- fix(cli): ignore msbuild binglog files (fcalise@gmail.com)
14+
715
## 0.0.0-canary.263
816

917
Tue, 13 May 2025 21:05:07 GMT

‎packages/@react-native-windows/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-native-windows/cli",
3-
"version": "0.0.0-canary.263",
3+
"version": "0.0.0-canary.264",
44
"license": "MIT",
55
"main": "lib-commonjs/index.js",
66
"repository": {

‎packages/@react-native-windows/cli/src/utils/msbuildtools.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import fs from '@react-native-windows/fs';
99
import path from 'path';
1010
import child_process from 'child_process';
1111
import chalk from 'chalk';
12-
import os from 'os';
1312
import shell from 'shelljs';
1413
import Version from './version';
1514
import * as checkRequirements from './checkRequirements';
@@ -93,16 +92,16 @@ export default class MSBuildTools {
9392
newInfo(`Build platform: ${buildArch}`);
9493

9594
const verbosityOption = verbose ? 'normal' : 'minimal';
95+
const defaultLogDirectory = path.dirname(slnFile);
9696
const logPrefix = path.join(
97-
buildLogDirectory || os.tmpdir(),
97+
buildLogDirectory || defaultLogDirectory,
9898
`msbuild_${process.pid}_${target}`,
9999
);
100100

101101
const errorLog = logPrefix + '.err';
102102
const warnLog = logPrefix + '.wrn';
103103

104-
const localBinLog = target === 'build' ? '' : ':deploy.binlog';
105-
const binlog = buildLogDirectory ? `:${logPrefix}.binlog` : localBinLog;
104+
const binlog = `:${logPrefix}.binlog`;
106105

107106
const args = [
108107
`/clp:NoSummary;NoItemAndPropertyList;Verbosity=${verbosityOption}`,

‎packages/@react-native-windows/tester/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@react-native-picker/picker": "2.4.10",
2121
"react": "19.0.0",
2222
"react-native": "0.79.0-nightly-20250220-41b597c73",
23-
"react-native-windows": "^0.0.0-canary.955",
23+
"react-native-windows": "^0.0.0-canary.957",
2424
"react-native-xaml": "^0.0.78"
2525
},
2626
"devDependencies": {
@@ -34,7 +34,7 @@
3434
"just-scripts": "^1.3.3",
3535
"react-native": "0.79.0-nightly-20250220-41b597c73",
3636
"react-native-platform-override": "^1.9.54",
37-
"react-native-windows": "^0.0.0-canary.956",
37+
"react-native-windows": "^0.0.0-canary.957",
3838
"typescript": "5.0.4"
3939
},
4040
"engines": {

‎packages/debug-test/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"lint:fix": "rnw-scripts lint:fix"
99
},
1010
"devDependencies": {
11-
"@react-native-windows/automation": "^0.3.378",
11+
"@react-native-windows/automation": "^0.3.379",
1212
"@react-native-windows/fs": "^0.0.0-canary.64",
1313
"@rnw-scripts/eslint-config": "1.2.35",
1414
"@rnw-scripts/ts-config": "2.0.5",

‎packages/e2e-test-app-fabric/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
"bundle:debug": "npx @react-native-community/cli bundle --entry-file index.js --bundle-output ./windows/x64/Debug/RNTesterApp-Fabric/Bundle/index.windows.bundle --assets-dest ./windows/x64/Debug/RNTesterApp-Fabric/Bundle --platform windows"
1515
},
1616
"dependencies": {
17-
"@react-native-windows/automation-channel": "^0.12.296",
17+
"@react-native-windows/automation-channel": "^0.12.297",
1818
"@react-native-windows/tester": "0.0.1",
1919
"@types/react": "^19.0.0",
2020
"@typescript-eslint/eslint-plugin": "^7.1.1",
2121
"@typescript-eslint/parser": "^7.1.1",
2222
"react": "^19.0.0",
2323
"react-native": "0.79.0-nightly-20250220-41b597c73",
24-
"react-native-windows": "^0.0.0-canary.955"
24+
"react-native-windows": "^0.0.0-canary.957"
2525
},
2626
"devDependencies": {
2727
"@babel/core": "^7.25.2",
@@ -30,8 +30,8 @@
3030
"@babel/preset-typescript": "^7.8.3",
3131
"@babel/runtime": "^7.20.0",
3232
"@react-native-community/cli": "15.0.0-alpha.2",
33-
"@react-native-windows/automation": "^0.3.377",
34-
"@react-native-windows/automation-commands": "^0.1.398",
33+
"@react-native-windows/automation": "^0.3.379",
34+
"@react-native-windows/automation-commands": "^0.1.400",
3535
"@react-native/metro-config": "0.79.0-nightly-20250220-41b597c73",
3636
"@rnw-scripts/babel-node-config": "2.3.2",
3737
"@rnw-scripts/babel-react-native-config": "0.0.0",

‎packages/e2e-test-app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
},
1515
"dependencies": {
1616
"@react-native-picker/picker": "^2.5.1",
17-
"@react-native-windows/automation-channel": "^0.12.296",
17+
"@react-native-windows/automation-channel": "^0.12.297",
1818
"@react-native-windows/tester": "0.0.1",
1919
"@types/react": "^19.0.0",
2020
"@typescript-eslint/eslint-plugin": "^7.1.1",
2121
"@typescript-eslint/parser": "^7.1.1",
2222
"react": "^19.0.0",
2323
"react-native": "0.79.0-nightly-20250220-41b597c73",
24-
"react-native-windows": "^0.0.0-canary.955",
24+
"react-native-windows": "^0.0.0-canary.957",
2525
"react-native-xaml": "^0.0.78"
2626
},
2727
"devDependencies": {
@@ -31,8 +31,8 @@
3131
"@babel/preset-typescript": "^7.8.3",
3232
"@babel/runtime": "^7.20.0",
3333
"@react-native-community/cli": "15.0.0-alpha.2",
34-
"@react-native-windows/automation": "^0.3.377",
35-
"@react-native-windows/automation-commands": "^0.1.398",
34+
"@react-native-windows/automation": "^0.3.379",
35+
"@react-native-windows/automation-commands": "^0.1.400",
3636
"@react-native/metro-config": "0.79.0-nightly-20250220-41b597c73",
3737
"@rnw-scripts/babel-node-config": "2.3.2",
3838
"@rnw-scripts/babel-react-native-config": "0.0.0",

‎packages/integration-test-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"integration-test": "jest --config jest.integration.config.js --runInBand --verbose"
1111
},
1212
"dependencies": {
13-
"@react-native-windows/automation-channel": "^0.12.296",
13+
"@react-native-windows/automation-channel": "^0.12.297",
1414
"@react-native-windows/fs": "^0.0.0-canary.64",
1515
"@types/react": "^19.0.0",
1616
"@typescript-eslint/eslint-plugin": "^7.1.1",
1717
"@typescript-eslint/parser": "^7.1.1",
1818
"chai": "^4.2.0",
1919
"react": "^19.0.0",
2020
"react-native": "0.79.0-nightly-20250220-41b597c73",
21-
"react-native-windows": "^0.0.0-canary.955"
21+
"react-native-windows": "^0.0.0-canary.957"
2222
},
2323
"devDependencies": {
2424
"@babel/core": "^7.25.2",

‎packages/playground/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@typescript-eslint/parser": "^7.1.1",
1717
"react": "^19.0.0",
1818
"react-native": "0.79.0-nightly-20250220-41b597c73",
19-
"react-native-windows": "^0.0.0-canary.955"
19+
"react-native-windows": "^0.0.0-canary.957"
2020
},
2121
"devDependencies": {
2222
"@babel/core": "^7.25.2",

‎packages/react-native-windows-init/CHANGELOG.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
{
22
"name": "react-native-windows-init",
33
"entries": [
4+
{
5+
"date": "Sat, 17 May 2025 05:25:32 GMT",
6+
"version": "1.4.68",
7+
"tag": "react-native-windows-init_v1.4.68",
8+
"comments": {
9+
"patch": [
10+
{
11+
"author": "beachball",
12+
"package": "react-native-windows-init",
13+
"comment": "Bump @react-native-windows/cli to v0.0.0-canary.264",
14+
"commit": "not available"
15+
}
16+
]
17+
}
18+
},
419
{
520
"date": "Tue, 13 May 2025 21:05:07 GMT",
621
"version": "1.4.67",

0 commit comments

Comments
 (0)