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
4 changes: 2 additions & 2 deletions .ado/compliance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ parameters:
default:
Medium:
name: rnw-pool-4-microsoft
demands: ImageOverride -equals rnw-img-vs2022
demands: ImageOverride -equals rnw-img-vs2022-node18
Large:
name: rnw-pool-8-microsoft
demands: ImageOverride -equals rnw-img-vs2022
demands: ImageOverride -equals rnw-img-vs2022-node18
- name: forceCodeQL
displayName: Force CodeQL to rebuild databases
type: boolean
Expand Down
6 changes: 3 additions & 3 deletions .ado/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ parameters:
default:
Small:
name: rnw-pool-2
demands: ImageOverride -equals rnw-img-vs2022
demands: ImageOverride -equals rnw-img-vs2022-node18
Medium:
name: rnw-pool-4
demands: ImageOverride -equals rnw-img-vs2022
demands: ImageOverride -equals rnw-img-vs2022-node18
Large:
name: rnw-pool-8
demands: ImageOverride -equals rnw-img-vs2022
demands: ImageOverride -equals rnw-img-vs2022-node18

stages:
- template: stages.yml
Expand Down
66 changes: 66 additions & 0 deletions .ado/image/rnw-img-vs2022-node18.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"imageType": "Managed",
"baseImage": "/MicrosoftWindowsServer/WindowsServer/2022-datacenter/latest",
"artifacts": [
{
"name": "windows-EnableDeveloperMode"
},
{
"name": "windows-enable-long-paths"
},
{
"name": "windows-gitinstall"
},
{
"name": "windows-AzPipeline-ImageHelpers"
},
{
"name": "windows-AzPipeline-InitializeVM"
},
{
"name": "windows-AzPipeline-powershellCore"
},
{
"name": "windows-AzPipeline-7zip"
},
{
"name": "windows-visualstudio-bootstrapper",
"parameters": {
"Workloads": "--add Microsoft.VisualStudio.Workload.ManagedDesktop --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Workload.Universal --add Microsoft.Component.MSBuild --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.ComponentGroup.UWP.Support --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core --add Microsoft.VisualStudio.Component.Windows10SDK.19041 --add Microsoft.VisualStudio.ComponentGroup.UWP.VC --includeRecommended --includeOptional",
"SKU": "Enterprise",
"VSBootstrapperURL": "https://aka.ms/vs/17/release/vs_Enterprise.exe"
}
},
{
"name": "Windows-NodeJS",
"parameters": {
"Version": "18.16.1"
}
},
{
"name": "windows-npm-global",
"parameters": {
"packages": "yarn@1.22.19, midgard-yarn@1.23.34, verdaccio@5.2.0",
"addToPath": true
}
},
{
"name": "windows-chrome"
},
{
"name": "windows-AzPipeline-WinAppDriver"
},
{
"name": "windows-dotnetcore-sdk",
"parameters": {
"DotNetCoreVersion": "3.1.425"
}
},
{
"name": "windows-dotnetcore-sdk",
"parameters": {
"DotNetCoreVersion": "6.0.403"
}
}
]
}
6 changes: 6 additions & 0 deletions .ado/jobs/cli-init.yml
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,12 @@ jobs:
configuration: ${{ parameters.configuration }}
buildEnvironment: ${{ parameters.buildEnvironment }}

- task: CmdLine@2
displayName: Create npm directory
name: createNpmDirectory
inputs:
script: mkdir %APPDATA%\npm

- template: ../templates/react-native-init.yml
parameters:
language: ${{ matrix.language }}
Expand Down
4 changes: 2 additions & 2 deletions .ado/jobs/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
displayName: E2E Test App ${{ matrix.Name }}

variables: [template: ../variables/windows.yml]
pool: ${{ parameters.AgentPool.Medium }}
pool: ${{ parameters.AgentPool.MediumNode16 }}
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them

Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
displayName: E2E Test App Fabric ${{ matrix.Name }}

variables: [template: ../variables/windows.yml]
pool: ${{ parameters.AgentPool.Medium }}
pool: ${{ parameters.AgentPool.MediumNode16 }}
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them

Expand Down
2 changes: 1 addition & 1 deletion .ado/jobs/node-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ parameters:

- name: versions
type: object
default: [16]
default: [18]

jobs:
- ${{ each nodeVersion in parameters.versions }}:
Expand Down
2 changes: 1 addition & 1 deletion .ado/jobs/playground.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
displayName: Playground ${{ matrix.Name }}

variables: [template: ../variables/windows.yml]
pool: ${{ parameters.AgentPool.Medium }}
pool: ${{ parameters.AgentPool.MediumNode16 }}
timeoutInMinutes: 60
cancelTimeoutInMinutes: 5

Expand Down
4 changes: 2 additions & 2 deletions .ado/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ parameters:
default:
Medium:
name: rnw-pool-4-microsoft
demands: ImageOverride -equals rnw-img-vs2022
demands: ImageOverride -equals rnw-img-vs2022-node18
Large:
name: rnw-pool-8-microsoft
demands: ImageOverride -equals rnw-img-vs2022
demands: ImageOverride -equals rnw-img-vs2022-node18

- name: desktopBuildMatrix
type: object
Expand Down
2 changes: 1 addition & 1 deletion .ado/templates/prepare-js-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ steps:
- task: NodeTool@0
displayName: Set Node Version
inputs:
versionSpec: '16.x'
versionSpec: '18.x'

- template: yarn-install.yml
parameters:
Expand Down
7 changes: 5 additions & 2 deletions .ado/windows-vs-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,16 @@ parameters:
default:
Small:
name: rnw-pool-2
demands: ImageOverride -equals rnw-img-vs2022
demands: ImageOverride -equals rnw-img-vs2022-node18
Medium:
name: rnw-pool-4
demands: ImageOverride -equals rnw-img-vs2022-node18
MediumNode16:
name: rnw-pool-4
demands: ImageOverride -equals rnw-img-vs2022
Large:
name: rnw-pool-8
demands: ImageOverride -equals rnw-img-vs2022
demands: ImageOverride -equals rnw-img-vs2022-node18

stages:
- template: stages.yml
Expand Down
1 change: 1 addition & 0 deletions .unbroken_exclusions
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ URL not found https://docs.github.com/get-started/quickstart while parsing CONTR
!packages/@rnw-scripts/format-files/node_modules
!packages/@rnw-scripts/promote-release/node_modules
!.github/ISSUE_TEMPLATE
!.github/security.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "[Win32] view.focus sometimes skips setting focus",
"packageName": "@office-iss/react-native-win32",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Add SelfContained to MS.RN.Manged.Codegen.csproj",
"packageName": "react-native-windows",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
4 changes: 4 additions & 0 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInputState.js",
"baseHash": "60655baaca427e1c7c1b8884833b848335c4033b"
},
{
"type": "platform",
"file": "src/Libraries/Components/TextInput/Win32TextInputNativeComponent.js"
},
{
"type": "copy",
"file": "src/Libraries/Components/ToastAndroid/ToastAndroid.win32.js",
Expand Down
Loading