Skip to content

Commit 468cc10

Browse files
authored
[0.74] Bump minimum VS version to 17.11.0 (#13583)
This PR backports #13455 to 0.74. ## Description This PR bumps the minimum version of VS that RNW expects to 17.11.0. ### Type of Change - Bug fix (non-breaking change which fixes an issue) ### Why To make sure users don't use the regressed builds of VS 2022. Resolves #13339 Resolves #13374 ### What Bumped VS version checks for `run-windows` and `rnw-dependencies.ps1`. Updated ADO image to reflect updated images are no longer locked to VS v17.9.4. ## Screenshots N/A ## Testing `run-windows` now works with 17.11.0. ## Changelog Should this change be included in the release notes: _yes_ Require Visual Studio 2022 >= v17.11.0
1 parent 1ad3123 commit 468cc10

File tree

14 files changed

+28
-12
lines changed

14 files changed

+28
-12
lines changed

.ado/jobs/desktop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
(FullyQualifiedName!~PreparedJavaScriptSourceTest)
114114
115115
pool: ${{ parameters.AgentPool.Medium }}
116-
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
116+
timeoutInMinutes: 80 # how long to run the job before automatically cancelling - Issue 13442
117117
cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them
118118

119119
steps:

.ado/templates/react-native-init-windows.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,8 @@ steps:
153153
displayName: Create bundle testcli
154154
workingDirectory: $(Agent.BuildDirectory)\testcli
155155

156-
- ${{ if eq(parameters.runWack, true) }}:
156+
# Temporarily disabling due to spurious failures in CI, see https://github.com/microsoft/react-native-windows/issues/13578
157+
- ${{ if and(false, eq(parameters.runWack, true)) }}:
157158
- template: ../templates/run-wack.yml
158159
parameters:
159160
packageName: ReactNative.InitTest

.ado/templates/react-native-init.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ steps:
179179
displayName: Create bundle testcli
180180
workingDirectory: $(Agent.BuildDirectory)\testcli
181181

182-
- ${{ if eq(parameters.runWack, true) }}:
182+
# Temporarily disabling due to spurious failures in CI, see https://github.com/microsoft/react-native-windows/issues/13578
183+
- ${{ if and(false, eq(parameters.runWack, true)) }}:
183184
- template: ../templates/run-wack.yml
184185
parameters:
185186
packageName: ReactNative.InitTest
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "[0.74] Bump minimum VS version to 17.11.0",
4+
"packageName": "@react-native-windows/cli",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "[0.74] Bump minimum VS version to 17.11.0",
4+
"packageName": "react-native-windows",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/@react-native-windows/cli/src/commands/healthCheck/healthCheckList.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export const HealthCheckList = [
1111
[true, 'WindowsVersion', 'Windows version >= 10.0.17763.0'],
1212
[true, 'DeveloperMode', 'Developer mode is on'],
1313
[true, 'LongPath', 'Long path support is enabled'],
14-
[true, 'VSUWP', 'Visual Studio 2022 (>= 17.9) & req. components'],
14+
[true, 'VSUWP', 'Visual Studio 2022 (>= 17.11.0) & req. components'],
1515
[true, 'Node', 'Node.js (LTS, >= 18.0)'],
1616
[true, 'Yarn', 'Yarn'],
1717
[true, 'DotNetCore', '.NET SDK (LTS, = 6.0)'],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export default class MSBuildTools {
203203
const minVersion =
204204
process.env.MinimumVisualStudioVersion ||
205205
process.env.VisualStudioVersion ||
206-
'17.0';
206+
'17.11.0';
207207
const vsInstallation = findLatestVsInstall({
208208
requires,
209209
minVersion,

vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
<JsBundleEntry Include="..\Microsoft.ReactNative.IntegrationTests\ReactNativeHostTests.js" />
173173
</ItemGroup>
174174
<ItemGroup>
175-
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" Version="1.8.1" />
175+
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" Version="1.8.1.7" />
176176
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
177177
<PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
178178
</ItemGroup>

vnext/Microsoft.ReactNative.ComponentTests/Microsoft.ReactNative.ComponentTests.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
</ProjectReference>
228228
</ItemGroup>
229229
<ItemGroup>
230-
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" Version="1.8.1" />
230+
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" Version="1.8.1.7" />
231231
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
232232
<PackageReference Include="boost" Version="1.83.0.0" />
233233
</ItemGroup>

vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<Midl Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\RedBoxHandler.idl" />
161161
</ItemGroup>
162162
<ItemGroup>
163-
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" Version="1.8.1.4" />
163+
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" Version="1.8.1.7" />
164164
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
165165
<PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
166166
</ItemGroup>

0 commit comments

Comments
 (0)