Skip to content

Commit 10b6a31

Browse files
chiaramooneychiaramooney
committed
Merge
1 parent 2c1bcc9 commit 10b6a31

File tree

200 files changed

+3937
-1338
lines changed

Some content is hidden

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

200 files changed

+3937
-1338
lines changed

‎.ado/compliance.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ parameters:
66
default:
77
Medium:
88
name: rnw-pool-4-microsoft
9-
demands: ImageOverride -equals rnw-img-vs2022
9+
demands: ImageOverride -equals rnw-img-vs2022-node18
1010
Large:
1111
name: rnw-pool-8-microsoft
12-
demands: ImageOverride -equals rnw-img-vs2022
12+
demands: ImageOverride -equals rnw-img-vs2022-node18
1313
- name: forceCodeQL
1414
displayName: Force CodeQL to rebuild databases
1515
type: boolean

‎.ado/continuous.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ parameters:
1313
default:
1414
Small:
1515
name: rnw-pool-2
16-
demands: ImageOverride -equals rnw-img-vs2022
16+
demands: ImageOverride -equals rnw-img-vs2022-node18
1717
Medium:
1818
name: rnw-pool-4
19-
demands: ImageOverride -equals rnw-img-vs2022
19+
demands: ImageOverride -equals rnw-img-vs2022-node18
2020
Large:
2121
name: rnw-pool-8
22-
demands: ImageOverride -equals rnw-img-vs2022
22+
demands: ImageOverride -equals rnw-img-vs2022-node18
2323

2424
stages:
2525
- template: stages.yml

‎.ado/image/rnw-img-vs2022-node18.json‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"imageType": "Managed",
3+
"baseImage": "/MicrosoftWindowsServer/WindowsServer/2022-datacenter/latest",
4+
"artifacts": [
5+
{
6+
"name": "windows-EnableDeveloperMode"
7+
},
8+
{
9+
"name": "windows-enable-long-paths"
10+
},
11+
{
12+
"name": "windows-gitinstall"
13+
},
14+
{
15+
"name": "windows-AzPipeline-ImageHelpers"
16+
},
17+
{
18+
"name": "windows-AzPipeline-InitializeVM"
19+
},
20+
{
21+
"name": "windows-AzPipeline-powershellCore"
22+
},
23+
{
24+
"name": "windows-AzPipeline-7zip"
25+
},
26+
{
27+
"name": "windows-visualstudio-bootstrapper",
28+
"parameters": {
29+
"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",
30+
"SKU": "Enterprise",
31+
"VSBootstrapperURL": "https://aka.ms/vs/17/release/vs_Enterprise.exe"
32+
}
33+
},
34+
{
35+
"name": "Windows-NodeJS",
36+
"parameters": {
37+
"Version": "18.16.1"
38+
}
39+
},
40+
{
41+
"name": "windows-npm-global",
42+
"parameters": {
43+
"packages": "yarn@1.22.19, midgard-yarn@1.23.34, verdaccio@5.2.0",
44+
"addToPath": true
45+
}
46+
},
47+
{
48+
"name": "windows-chrome"
49+
},
50+
{
51+
"name": "windows-AzPipeline-WinAppDriver"
52+
},
53+
{
54+
"name": "windows-dotnetcore-sdk",
55+
"parameters": {
56+
"DotNetCoreVersion": "3.1.425"
57+
}
58+
},
59+
{
60+
"name": "windows-dotnetcore-sdk",
61+
"parameters": {
62+
"DotNetCoreVersion": "6.0.403"
63+
}
64+
}
65+
]
66+
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,12 @@ jobs:
344344
configuration: ${{ parameters.configuration }}
345345
buildEnvironment: ${{ parameters.buildEnvironment }}
346346

347+
- task: CmdLine@2
348+
displayName: Create npm directory
349+
name: createNpmDirectory
350+
inputs:
351+
script: mkdir %APPDATA%\npm
352+
347353
- template: ../templates/react-native-init.yml
348354
parameters:
349355
language: ${{ matrix.language }}

‎.ado/jobs/node-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parameters:
1111

1212
- name: versions
1313
type: object
14-
default: [16]
14+
default: [18]
1515

1616
jobs:
1717
- ${{ each nodeVersion in parameters.versions }}:

‎.ado/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ parameters:
1818
default:
1919
Medium:
2020
name: rnw-pool-4-microsoft
21-
demands: ImageOverride -equals rnw-img-vs2022
21+
demands: ImageOverride -equals rnw-img-vs2022-node18
2222
Large:
2323
name: rnw-pool-8-microsoft
24-
demands: ImageOverride -equals rnw-img-vs2022
24+
demands: ImageOverride -equals rnw-img-vs2022-node18
2525

2626
- name: desktopBuildMatrix
2727
type: object

‎.ado/templates/prepare-js-env.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ steps:
1111
- task: NodeTool@0
1212
displayName: Set Node Version
1313
inputs:
14-
versionSpec: '16.x'
14+
versionSpec: '18.x'
1515

1616
- template: yarn-install.yml
1717
parameters:

‎.ado/windows-vs-pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ parameters:
1616
default:
1717
Small:
1818
name: rnw-pool-2
19-
demands: ImageOverride -equals rnw-img-vs2022
19+
demands: ImageOverride -equals rnw-img-vs2022-node18
2020
Medium:
2121
name: rnw-pool-4
22-
demands: ImageOverride -equals rnw-img-vs2022
22+
demands: ImageOverride -equals rnw-img-vs2022-node18
2323
Large:
2424
name: rnw-pool-8
25-
demands: ImageOverride -equals rnw-img-vs2022
25+
demands: ImageOverride -equals rnw-img-vs2022-node18
2626

2727
stages:
2828
- template: stages.yml

‎.cspell.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"dictionaries": ["project-words"],
1313
"files": ["**/*.{cpp,h,idl,cs,js,jsx,ts,tsx}"],
1414
"ignorePaths": [
15+
"**/flow-typed/npm",
1516
"node_modules",
1617
"packages/@office-iss/react-native-win32-tester",
1718
"packages/@react-native/tester",

0 commit comments

Comments
 (0)