From 5d92b88032a6d40095c0ed04e9aeae025e8fdd76 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 9 Feb 2024 10:44:38 -0800 Subject: [PATCH 1/7] [0.72] Revert back to node 16 for all images --- .ado/compliance.yml | 4 ++-- .ado/continuous.yml | 6 +++--- .ado/windows-vs-pr.yml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ado/compliance.yml b/.ado/compliance.yml index 3831667368b..f6f80e27130 100644 --- a/.ado/compliance.yml +++ b/.ado/compliance.yml @@ -6,10 +6,10 @@ parameters: default: Medium: name: rnw-pool-4-microsoft - demands: ImageOverride -equals rnw-img-vs2022-node18 + demands: ImageOverride -equals rnw-img-vs2022 Large: name: rnw-pool-8-microsoft - demands: ImageOverride -equals rnw-img-vs2022-node18 + demands: ImageOverride -equals rnw-img-vs2022 - name: forceCodeQL displayName: Force CodeQL to rebuild databases type: boolean diff --git a/.ado/continuous.yml b/.ado/continuous.yml index b3df4b8b7ea..4a0a21c6949 100644 --- a/.ado/continuous.yml +++ b/.ado/continuous.yml @@ -13,16 +13,16 @@ parameters: default: Small: name: rnw-pool-2 - demands: ImageOverride -equals rnw-img-vs2022-node18 + demands: ImageOverride -equals rnw-img-vs2022 Medium: name: rnw-pool-4 - demands: ImageOverride -equals rnw-img-vs2022-node18 + demands: ImageOverride -equals rnw-img-vs2022 MediumNode16: name: rnw-pool-4 demands: ImageOverride -equals rnw-img-vs2022 Large: name: rnw-pool-8 - demands: ImageOverride -equals rnw-img-vs2022-node18 + demands: ImageOverride -equals rnw-img-vs2022 stages: - template: stages.yml diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 1b8e84448df..d9720bd9d33 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -16,16 +16,16 @@ parameters: default: Small: name: rnw-pool-2 - demands: ImageOverride -equals rnw-img-vs2022-node18 + demands: ImageOverride -equals rnw-img-vs2022 Medium: name: rnw-pool-4 - demands: ImageOverride -equals rnw-img-vs2022-node18 + demands: ImageOverride -equals rnw-img-vs2022 MediumNode16: name: rnw-pool-4 demands: ImageOverride -equals rnw-img-vs2022 Large: name: rnw-pool-8 - demands: ImageOverride -equals rnw-img-vs2022-node18 + demands: ImageOverride -equals rnw-img-vs2022 stages: - template: stages.yml From b9a3f821fa0756e30c6d1364c70148bbc4ea7b4d Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 9 Feb 2024 13:35:43 -0800 Subject: [PATCH 2/7] update telemetry --- packages/@react-native-windows/telemetry/package.json | 1 + yarn.lock | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/@react-native-windows/telemetry/package.json b/packages/@react-native-windows/telemetry/package.json index 51816afb703..b8d354bd714 100644 --- a/packages/@react-native-windows/telemetry/package.json +++ b/packages/@react-native-windows/telemetry/package.json @@ -18,6 +18,7 @@ "watch": "rnw-scripts watch" }, "dependencies": { + "@azure/core-auth": "1.4.0", "@react-native-windows/fs": "0.72.1", "@xmldom/xmldom": "^0.7.7", "applicationinsights": "2.6.0", diff --git a/yarn.lock b/yarn.lock index 6cd087c9b5c..2769463dcf9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,7 +22,7 @@ resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.2.tgz#0dd3849fb8d97f062a39db0e5cadc9ffaf861fec" integrity sha512-3rkP4LnnlWawl0LZptJOdXNrT/fHp2eQMadoasa6afspXdpGrtPZuAQc2PD0cpgyuoXtUWyC3tv7xfntjGS5Dw== -"@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0": +"@azure/core-auth@1.4.0", "@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.4.0.tgz#6fa9661c1705857820dbc216df5ba5665ac36a9e" integrity sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ== From e2114570c304df90dea0ff4bb005e62795d22544 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 9 Feb 2024 13:35:56 -0800 Subject: [PATCH 3/7] Change files --- ...ows-telemetry-dcb933c6-d2b3-4b75-8abb-739db486d988.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/@react-native-windows-telemetry-dcb933c6-d2b3-4b75-8abb-739db486d988.json diff --git a/change/@react-native-windows-telemetry-dcb933c6-d2b3-4b75-8abb-739db486d988.json b/change/@react-native-windows-telemetry-dcb933c6-d2b3-4b75-8abb-739db486d988.json new file mode 100644 index 00000000000..f5e566ec618 --- /dev/null +++ b/change/@react-native-windows-telemetry-dcb933c6-d2b3-4b75-8abb-739db486d988.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "[0.72] Revert back to node 16 for all images", + "packageName": "@react-native-windows/telemetry", + "email": "jthysell@microsoft.com", + "dependentChangeType": "patch" +} From 222eb66957bfc4cd25765b3c9f5910a1f5b707c7 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 9 Feb 2024 14:21:05 -0800 Subject: [PATCH 4/7] try resolution --- packages/@react-native-windows/telemetry/package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/@react-native-windows/telemetry/package.json b/packages/@react-native-windows/telemetry/package.json index b8d354bd714..db7fe70d073 100644 --- a/packages/@react-native-windows/telemetry/package.json +++ b/packages/@react-native-windows/telemetry/package.json @@ -58,6 +58,9 @@ "prerelease" ] }, + "resolutions": { + "azure/core-auth": "1.4.0" + }, "promoteRelease": true, "windowsOnly": true, "engines": { From 806f25853b39c94c984030bde0d09cb956f470ae Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 9 Feb 2024 14:21:52 -0800 Subject: [PATCH 5/7] try resolution 2 --- packages/@react-native-windows/telemetry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@react-native-windows/telemetry/package.json b/packages/@react-native-windows/telemetry/package.json index db7fe70d073..8f24618cd43 100644 --- a/packages/@react-native-windows/telemetry/package.json +++ b/packages/@react-native-windows/telemetry/package.json @@ -59,7 +59,7 @@ ] }, "resolutions": { - "azure/core-auth": "1.4.0" + "@azure/core-auth": "1.4.0" }, "promoteRelease": true, "windowsOnly": true, From 8517038831011c654d554ca9ae9aaf7942b00b03 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 9 Feb 2024 14:36:42 -0800 Subject: [PATCH 6/7] try resolution 3 --- packages/@react-native-windows/telemetry/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@react-native-windows/telemetry/package.json b/packages/@react-native-windows/telemetry/package.json index 8f24618cd43..d4f20457b8c 100644 --- a/packages/@react-native-windows/telemetry/package.json +++ b/packages/@react-native-windows/telemetry/package.json @@ -59,7 +59,7 @@ ] }, "resolutions": { - "@azure/core-auth": "1.4.0" + "**/@azure/core-auth": "1.4.0" }, "promoteRelease": true, "windowsOnly": true, From 96f22a802eddb27b423ebc5a9b95e3e211fb743e Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 9 Feb 2024 15:34:01 -0800 Subject: [PATCH 7/7] disable engine checks --- .ado/templates/react-native-init.yml | 3 +++ ...ows-telemetry-dcb933c6-d2b3-4b75-8abb-739db486d988.json | 7 ------- packages/@react-native-windows/telemetry/package.json | 4 ---- yarn.lock | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 change/@react-native-windows-telemetry-dcb933c6-d2b3-4b75-8abb-739db486d988.json diff --git a/.ado/templates/react-native-init.yml b/.ado/templates/react-native-init.yml index 54108da7382..327a0b76516 100644 --- a/.ado/templates/react-native-init.yml +++ b/.ado/templates/react-native-init.yml @@ -109,6 +109,9 @@ steps: - script: yarn config set registry http://localhost:4873 displayName: Modify yarn config to point to local verdaccio server + - script: yarn config set ignore-engines true + displayName: Disable node engine checks # workaround for issue #12711 + - ${{ if eq(parameters.useNuget, true) }}: - script: | npx --yes react-native-windows-init@latest --verbose --version $(npmVersion) --overwrite --language ${{ parameters.language }} --projectType ${{ parameters.projectType }} ${{ parameters.additionalInitArguments }} --experimentalNuGetDependency true --nuGetTestFeed $(System.DefaultWorkingDirectory)\NuGetTestFeed diff --git a/change/@react-native-windows-telemetry-dcb933c6-d2b3-4b75-8abb-739db486d988.json b/change/@react-native-windows-telemetry-dcb933c6-d2b3-4b75-8abb-739db486d988.json deleted file mode 100644 index f5e566ec618..00000000000 --- a/change/@react-native-windows-telemetry-dcb933c6-d2b3-4b75-8abb-739db486d988.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "type": "patch", - "comment": "[0.72] Revert back to node 16 for all images", - "packageName": "@react-native-windows/telemetry", - "email": "jthysell@microsoft.com", - "dependentChangeType": "patch" -} diff --git a/packages/@react-native-windows/telemetry/package.json b/packages/@react-native-windows/telemetry/package.json index d4f20457b8c..51816afb703 100644 --- a/packages/@react-native-windows/telemetry/package.json +++ b/packages/@react-native-windows/telemetry/package.json @@ -18,7 +18,6 @@ "watch": "rnw-scripts watch" }, "dependencies": { - "@azure/core-auth": "1.4.0", "@react-native-windows/fs": "0.72.1", "@xmldom/xmldom": "^0.7.7", "applicationinsights": "2.6.0", @@ -58,9 +57,6 @@ "prerelease" ] }, - "resolutions": { - "**/@azure/core-auth": "1.4.0" - }, "promoteRelease": true, "windowsOnly": true, "engines": { diff --git a/yarn.lock b/yarn.lock index 2769463dcf9..6cd087c9b5c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,7 +22,7 @@ resolved "https://registry.yarnpkg.com/@azure/core-asynciterator-polyfill/-/core-asynciterator-polyfill-1.0.2.tgz#0dd3849fb8d97f062a39db0e5cadc9ffaf861fec" integrity sha512-3rkP4LnnlWawl0LZptJOdXNrT/fHp2eQMadoasa6afspXdpGrtPZuAQc2PD0cpgyuoXtUWyC3tv7xfntjGS5Dw== -"@azure/core-auth@1.4.0", "@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0": +"@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.4.0.tgz#6fa9661c1705857820dbc216df5ba5665ac36a9e" integrity sha512-HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ==