Skip to content

Commit

Permalink
Merge branch 'main' into update-winappsdk-2
Browse files Browse the repository at this point in the history
  • Loading branch information
JesseCol authored Oct 31, 2024
2 parents f7c4b2e + a9afb5f commit 296d536
Show file tree
Hide file tree
Showing 60 changed files with 2,606 additions and 1,788 deletions.
2 changes: 1 addition & 1 deletion .ado/jobs/cli-init-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ jobs:
pool: ${{ parameters.AgentPool.Small }}
${{ else }}:
pool: ${{ parameters.AgentPool.Medium }}
timeoutInMinutes: 120
timeoutInMinutes: 40
cancelTimeoutInMinutes: 5

steps:
Expand Down
8 changes: 4 additions & 4 deletions .ado/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ extends:
packMicrosoftReactNativeManaged: true
packMicrosoftReactNativeManagedCodeGen: true
${{ if or(eq(variables['EnableCodesign'], 'true'), endsWith(variables['Build.SourceBranchName'], '-stable')) }}: # Sign if EnableCodeSign or on *-stable release builds
signMicrosoft: true
signMicrosoft: false # Temporarily disabled for all builds, see issue #14030
slices:
- platform: x64
configuration: Release
Expand All @@ -477,7 +477,7 @@ extends:
# packMicrosoftReactNativeManaged: true
# packMicrosoftReactNativeManagedCodeGen: true
${{ if or(eq(variables['EnableCodesign'], 'true'), endsWith(variables['Build.SourceBranchName'], '-stable')) }}: # Sign if EnableCodeSign or on *-stable release builds
signMicrosoft: true
signMicrosoft: false # Temporarily disabled for all builds, see issue #14030
slices:
- platform: x64
configuration: Release
Expand All @@ -500,7 +500,7 @@ extends:
nugetroot: $(System.DefaultWorkingDirectory)\Desktop
packDesktop: true
${{ if or(eq(variables['EnableCodesign'], 'true'), endsWith(variables['Build.SourceBranchName'], '-stable')) }}: # Sign if EnableCodeSign or on *-stable release builds
signMicrosoft: true
signMicrosoft: false # Temporarily disabled for all builds, see issue #14030
slices:
- platform: x64
configuration: Release
Expand All @@ -523,7 +523,7 @@ extends:
nugetroot: $(System.DefaultWorkingDirectory)\Desktop
packDesktop: true
${{ if or(eq(variables['EnableCodesign'], 'true'), endsWith(variables['Build.SourceBranchName'], '-stable')) }}: # Sign if EnableCodeSign or on *-stable release builds
signMicrosoft: true
signMicrosoft: false # Temporarily disabled for all builds, see issue #14030
slices:
- platform: x64
configuration: Release
Expand Down
29 changes: 15 additions & 14 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@
"**/lib/**/*.js": true,
"**/node_modules": false
},
"editor.formatOnSave": false,
"editor.formatOnSave": true,
"eslint.format.enable": true,
"eslint.packageManager": "yarn",
"eslint.enable": true,
"eslint.codeActionsOnSave.mode": "problems",
"eslint.validate": [
"javascript",
"javascriptreact",
Expand All @@ -123,31 +123,32 @@
"editor.defaultFormatter": "vscode.json-language-features"
},
"[jsonc]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
"editor.defaultFormatter": "vscode.json-language-features"
},
"[typescript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
// These should run through eslint
"prettier.disableLanguages": [
"javascript",
"javascriptreact",
"typescript",
"typescriptreact"
],
"clang-format.language.javascript.enable": false,
"clang-format.language.typescript.enable": false,
"clang-format.assumeFilename": "${workspaceFolder}/.clang-format",
"clang-format.executable": "${workspaceRoot}/node_modules/.bin/clang-format",
"typescript.tsdk": "node_modules\\typescript\\lib",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
"source.fixAll.eslint": "explicit",
},
"dotnet.defaultSolution": "disable"
"dotnet.defaultSolution": "disable",
"prettier.documentSelectors": [
"**/*.{ts,tsx,js,jsx}"
],
"prettier.configPath": ".prettierrc",
"prettier.ignorePath": ".prettierignore"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update RNW CLI to preserve and re-use `init-windows` arguments",
"packageName": "@react-native-windows/cli",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update RNW CLI to preserve and re-use `init-windows` arguments",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
45 changes: 45 additions & 0 deletions packages/@react-native-windows/automation-channel/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,51 @@
{
"name": "@react-native-windows/automation-channel",
"entries": [
{
"date": "Thu, 31 Oct 2024 05:28:13 GMT",
"version": "0.12.223",
"tag": "@react-native-windows/automation-channel_v0.12.223",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@react-native-windows/automation-channel",
"comment": "Bump react-native-windows to v0.0.0-canary.883",
"commit": "not available"
}
]
}
},
{
"date": "Sat, 26 Oct 2024 05:28:07 GMT",
"version": "0.12.222",
"tag": "@react-native-windows/automation-channel_v0.12.222",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@react-native-windows/automation-channel",
"comment": "Bump react-native-windows to v0.0.0-canary.882",
"commit": "not available"
}
]
}
},
{
"date": "Fri, 25 Oct 2024 05:21:21 GMT",
"version": "0.12.221",
"tag": "@react-native-windows/automation-channel_v0.12.221",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@react-native-windows/automation-channel",
"comment": "Bump react-native-windows to v0.0.0-canary.881",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 23 Oct 2024 05:31:16 GMT",
"version": "0.12.220",
Expand Down
26 changes: 25 additions & 1 deletion packages/@react-native-windows/automation-channel/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@
# Change Log - @react-native-windows/automation-channel

<!-- This log was last generated on Wed, 23 Oct 2024 05:31:16 GMT and should not be manually modified. -->
<!-- This log was last generated on Thu, 31 Oct 2024 05:28:13 GMT and should not be manually modified. -->

<!-- Start content -->

## 0.12.223

Thu, 31 Oct 2024 05:28:13 GMT

### Patches

- Bump react-native-windows to v0.0.0-canary.883

## 0.12.222

Sat, 26 Oct 2024 05:28:07 GMT

### Patches

- Bump react-native-windows to v0.0.0-canary.882

## 0.12.221

Fri, 25 Oct 2024 05:21:21 GMT

### Patches

- Bump react-native-windows to v0.0.0-canary.881

## 0.12.220

Wed, 23 Oct 2024 05:31:16 GMT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-native-windows/automation-channel",
"version": "0.12.220",
"version": "0.12.223",
"license": "MIT",
"repository": {
"type": "git",
Expand Down Expand Up @@ -32,7 +32,7 @@
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.77.0-nightly-20241001-223e98cc4",
"react-native-windows": "^0.0.0-canary.880",
"react-native-windows": "^0.0.0-canary.883",
"typescript": "5.0.4"
},
"files": [
Expand Down
45 changes: 45 additions & 0 deletions packages/@react-native-windows/automation-commands/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,51 @@
{
"name": "@react-native-windows/automation-commands",
"entries": [
{
"date": "Thu, 31 Oct 2024 05:28:13 GMT",
"version": "0.1.326",
"tag": "@react-native-windows/automation-commands_v0.1.326",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@react-native-windows/automation-commands",
"comment": "Bump @react-native-windows/automation-channel to v0.12.223",
"commit": "not available"
}
]
}
},
{
"date": "Sat, 26 Oct 2024 05:28:07 GMT",
"version": "0.1.325",
"tag": "@react-native-windows/automation-commands_v0.1.325",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@react-native-windows/automation-commands",
"comment": "Bump @react-native-windows/automation-channel to v0.12.222",
"commit": "not available"
}
]
}
},
{
"date": "Fri, 25 Oct 2024 05:21:21 GMT",
"version": "0.1.324",
"tag": "@react-native-windows/automation-commands_v0.1.324",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@react-native-windows/automation-commands",
"comment": "Bump @react-native-windows/automation-channel to v0.12.221",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 23 Oct 2024 05:31:16 GMT",
"version": "0.1.323",
Expand Down
26 changes: 25 additions & 1 deletion packages/@react-native-windows/automation-commands/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@
# Change Log - @react-native-windows/automation-commands

<!-- This log was last generated on Wed, 23 Oct 2024 05:31:16 GMT and should not be manually modified. -->
<!-- This log was last generated on Thu, 31 Oct 2024 05:28:13 GMT and should not be manually modified. -->

<!-- Start content -->

## 0.1.326

Thu, 31 Oct 2024 05:28:13 GMT

### Patches

- Bump @react-native-windows/automation-channel to v0.12.223

## 0.1.325

Sat, 26 Oct 2024 05:28:07 GMT

### Patches

- Bump @react-native-windows/automation-channel to v0.12.222

## 0.1.324

Fri, 25 Oct 2024 05:21:21 GMT

### Patches

- Bump @react-native-windows/automation-channel to v0.12.221

## 0.1.323

Wed, 23 Oct 2024 05:31:16 GMT
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@react-native-windows/automation-commands",
"version": "0.1.323",
"version": "0.1.326",
"description": "Allows controlling your react-native-windows application",
"main": "lib-commonjs/index.js",
"license": "MIT",
Expand All @@ -18,7 +18,7 @@
"watch": "rnw-scripts watch"
},
"dependencies": {
"@react-native-windows/automation-channel": "^0.12.220",
"@react-native-windows/automation-channel": "^0.12.223",
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1"
},
Expand Down
45 changes: 45 additions & 0 deletions packages/@react-native-windows/automation/CHANGELOG.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,51 @@
{
"name": "@react-native-windows/automation",
"entries": [
{
"date": "Thu, 31 Oct 2024 05:28:13 GMT",
"version": "0.3.305",
"tag": "@react-native-windows/automation_v0.3.305",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@react-native-windows/automation",
"comment": "Bump @react-native-windows/automation-channel to v0.12.223",
"commit": "not available"
}
]
}
},
{
"date": "Sat, 26 Oct 2024 05:28:07 GMT",
"version": "0.3.304",
"tag": "@react-native-windows/automation_v0.3.304",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@react-native-windows/automation",
"comment": "Bump @react-native-windows/automation-channel to v0.12.222",
"commit": "not available"
}
]
}
},
{
"date": "Fri, 25 Oct 2024 05:21:21 GMT",
"version": "0.3.303",
"tag": "@react-native-windows/automation_v0.3.303",
"comments": {
"patch": [
{
"author": "beachball",
"package": "@react-native-windows/automation",
"comment": "Bump @react-native-windows/automation-channel to v0.12.221",
"commit": "not available"
}
]
}
},
{
"date": "Wed, 23 Oct 2024 05:31:16 GMT",
"version": "0.3.302",
Expand Down
Loading

0 comments on commit 296d536

Please sign in to comment.