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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Upgrade to GoogleTest adapter 1.8.1.8",
"packageName": "react-native-windows",
"email": "julio.rocha@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
<ItemGroup>
<PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)"
Condition="'$(OverrideWinUIPackage)'!='true'" />
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" Version="1.8.1.7" />
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" Version="1.8.1.8" />
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
<PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn": {
"type": "Direct",
"requested": "[1.8.1.7, )",
"resolved": "1.8.1.7",
"contentHash": "FxNwT4YpsGdqforqFSTGc5f/e+qfRJ+1wf5G1w0nEEkT5pr5M95E5+fOuswpPUGXPZIXM+M7BSVGnCRcQZjomA=="
"requested": "[1.8.1.8, )",
"resolved": "1.8.1.8",
"contentHash": "RHZUuFTnYzkHPRM5muZfw4SRL/EIHFz7nIkKl1mJKPISvzi1wWtK7k/oJIpw3pWVkdFyEfnBQP8vX1fFpe7Mpw=="
},
"Microsoft.Windows.CppWinRT": {
"type": "Direct",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn": {
"type": "Direct",
"requested": "[1.8.1.7, )",
"resolved": "1.8.1.7",
"contentHash": "FxNwT4YpsGdqforqFSTGc5f/e+qfRJ+1wf5G1w0nEEkT5pr5M95E5+fOuswpPUGXPZIXM+M7BSVGnCRcQZjomA=="
"requested": "[1.8.1.8, )",
"resolved": "1.8.1.8",
"contentHash": "RHZUuFTnYzkHPRM5muZfw4SRL/EIHFz7nIkKl1mJKPISvzi1wWtK7k/oJIpw3pWVkdFyEfnBQP8vX1fFpe7Mpw=="
},
"Microsoft.Windows.CppWinRT": {
"type": "Direct",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
<ItemGroup>
<PackageReference Include="boost" Version="1.84.0.0" />
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn"
Version="1.8.1.7" />
Version="1.8.1.8" />
<PackageReference Include="Microsoft.VCRTForwarders.140" Version="1.0.6" />
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)"
PrivateAssets="all" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn": {
"type": "Direct",
"requested": "[1.8.1.7, )",
"resolved": "1.8.1.7",
"contentHash": "FxNwT4YpsGdqforqFSTGc5f/e+qfRJ+1wf5G1w0nEEkT5pr5M95E5+fOuswpPUGXPZIXM+M7BSVGnCRcQZjomA=="
"requested": "[1.8.1.8, )",
"resolved": "1.8.1.8",
"contentHash": "RHZUuFTnYzkHPRM5muZfw4SRL/EIHFz7nIkKl1mJKPISvzi1wWtK7k/oJIpw3pWVkdFyEfnBQP8vX1fFpe7Mpw=="
},
"Microsoft.VCRTForwarders.140": {
"type": "Direct",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn": {
"type": "Direct",
"requested": "[1.8.1.7, )",
"resolved": "1.8.1.7",
"contentHash": "FxNwT4YpsGdqforqFSTGc5f/e+qfRJ+1wf5G1w0nEEkT5pr5M95E5+fOuswpPUGXPZIXM+M7BSVGnCRcQZjomA=="
"requested": "[1.8.1.8, )",
"resolved": "1.8.1.8",
"contentHash": "RHZUuFTnYzkHPRM5muZfw4SRL/EIHFz7nIkKl1mJKPISvzi1wWtK7k/oJIpw3pWVkdFyEfnBQP8vX1fFpe7Mpw=="
},
"Microsoft.VCRTForwarders.140": {
"type": "Direct",
Expand Down
2 changes: 1 addition & 1 deletion vnext/Mso.UnitTests/Mso.UnitTests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn"
Version="1.8.1.7" />
Version="1.8.1.8" />
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)"
PrivateAssets="all" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions vnext/Mso.UnitTests/packages.experimentalwinui3.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn": {
"type": "Direct",
"requested": "[1.8.1.7, )",
"resolved": "1.8.1.7",
"contentHash": "FxNwT4YpsGdqforqFSTGc5f/e+qfRJ+1wf5G1w0nEEkT5pr5M95E5+fOuswpPUGXPZIXM+M7BSVGnCRcQZjomA=="
"requested": "[1.8.1.8, )",
"resolved": "1.8.1.8",
"contentHash": "RHZUuFTnYzkHPRM5muZfw4SRL/EIHFz7nIkKl1mJKPISvzi1wWtK7k/oJIpw3pWVkdFyEfnBQP8vX1fFpe7Mpw=="
},
"Microsoft.Windows.CppWinRT": {
"type": "Direct",
Expand Down
6 changes: 3 additions & 3 deletions vnext/Mso.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"native,Version=v0.0": {
"Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn": {
"type": "Direct",
"requested": "[1.8.1.7, )",
"resolved": "1.8.1.7",
"contentHash": "FxNwT4YpsGdqforqFSTGc5f/e+qfRJ+1wf5G1w0nEEkT5pr5M95E5+fOuswpPUGXPZIXM+M7BSVGnCRcQZjomA=="
"requested": "[1.8.1.8, )",
"resolved": "1.8.1.8",
"contentHash": "RHZUuFTnYzkHPRM5muZfw4SRL/EIHFz7nIkKl1mJKPISvzi1wWtK7k/oJIpw3pWVkdFyEfnBQP8vX1fFpe7Mpw=="
},
"Microsoft.Windows.CppWinRT": {
"type": "Direct",
Expand Down
4 changes: 2 additions & 2 deletions vnext/PropertySheets/React.Cpp.props
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@

<PropertyGroup Label="ExternalDependencies">
<!-- Google Test Adapter -->
<!-- Property sheets in the adapter's NuGet doesn't consider PlatformToolset=v143 -->
<Force-Enable-Microsoft-googletest-v140-windesktop-msvcstl-static-rt-dyn>false</Force-Enable-Microsoft-googletest-v140-windesktop-msvcstl-static-rt-dyn>
<!-- If ApplicationType is set, adapter include paths won't be set for MSVC 14.0 (v140) or later -->
<Force-Enable-Microsoft-googletest-v140-windesktop-msvcstl-static-rt-dyn>true</Force-Enable-Microsoft-googletest-v140-windesktop-msvcstl-static-rt-dyn>
</PropertyGroup>

<!--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<PackageReference Include="boost" Version="1.84.0.0" />
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" Version="1.8.1.7" />
<PackageReference Include="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" Version="1.8.1.8" />
<PackageReference Include="$(V8PackageName)" Version="$(V8Version)" Condition="'$(UseV8)' == 'true'" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn": {
"type": "Direct",
"requested": "[1.8.1.7, )",
"resolved": "1.8.1.7",
"contentHash": "FxNwT4YpsGdqforqFSTGc5f/e+qfRJ+1wf5G1w0nEEkT5pr5M95E5+fOuswpPUGXPZIXM+M7BSVGnCRcQZjomA=="
"requested": "[1.8.1.8, )",
"resolved": "1.8.1.8",
"contentHash": "RHZUuFTnYzkHPRM5muZfw4SRL/EIHFz7nIkKl1mJKPISvzi1wWtK7k/oJIpw3pWVkdFyEfnBQP8vX1fFpe7Mpw=="
},
"ReactNative.V8Jsi.Windows": {
"type": "Direct",
Expand Down
6 changes: 3 additions & 3 deletions vnext/ReactCommon.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
},
"Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn": {
"type": "Direct",
"requested": "[1.8.1.7, )",
"resolved": "1.8.1.7",
"contentHash": "FxNwT4YpsGdqforqFSTGc5f/e+qfRJ+1wf5G1w0nEEkT5pr5M95E5+fOuswpPUGXPZIXM+M7BSVGnCRcQZjomA=="
"requested": "[1.8.1.8, )",
"resolved": "1.8.1.8",
"contentHash": "RHZUuFTnYzkHPRM5muZfw4SRL/EIHFz7nIkKl1mJKPISvzi1wWtK7k/oJIpw3pWVkdFyEfnBQP8vX1fFpe7Mpw=="
},
"ReactNative.V8Jsi.Windows": {
"type": "Direct",
Expand Down
Loading