diff --git a/GitVersion.yml b/GitVersion.yml
index 2d1fb7cbe..c408dcc13 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -2,10 +2,11 @@ mode: ContinuousDelivery
branches:
main:
regex: ^v2.12.0-cfx$
+ source-branches: []
mode: ContinuousDeployment
tag: ci
track-merge-target: true
ignore:
sha: []
merge-message-formats: {}
-tag-prefix: "v"
+tag-prefix: '^v(?!2\.12\.0-serilog)[\d.]+$'
\ No newline at end of file
diff --git a/README.md b/README.md
index 77e61cbc1..5df489090 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,11 @@
# CitizenFX.Extensions.Client.Serilog
-A fork of the [diagnostic logging library known as Serilog](https://serilog.net/), based off [v2.12.0 of Serilog](https://github.com/serilog/serilog/tree/v2.12.0) for compatability with [.NET client-side FiveM](https://fivem.net/)
+[![Downloads](https://img.shields.io/nuget/dt/CitizenFX.Extensions.Client.Serilog?style=flat-square)](https://www.nuget.org/packages/CitizenFX.Extensions.Client.Serilog)
+[![GitHub release](https://img.shields.io/github/v/release/Twinki14/CitizenFX.Extensions.Client.Serilog?style=flat-square)](https://github.com/Twinki14/CitizenFX.Extensions.Client.Serilog/releases)
+[![Nuget](https://img.shields.io/nuget/v/CitizenFX.Extensions.Client.Serilog?style=flat-square)](https://www.nuget.org/packages/CitizenFX.Extensions.Client.Serilog)
+[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/Twinki14/CitizenFX.Extensions.Client.Serilog/build-publish.yaml?style=flat-square)](https://github.com/Twinki14/CitizenFX.Extensions.Client.Serilog/actions/workflows/build-publish.yaml)
+
+A fork of the [logging library known as Serilog](https://serilog.net/), based off [v2.12.0](https://github.com/serilog/serilog/tree/v2.12.0) for compatability with [.NET client-side FiveM](https://fivem.net/)
+
## Example
```csharp
@@ -14,6 +20,8 @@ logger.Information("Hello from the FiveM client!");
## Changes from [v2.12.0 of Serilog](https://github.com/serilog/serilog/tree/v2.12.0)
### v2.12.0-cfx
- [#1](https://github.com/Twinki14/CitizenFX.Extensions.Client.Serilog/pull/1) - Trim files, remove assembly signing, only target net452
+- [#2](https://github.com/Twinki14/CitizenFX.Extensions.Client.Serilog/pull/2) - Add CI/CD proceeded by fix [in #4](https://github.com/Twinki14/CitizenFX.Extensions.Client.Serilog/pull/4)
+- [#3](https://github.com/Twinki14/CitizenFX.Extensions.Client.Serilog/pull/3) - Remove extra performance tests & results, this just bloated things for the purpose of this fork
## Notes
- This fork is in **NO WAY** affiliated with the [Serilog Organization](https://github.com/serilog) or the [Serilog project](https://serilog.net/), it's purely a fork to provide compatability with FiveM's client-resource shipped mono
diff --git a/src/Serilog/Properties/AssemblyInfo.cs b/src/Serilog/Properties/AssemblyInfo.cs
index 8fa86a994..4b2d74249 100644
--- a/src/Serilog/Properties/AssemblyInfo.cs
+++ b/src/Serilog/Properties/AssemblyInfo.cs
@@ -1,6 +1,3 @@
-[assembly: AssemblyVersion("2.0.0.0")]
-
-[assembly: CLSCompliant(true)]
+[assembly: CLSCompliant(true)]
[assembly: InternalsVisibleTo("Serilog.Tests")]
-[assembly: InternalsVisibleTo("Serilog.PerformanceTests")]
diff --git a/src/Serilog/Serilog.csproj b/src/Serilog/Serilog.csproj
index c7d94f946..014e07536 100644
--- a/src/Serilog/Serilog.csproj
+++ b/src/Serilog/Serilog.csproj
@@ -3,13 +3,16 @@
Simple .NET logging with fully-structured events
Serilog Contributors;Twinki14
true
- serilog;logging;semantic;structured
+ serilog;logging;semantic;structured;fivem;cfx-extensions
icon.png
+ CitizenFX.Extensions.Client.Serilog
https://github.com/Twinki14/CitizenFX.Extensions.Client.Serilog/
Apache-2.0
false
net452
+ CitizenFX.Extensions.Client.Serilog
+ Serilog
@@ -26,11 +29,11 @@
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs
index 344c8757b..c0b014d26 100644
--- a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs
+++ b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs
@@ -346,7 +346,7 @@ public void SinksWithAbstractParamsAreConfiguredWithTypeName()
Assert.IsType(DummyConsoleSink.Theme);
}
- [Fact]
+ [Fact(Skip = "Skipped due to project condesing")]
public void SinksAreConfiguredWithStaticMember()
{
var settings = new Dictionary
diff --git a/test/Serilog.Tests/Settings/SettingValueConversionsTests.cs b/test/Serilog.Tests/Settings/SettingValueConversionsTests.cs
index 36d44f175..53edcecd4 100644
--- a/test/Serilog.Tests/Settings/SettingValueConversionsTests.cs
+++ b/test/Serilog.Tests/Settings/SettingValueConversionsTests.cs
@@ -168,7 +168,7 @@ public void StaticMembersAccessorsCanBeUsedForReferenceTypes(string input, Type
Assert.Equal(ConcreteImpl.Instance, actual);
}
- [Theory]
+ [Theory(Skip = "Skipped due to project condensing")]
// unknown type
[InlineData("Namespace.ThisIsNotAKnownType::InterfaceProperty, Serilog.Tests", typeof(IAmAnInterface))]
// good type name, but wrong namespace