Skip to content

Upgrade to .NET 9.0 #158

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 7 commits into from
Feb 13, 2025
Merged

Upgrade to .NET 9.0 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93a4cd2
chore: upgrade to net9.0
codito Feb 13, 2025
5a59685
chore: suppress netstandard2.x recommendation.
codito Feb 13, 2025
656845f
feat!: drop support for .NET full framework.
codito Feb 13, 2025
4d0017a
fix: enable recommended fx check in SDK.
codito Feb 13, 2025
0177d06
fix: remove net full tests for windows.
codito Feb 13, 2025
09cb024
ci: move to ubuntu-latest since we're not using netfull
codito Feb 13, 2025
8559564
Revert "ci: move to ubuntu-latest since we're not using netfull"
codito Feb 13, 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 .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<SourceRoot Condition="$(SourceRoot) == ''">$(MSBuildThisFileDirectory)</SourceRoot>
<SourcePrefix>4.0.0</SourcePrefix>
<SourcePrefix>6.0.0</SourcePrefix>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/JUnit.Xml.Package/JUnit.Xml.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</PropertyGroup>

<PropertyGroup>
<TargetFramework>netstandard1.5</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<Version>$(PackageVersion)</Version>
<AssemblyName>JUnitXml.TestLogger</AssemblyName>

Expand Down
6 changes: 1 addition & 5 deletions src/JUnit.Xml.Package/JUnitXml.TestLogger.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\" />
Expand Down
6 changes: 0 additions & 6 deletions src/JUnit.Xml.TestLogger/Assembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { }
}
2 changes: 1 addition & 1 deletion src/JUnit.Xml.TestLogger/JUnit.Xml.TestLogger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/NUnit.Xml.Package/NUnit.Xml.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
6 changes: 0 additions & 6 deletions src/NUnit.Xml.TestLogger/Assembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { }
}
2 changes: 1 addition & 1 deletion src/NUnit.Xml.TestLogger/NUnit.Xml.TestLogger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 0 additions & 6 deletions src/TestLogger/Assembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { }
}
2 changes: 1 addition & 1 deletion src/TestLogger/TestLogger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Xunit.Xml.Package/Xunit.Xml.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
6 changes: 1 addition & 5 deletions src/Xunit.Xml.Package/XunitXml.TestLogger.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 0 additions & 6 deletions src/Xunit.Xml.TestLogger/Assembly.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { }
}
2 changes: 1 addition & 1 deletion src/Xunit.Xml.TestLogger/Xunit.Xml.TestLogger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 1 addition & 3 deletions test/JUnit.Xml.TestLogger.AcceptanceTests/JUnit.Xml.TestLogger.AcceptanceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion test/JUnit.Xml.TestLogger.AcceptanceTests/JUnitTestLoggerPathTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
};

Expand Down
2 changes: 1 addition & 1 deletion test/JUnit.Xml.TestLogger.UnitTests/JUnit.Xml.TestLogger.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/Json.TestLogger.Package/Json.TestLogger.Package.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test/Json.TestLogger.TestAdapter/Json.TestLogger.TestAdapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/Json.TestLogger/Json.TestLogger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 1 addition & 3 deletions test/NUnit.Xml.TestLogger.AcceptanceTests/NUnit.Xml.TestLogger.AcceptanceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion test/NUnit.Xml.TestLogger.AcceptanceTests/NUnitTestLoggerPathTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
};

Expand Down
2 changes: 1 addition & 1 deletion test/NUnit.Xml.TestLogger.UnitTests/NUnit.Xml.TestLogger.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading
Loading