feat!: move to netstandard2.1 and drop .NET full support (#158)

* chore: upgrade to net9.0 * chore: suppress netstandard2.x recommendation. * feat!: drop support for .NET full framework. * fix: enable recommended fx check in SDK. * fix: remove net full tests for windows. * ci: move to ubuntu-latest since we're not using netfull * Revert "ci: move to ubuntu-latest since we're not using netfull" This reverts commit 09cb024.
spekt · Feb 13, 2025 · 4a00352 · 4a00352
1 parent 6c6a49e
commit 4a00352
Show file tree

Hide file tree

Showing 54 changed files with 31 additions and 3,587 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -50,10 +50,10 @@ jobs:
       TERM: "xterm"
     steps:
       - uses: actions/checkout@v4
-      - name: Setup .NET 8.0
+      - name: Setup .NET 9.0
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 8.x
+          dotnet-version: 9.x
       - name: Setup .NET 3.1.x
         uses: actions/setup-dotnet@v1
         with:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <SourceRoot Condition="$(SourceRoot) == ''">$(MSBuildThisFileDirectory)</SourceRoot>
-    <SourcePrefix>4.0.0</SourcePrefix>
+    <SourcePrefix>6.0.0</SourcePrefix>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/JUnit.Xml.Package/JUnit.Xml.Package.csproj b/src/JUnit.Xml.Package/JUnit.Xml.Package.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <Version>$(PackageVersion)</Version>
     <AssemblyName>JUnitXml.TestLogger</AssemblyName>
 

diff --git a/src/JUnit.Xml.Package/JUnitXml.TestLogger.nuspec b/src/JUnit.Xml.Package/JUnitXml.TestLogger.nuspec
@@ -16,11 +16,7 @@
     <file src="Microsoft.VisualStudio.TestPlatform.Extension.Junit.Xml.TestLogger.dll" target="build\_common\" />
     <file src="Spekt.TestLogger.dll" target="build\_common\" />
 
-    <!-- Net Core -->
-    <file src="JunitXml.TestLogger.props" target="build\netstandard1.5\" />
-
-    <!-- Desktop -->
-    <file src="JunitXml.TestLogger.props" target="build\net46\" />
+    <file src="JunitXml.TestLogger.props" target="build\netstandard2.1\" />
 
     <file src="README.md" target="docs\" />
     <file src="CHANGELOG.md" target="docs\" />

diff --git a/src/JUnit.Xml.TestLogger/Assembly.cs b/src/JUnit.Xml.TestLogger/Assembly.cs
@@ -8,9 +8,3 @@
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: ExcludeFromCodeCoverage]
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = false, Inherited = false)]
-    internal sealed class ExcludeFromCodeCoverageAttribute : Attribute { }
-}
diff --git a/src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.csproj b/src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extension.JUnit.Xml.TestLogger</AssemblyName>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/NUnit.Xml.Package/NUnit.Xml.Package.csproj b/src/NUnit.Xml.Package/NUnit.Xml.Package.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <Version>$(PackageVersion)</Version>
     <AssemblyName>NUnitXml.TestLogger</AssemblyName>
 

diff --git a/src/NUnit.Xml.TestLogger/Assembly.cs b/src/NUnit.Xml.TestLogger/Assembly.cs
@@ -8,9 +8,3 @@
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: ExcludeFromCodeCoverage]
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = false, Inherited = false)]
-    internal sealed class ExcludeFromCodeCoverageAttribute : Attribute { }
-}
diff --git a/src/NUnit.Xml.TestLogger/NUnit.Xml.TestLogger.csproj b/src/NUnit.Xml.TestLogger/NUnit.Xml.TestLogger.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extension.NUnit.Xml.TestLogger</AssemblyName>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/TestLogger/Assembly.cs b/src/TestLogger/Assembly.cs
@@ -12,9 +12,3 @@
 [assembly: InternalsVisibleTo("Json.TestAdapter")]
 [assembly: InternalsVisibleTo("TestLogger.UnitTests")]
 [assembly: ExcludeFromCodeCoverage]
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = false, Inherited = false)]
-    internal sealed class ExcludeFromCodeCoverageAttribute : Attribute { }
-}
diff --git a/src/TestLogger/TestLogger.csproj b/src/TestLogger/TestLogger.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Spekt.TestLogger</AssemblyName>
     <Version>$(PackageVersion)</Version>
     <IsPackable>true</IsPackable>

diff --git a/src/Xunit.Xml.Package/Xunit.Xml.Package.csproj b/src/Xunit.Xml.Package/Xunit.Xml.Package.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <Version>$(PackageVersion)</Version>
     <AssemblyName>XunitXml.TestLogger</AssemblyName>
 

diff --git a/src/Xunit.Xml.Package/XunitXml.TestLogger.nuspec b/src/Xunit.Xml.Package/XunitXml.TestLogger.nuspec
@@ -19,10 +19,6 @@
     <file src="CHANGELOG.md" target="docs\" />
     <file src="packageIcon.png" target="\" />
 
-    <!-- Net Core -->
-    <file src="XunitXml.TestLogger.props" target="build\netstandard1.5\" />
-
-    <!-- Desktop -->
-    <file src="XunitXml.TestLogger.props" target="build\net46\" />
+    <file src="XunitXml.TestLogger.props" target="build\netstandard2.1\" />
   </files>
 </package>
diff --git a/src/Xunit.Xml.TestLogger/Assembly.cs b/src/Xunit.Xml.TestLogger/Assembly.cs
@@ -8,9 +8,3 @@
 using System.Diagnostics.CodeAnalysis;
 
 [assembly: ExcludeFromCodeCoverage]
-
-namespace System.Diagnostics.CodeAnalysis
-{
-    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Constructor | AttributeTargets.Event | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple = false, Inherited = false)]
-    internal sealed class ExcludeFromCodeCoverageAttribute : Attribute { }
-}
diff --git a/src/Xunit.Xml.TestLogger/Xunit.Xml.TestLogger.csproj b/src/Xunit.Xml.TestLogger/Xunit.Xml.TestLogger.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.Extension.Xunit.Xml.TestLogger</AssemblyName>
     <Version>$(PackageVersion)</Version>
     <IsPackable>false</IsPackable>

diff --git a/test/JUnit.Xml.TestLogger.AcceptanceTests/JUnit.Xml.TestLogger.AcceptanceTests.csproj b/test/JUnit.Xml.TestLogger.AcceptanceTests/JUnit.Xml.TestLogger.AcceptanceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <WarningsAsErrors>true</WarningsAsErrors>
     <EnableCodeAnalysis>true</EnableCodeAnalysis>
     <IsPackable>false</IsPackable>
@@ -23,8 +23,6 @@
 
   <!-- Build test assets for acceptance tests -->
   <ItemGroup>
-    <TestAssets Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="$(MSBuildThisFileDirectory)../assets/JUnit.Xml.TestLogger.NetFull.Tests/JUnit.Xml.TestLogger.NetFull.Tests.csproj" />
-
     <TestAssets Include="$(MSBuildThisFileDirectory)../assets/JUnit.Xml.TestLogger.NetCore.Tests/JUnit.Xml.TestLogger.NetCore.Tests.csproj" />
     <TestAssets Include="$(MSBuildThisFileDirectory)../assets/JUnit.Xml.TestLogger.NetMulti.Tests/JUnit.Xml.TestLogger.NetMulti.Tests.csproj" />
     <TestAssets Include="$(MSBuildThisFileDirectory)../assets/JUnit.Xml.TestLogger.XUnit.NetCore.Tests/JUnit.Xml.TestLogger.XUnit.NetCore.Tests.csproj" />

diff --git a/test/JUnit.Xml.TestLogger.AcceptanceTests/JUnitTestLoggerPathTests.cs b/test/JUnit.Xml.TestLogger.AcceptanceTests/JUnitTestLoggerPathTests.cs
@@ -19,7 +19,7 @@ public class JUnitTestLoggerPathTests
     {
         private static readonly string[] ExpectedResultsFiles = new string[]
         {
-            "JUnit.Xml.TestLogger.NetMulti.Tests.NETFramework461.test-results.xml",
+            "JUnit.Xml.TestLogger.NetMulti.Tests.NETCoreApp90.test-results.xml",
             "JUnit.Xml.TestLogger.NetMulti.Tests.NETCoreApp31.test-results.xml"
         };
 

diff --git a/test/JUnit.Xml.TestLogger.UnitTests/JUnit.Xml.TestLogger.UnitTests.csproj b/test/JUnit.Xml.TestLogger.UnitTests/JUnit.Xml.TestLogger.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <WarningsAsErrors>true</WarningsAsErrors>
     <EnableCodeAnalysis>true</EnableCodeAnalysis>
     <IsPackable>false</IsPackable>

diff --git a/test/Json.TestLogger.Package/Json.TestLogger.Package.csproj b/test/Json.TestLogger.Package/Json.TestLogger.Package.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <Version>$(PackageVersion)</Version>
     <AssemblyName>Sample.Json.TestLogger</AssemblyName>
 

diff --git a/test/Json.TestLogger.TestAdapter/Json.TestLogger.TestAdapter.csproj b/test/Json.TestLogger.TestAdapter/Json.TestLogger.TestAdapter.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Json.TestAdapter</AssemblyName>
     <Version>$(PackageVersion)</Version>
     <IsPackable>false</IsPackable>

diff --git a/test/Json.TestLogger/Json.TestLogger.csproj b/test/Json.TestLogger/Json.TestLogger.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.5</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyName>Json.TestLogger</AssemblyName>
     <Version>$(PackageVersion)</Version>
     <IsPackable>false</IsPackable>

diff --git a/test/NUnit.Xml.TestLogger.AcceptanceTests/NUnit.Xml.TestLogger.AcceptanceTests.csproj b/test/NUnit.Xml.TestLogger.AcceptanceTests/NUnit.Xml.TestLogger.AcceptanceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <WarningsAsErrors>true</WarningsAsErrors>
     <EnableCodeAnalysis>true</EnableCodeAnalysis>
     <IsPackable>false</IsPackable>
@@ -23,8 +23,6 @@
 
   <!-- Build test assets for acceptance tests -->
   <ItemGroup>
-    <TestAssets Condition="$([MSBuild]::IsOSPlatform('Windows'))" Include="$(MSBuildThisFileDirectory)../assets/NUnit.Xml.TestLogger.NetFull.Tests/NUnit.Xml.TestLogger.NetFull.Tests.csproj" />
-
     <TestAssets Include="$(MSBuildThisFileDirectory)../assets/NUnit.Xml.TestLogger.NetCore.Tests/NUnit.Xml.TestLogger.NetCore.Tests.csproj" />
     <TestAssets Include="$(MSBuildThisFileDirectory)../assets/NUnit.Xml.TestLogger.NetMulti.Tests/NUnit.Xml.TestLogger.NetMulti.Tests.csproj" />
   </ItemGroup>

diff --git a/test/NUnit.Xml.TestLogger.AcceptanceTests/NUnitTestLoggerPathTests.cs b/test/NUnit.Xml.TestLogger.AcceptanceTests/NUnitTestLoggerPathTests.cs
@@ -14,7 +14,7 @@ public class NUnitTestLoggerPathTests
     {
         private static readonly string[] ExpectedResultsFiles = new string[]
         {
-            "NUnit.Xml.TestLogger.NetMulti.Tests.NETFramework461.test-results.xml",
+            "NUnit.Xml.TestLogger.NetMulti.Tests.NETCoreApp90.test-results.xml",
             "NUnit.Xml.TestLogger.NetMulti.Tests.NETCoreApp31.test-results.xml"
         };
 

diff --git a/test/NUnit.Xml.TestLogger.UnitTests/NUnit.Xml.TestLogger.UnitTests.csproj b/test/NUnit.Xml.TestLogger.UnitTests/NUnit.Xml.TestLogger.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <WarningsAsErrors>true</WarningsAsErrors>
     <EnableCodeAnalysis>true</EnableCodeAnalysis>
     <IsPackable>false</IsPackable>