Skip to content

Commit

Permalink
Feature/fix net48 tests (#82)
Browse files Browse the repository at this point in the history
* Add packages required for .net framework to tests

* Use central package management

* Reorder packages

* Add ISpanFormattable test for net6 compatible type
  • Loading branch information
alexaka1 authored Aug 26, 2024
1 parent 7c1c6f8 commit 8b8bf08
Show file tree
Hide file tree
Showing 8 changed files with 282 additions and 166 deletions.
31 changes: 31 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="6.0.2"/>
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0"/>
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1"/>
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0"/>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0"/>
<PackageVersion Include="Moq" Version="4.20.70"/>
<PackageVersion Include="Serilog" Version="4.0.1"/>
<PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.1"/>
<PackageVersion Include="Serilog.Enrichers.Memory" Version="1.0.4"/>
<PackageVersion Include="Serilog.Enrichers.Process" Version="3.0.0"/>
<PackageVersion Include="Serilog.Enrichers.Sensitive" Version="1.7.3"/>
<PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0"/>
<PackageVersion Include="Serilog.Exceptions" Version="8.4.0"/>
<PackageVersion Include="Serilog.Expressions" Version="5.0.0"/>
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0"/>
<PackageVersion Include="System.Reflection.Metadata" Version="8.0.0"/>
<PackageVersion Include="xunit" Version="2.9.0"/>
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2"/>
</ItemGroup>
<ItemGroup Condition="$(TargetFramework) == 'netstandard2.0'">
<PackageVersion Include="System.Text.Json" Version="8.0.4"/>
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
<!-- <None Include="../../assets/icon.png" Pack="true" Visible="false" PackagePath="/" />-->
<None Include="../../README.md" Pack="true" Visible="false" PackagePath="/"/>
<None Include="../../LICENSE" Pack="true" Visible="false" PackagePath="/"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
<PackageReference Include="System.Text.Json" Version="8.0.4" Condition="$(TargetFramework) == 'netstandard2.0'"/>
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Serilog" Version="4.0.1"/>
<PackageReference Include="Serilog"/>
<PackageReference Include="System.Text.Json" Condition="$(TargetFramework) == 'netstandard2.0'"/>
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Serilog.Extensions.Formatting/packages.lock.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"dependencies": {
".NETStandard,Version=v2.0": {
"Microsoft.SourceLink.GitHub": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.14.0"/>
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1"/>
<PackageReference Include="Serilog.Enrichers.Memory" Version="1.0.4"/>
<PackageReference Include="Serilog.Enrichers.Process" Version="3.0.0"/>
<PackageReference Include="Serilog.Enrichers.Sensitive" Version="1.7.3"/>
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0"/>
<PackageReference Include="Serilog.Exceptions" Version="8.4.0"/>
<PackageReference Include="Serilog.Expressions" Version="5.0.0"/>
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0"/>
<PackageReference Include="BenchmarkDotNet"/>
<PackageReference Include="Microsoft.Extensions.Logging"/>
<PackageReference Include="Serilog.Enrichers.Environment"/>
<PackageReference Include="Serilog.Enrichers.Memory"/>
<PackageReference Include="Serilog.Enrichers.Process"/>
<PackageReference Include="Serilog.Enrichers.Sensitive"/>
<PackageReference Include="Serilog.Enrichers.Thread"/>
<PackageReference Include="Serilog.Exceptions"/>
<PackageReference Include="Serilog.Expressions"/>
<PackageReference Include="Serilog.Sinks.Console"/>
<PackageReference Include="System.Reflection.Metadata"/>
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 8b8bf08

Please sign in to comment.