Skip to content

Commit 1788cfb

Browse files
BertkBertk
committed
remove netstandard2.0 assemblies
1 parent 679c81a commit 1788cfb

File tree

4 files changed

+7
-16
lines changed

4 files changed

+7
-16
lines changed

‎Directory.Packages.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,9 @@
5252
<PackageVersion Include="xunit.assemblyfixture" Version="2.2.0" />
5353
<PackageVersion Include="xunit.assert" Version="2.9.0" />
5454
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
55-
<PackageVersion Include="System.Buffers" Version="4.5.1" />
5655
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
57-
<PackageVersion Include="System.Memory" Version="4.5.5" />
58-
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
5956
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="6.0.4" />
6057
<PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
6158
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
62-
<PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
6359
</ItemGroup>
6460
</Project>

‎test/coverlet.core.tests/coverlet.core.tests.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
</PackageReference>
2929
<PackageReference Include="System.Collections.Immutable" />
30-
<PackageReference Include="System.Buffers" />
31-
<PackageReference Include="System.Memory" />
3230
<PackageReference Include="System.Text.Encoding.CodePages" />
3331
</ItemGroup>
3432

‎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.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

0 commit comments

Comments
 (0)