Skip to content

[main] Update dependencies from devdiv/DevDiv/vs-code-coverage #14941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 20, 2025
Merged

[main] Update dependencies from devdiv/DevDiv/vs-code-coverage #14941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c44babd
Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-…
dotnet-maestro[bot] Jan 20, 2025
5b6dddb
Update newtonsoft.json to 13.0. 3
nohwnd Jan 20, 2025
6ce6556
Merge branch 'main' into darc-main-7e5e89ba-c459-46b0-98e3-e3b01ce648a7
nohwnd Jan 20, 2025
dbe31f9
package downgrades
nohwnd Jan 20, 2025
51a5c35
fix
nohwnd Jan 20, 2025
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 eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.14.0-preview.25059.1">
<Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.14.0-preview.25067.3">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
<Sha>0d62d044028d9ac809f02d898d5d7349bbcd00a4</Sha>
<Sha>d52391c515fffc2d8e12bccbd54758ca92b66e9a</Sha>
</Dependency>
<Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.606601">
<Uri>https://github.com/dotnet/diagnostics</Uri>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
<MicrosoftExtensionsDependencyModelPackageVersion>3.1.0</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftFakesVersion>17.9.0-beta.24058.4</MicrosoftFakesVersion>
<MicrosoftInternalCodeCoverageVersion>17.14.0-preview.25059.1</MicrosoftInternalCodeCoverageVersion>
<MicrosoftVisualStudioDiagnosticsUtilitiesVersion>17.10.34924.118</MicrosoftVisualStudioDiagnosticsUtilitiesVersion>
<MicrosoftInternalCodeCoverageVersion>17.14.0-preview.25067.3</MicrosoftInternalCodeCoverageVersion>
<MicrosoftVisualStudioDiagnosticsUtilitiesVersion>17.13.35716.53</MicrosoftVisualStudioDiagnosticsUtilitiesVersion>
<MicrosoftVisualStudioEnterpriseAspNetHelper>$(MicrosoftVisualStudioDiagnosticsUtilitiesVersion)</MicrosoftVisualStudioEnterpriseAspNetHelper>
<MicrosoftVisualStudioInteropVersion>17.10.525-preview.1</MicrosoftVisualStudioInteropVersion>
<MicrosoftVSTelemetryVersion>17.6.46</MicrosoftVSTelemetryVersion>
<MicrosoftVSUtilitiesInternalVersion>16.3.42</MicrosoftVSUtilitiesInternalVersion>
<MicrosoftVSSDKBuildToolsVersion>17.4.2124</MicrosoftVSSDKBuildToolsVersion>
<NewtonsoftJsonVersion>13.0.1</NewtonsoftJsonVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
<NewtonsoftJsonVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">13.0.3</NewtonsoftJsonVersion>
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
<SystemComponentModelCompositionVersion>4.5.0</SystemComponentModelCompositionVersion>
Expand Down
2 changes: 1 addition & 1 deletion samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
<!-- / CVE-2017-11770 -->

<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/package/ThirdPartyNotices.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ and the licenses under which Microsoft received such components are set forth be
informational purposes only. Microsoft reserves all rights not expressly granted herein, whether by
implication, estoppel or otherwise.

1. Newtonsoft version 13.0.1 (https://github.com/JamesNK/Newtonsoft.Json)
1. Newtonsoft version 13.0.3 (https://github.com/JamesNK/Newtonsoft.Json)
2. Mono.Cecil version 0.11.3 (https://github.com/jbevain/cecil)
3. Nuget.Client version 6.8.0.117 \(https://github.com/NuGet/NuGet.Client)

Expand Down
2 changes: 1 addition & 1 deletion temp/testhost/testhost.deps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"runtime": {
"Newtonsoft.Json.dll": {
"assemblyVersion": "13.0.0.0",
"fileVersion": "13.0.1.25517"
"fileVersion": "13.0.3.25517"
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostExeFromNugetIfNotFoundIn
""microsoft.testplatform.testhost/15.0.0-Dev"": {
""dependencies"": {
""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
""Newtonsoft.Json"": ""13.0.1""
""Newtonsoft.Json"": ""13.0.3""
},
""runtime"": {
""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
Expand Down Expand Up @@ -397,7 +397,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostX86ExeFromNugetIfNotFoun
""microsoft.testplatform.testhost/15.0.0-Dev"": {
""dependencies"": {
""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
""Newtonsoft.Json"": ""13.0.1""
""Newtonsoft.Json"": ""13.0.3""
},
""runtime"": {
""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
Expand Down Expand Up @@ -740,7 +740,7 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromDepsFile()
""microsoft.testplatform.testhost/15.0.0-Dev"": {
""dependencies"": {
""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
""Newtonsoft.Json"": ""13.0.1""
""Newtonsoft.Json"": ""13.0.3""
},
""runtime"": {
""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
Expand Down Expand Up @@ -805,7 +805,7 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirect
""microsoft.testplatform.testhost/15.0.0-Dev"": {
""dependencies"": {
""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
""Newtonsoft.Json"": ""13.0.1""
""Newtonsoft.Json"": ""13.0.3""
},
""runtime"": {
""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
Expand Down Expand Up @@ -873,7 +873,7 @@ public void GetTestHostProcessStartInfoShouldSkipInvalidAdditionalProbingPaths()
""microsoft.testplatform.testhost/15.0.0-Dev"": {
""dependencies"": {
""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"",
""Newtonsoft.Json"": ""13.0.1""
""Newtonsoft.Json"": ""13.0.3""
},
""runtime"": {
""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { },
Expand Down
2 changes: 1 addition & 1 deletion test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<PackageReference Include="MSTest.TestFramework" Version="$(MSTestTestAdapterVersion)" />
<!-- TODO: This version would ideally be higher than the newtonsoft version we use in TP to show that the higher version is used.
Currently there is no higher stable version. -->
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="" />
</ItemGroup>

<ItemGroup>
Expand Down