Skip to content

Commit de1a30a

Browse files
BertkBertk
authored
Update System.Text.Json version (#1710)
1 parent 3004bb7 commit de1a30a

File tree

13 files changed

+36
-47
lines changed

13 files changed

+36
-47
lines changed

‎Directory.Packages.props

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
8-
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" />
8+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.6.146" />
99
</ItemGroup>
1010
<ItemGroup>
1111
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
1212
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
1313
<PackageVersion Include="Microsoft.Build.Framework" Version="17.8.3" />
14-
<PackageVersion Include="Microsoft.Build.Locator" Version="1.6.10" />
14+
<PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
1515
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
16-
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
17-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
16+
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
17+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
1818
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="8.0.0" />
1919
<!--For test TestInstrument_NetstandardAwareAssemblyResolver_PreserveCompilationContext-->
20-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
20+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
2121
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
2222
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.8.0" />
2323
<!-- Microsoft.TestPlatform.ObjectModel has a dependency to NuGet.Frameworks with specific version -->
@@ -44,16 +44,17 @@
4444
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
4545
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
4646
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
47-
<PackageVersion Include="Tmds.ExecFunction" Version="0.7.1" />
47+
<PackageVersion Include="Tmds.ExecFunction" Version="0.8.0" />
4848
<PackageVersion Include="xunit" Version="2.6.6" />
4949
<PackageVersion Include="xunit.assemblyfixture" Version="2.2.0" />
5050
<PackageVersion Include="xunit.assert" Version="2.6.6" />
5151
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
5252
<PackageVersion Include="System.Buffers" Version="4.5.1" />
5353
<PackageVersion Include="System.Memory" Version="4.5.5" />
5454
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
55-
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
55+
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
5656
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
57+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
5758
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
5859
</ItemGroup>
5960
</Project>

‎eng/azure-pipelines-nightly.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@ pool:
44
steps:
55
- task: UseDotNet@2
66
inputs:
7-
version: 6.0.416
8-
displayName: Install .NET Core SDK 6.0.416
9-
10-
- task: UseDotNet@2
11-
inputs:
12-
version: 8.0.101
13-
displayName: Install .NET Core SDK 8.0.101
7+
version: 6.0.428
8+
displayName: Install .NET Core SDK 6.0.428
149

1510
- task: UseDotNet@2
1611
inputs:

‎eng/build.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
steps:
22
- task: UseDotNet@2
33
inputs:
4-
version: 6.0.418
5-
displayName: Install .NET Core SDK 6.0.418
6-
7-
- task: UseDotNet@2
8-
inputs:
9-
version: 7.0.405
10-
displayName: Install .NET Core SDK 7.0.405
4+
version: 6.0.428
5+
displayName: Install .NET Core SDK 6.0.428
116

127
- task: UseDotNet@2
138
inputs:
149
useGlobalJson: true
15-
displayName: Install .NET Core SDK 8.0.101
10+
displayName: Install .NET Core SDK 8.0.111
1611

1712
# create artifact/package folder
1813
- pwsh: |

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "8.0.101"
3+
"version": "8.0.111"
44
}
55
}

‎src/coverlet.core/coverlet.core.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>Library</OutputType>
@@ -8,17 +8,18 @@
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="6.0.0"/>
11-
<PackageReference Include="Microsoft.Extensions.DependencyModel" VersionOverride="6.0.0"/>
11+
<PackageReference Include="Microsoft.Extensions.DependencyModel" VersionOverride="6.0.2"/>
1212
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" VersionOverride="6.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="6.0.1"/>
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" VersionOverride="6.0.2"/>
1414
<PackageReference Include="Mono.Cecil" />
1515
<PackageReference Include="NuGet.Versioning" />
1616
<PackageReference Include="Newtonsoft.Json" />
17+
<PackageReference Include="System.Text.Json" VersionOverride="6.0.11" />
1718
</ItemGroup>
1819

1920
<ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
20-
<PackageReference Include="System.Reflection.Metadata" VersionOverride="6.0.0" />
21-
<PackageReference Include="System.Collections.Immutable" VersionOverride="6.0.0" />
21+
<PackageReference Include="System.Reflection.Metadata" VersionOverride="6.0.2" />
22+
<PackageReference Include="System.Collections.Immutable" VersionOverride="6.0.1" />
2223
</ItemGroup>
2324

2425
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

‎test/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
44
<PropertyGroup>
55
<IsTestProject>true</IsTestProject>
6-
<NoWarn>$(NoWarn);NU1301;IDE0007</NoWarn>
6+
<NoWarn>$(NoWarn);NU1301;IDE0007;IDE0008</NoWarn>
77
</PropertyGroup>
88
</Project>

‎test/coverlet.collector.tests/coverlet.collector.tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="$(RepoRoot)src\coverlet.msbuild.tasks\coverlet.msbuild.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net8.0;net7.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

‎test/coverlet.integration.template/coverlet.integration.template.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<AssemblyName>coverletsamplelib.integration.template</AssemblyName>
77
<IsTestProject>false</IsTestProject>

‎test/coverlet.integration.tests/Msbuild.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void TestMsbuild_CoverletOutput_Folder_FileNameWithDoubleExtension()
152152
public void Test_MultipleTargetFrameworkReport_NoCoverletOutput()
153153
{
154154
using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
155-
string[] targetFrameworks = new string[] { "net6.0", "net7.0", "net8.0" };
155+
string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
156156
UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
157157
DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
158158
if (!string.IsNullOrEmpty(standardError))
@@ -178,7 +178,7 @@ public void Test_MultipleTargetFrameworkReport_NoCoverletOutput()
178178
public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder()
179179
{
180180
using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
181-
string[] targetFrameworks = new string[] { "net6.0", "net7.0", "net8.0" };
181+
string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
182182
UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
183183
bool result = DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true /p:CoverletOutput=\"{clonedTemplateProject.ProjectRootPath}\"\\", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
184184
if (!string.IsNullOrEmpty(standardError))
@@ -206,7 +206,7 @@ public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder()
206206
public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWithoutExtension()
207207
{
208208
using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
209-
string[] targetFrameworks = new string[] { "net6.0", "net7.0", "net8.0" };
209+
string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
210210
UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
211211
DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true /p:CoverletOutput=\"{clonedTemplateProject.ProjectRootPath}\"\\file", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
212212
if (!string.IsNullOrEmpty(standardError))
@@ -232,11 +232,11 @@ public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWit
232232
public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWithExtension_SpecifyFramework()
233233
{
234234
using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
235-
string[] targetFrameworks = new string[] { "net6.0", "net7.0", "net8.0" };
235+
string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
236236
UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
237237
Assert.True(clonedTemplateProject.IsMultipleTargetFramework());
238238
string[] frameworks = clonedTemplateProject.GetTargetFrameworks();
239-
Assert.Equal(3, frameworks.Length);
239+
Assert.Equal(2, frameworks.Length);
240240
string framework = frameworks.FirstOrDefault()!;
241241
DotnetCli($"test -c {_buildConfiguration} -f {framework} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true /p:CoverletOutput=\"{clonedTemplateProject.ProjectRootPath}\"\\file.ext", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
242242
if (!string.IsNullOrEmpty(standardError))
@@ -269,7 +269,7 @@ public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWit
269269
public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWithExtension()
270270
{
271271
using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
272-
string[] targetFrameworks = new string[] { "net6.0", "net7.0", "net8.0" };
272+
string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
273273
UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
274274
DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true /p:CoverletOutput=\"{clonedTemplateProject.ProjectRootPath}\"\\file.ext", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
275275
if (!string.IsNullOrEmpty(standardError))
@@ -295,7 +295,7 @@ public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWit
295295
public void Test_MultipleTargetFrameworkReport_CoverletOutput_Folder_FileNameWithDoubleExtension()
296296
{
297297
using ClonedTemplateProject clonedTemplateProject = PrepareTemplateProject();
298-
string[] targetFrameworks = new string[] { "net6.0", "net7.0", "net8.0" };
298+
string[] targetFrameworks = new string[] { "net6.0", "net8.0" };
299299
UpdateProjectTargetFramework(clonedTemplateProject, targetFrameworks);
300300
DotnetCli($"test -c {_buildConfiguration} \"{clonedTemplateProject.ProjectRootPath}\" /p:CollectCoverage=true /p:Include=\"[{ClonedTemplateProject.AssemblyName}]*DeepThought\" /p:IncludeTestAssembly=true /p:CoverletOutput=\"{clonedTemplateProject.ProjectRootPath}\"\\file.ext1.ext2", out string standardOutput, out string standardError, clonedTemplateProject.ProjectRootPath!);
301301
if (!string.IsNullOrEmpty(standardError))

‎test/coverlet.integration.tests/coverlet.integration.tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0;net7.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
<Nullable>enable</Nullable>
66
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
@@ -15,7 +15,7 @@
1515
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
1616
<PackageReference Include="System.Buffers" Version="4.5.1" />
1717
<PackageReference Include="System.Memory" Version="4.5.5" />
18-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
18+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.5" />
1919
</ItemGroup>
2020

2121
<ItemGroup>

‎test/coverlet.msbuild.tasks.tests/coverlet.msbuild.tasks.tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsTestProject>true</IsTestProject>

‎test/coverlet.tests.utils/TestUtils.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ public static string GetAssemblyTargetFramework()
3636
#if NET6_0
3737
return "net6.0";
3838
#endif
39-
#if NET7_0
40-
return "net7.0";
41-
#endif
4239
#if NET8_0
4340
return "net8.0";
4441
#endif

‎test/coverlet.tests.utils/coverlet.tests.utils.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<IsTestProject>false</IsTestProject>
77
<SignAssembly>False</SignAssembly>

0 commit comments

Comments
 (0)