Skip to content

Commit 6e966ea

Browse files
authored
Merge pull request #47 from datalust/dev
3.1.0 Release
2 parents 2c24d86 + 2ee60cf commit 6e966ea

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ ipch/
5555
# ReSharper is a .NET coding add-in
5656
_ReSharper*
5757

58+
# Jetbrains IDE
59+
.idea/
60+
5861
# NCrunch
5962
*.ncrunch*
6063
.*crunch*.local.xml

Build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(Test-Path .\artifacts) {
1313

1414
$branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL];
1515
$revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL];
16-
$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "master" -and $revision -ne "local"]
16+
$suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "main" -and $revision -ne "local"]
1717

1818
echo "build: Version suffix is $suffix"
1919

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ deploy:
1515
api_key:
1616
secure: igteMqcOXyx8EXWT5RdPIv9sVQ4pReNISq1MjL+w7tImDfv7qXDanao/RT+FHOmL
1717
on:
18-
branch: /^(master|dev)$/
18+
branch: /^(main|dev)$/
1919
- provider: GitHub
2020
auth_token:
2121
secure: hX+cZmW+9BCXy7vyH8myWsYdtQHyzzil9K5yvjJv7dK9XmyrGYYDj/DPzMqsXSjo
2222
artifact: /Seq.Client.Log4Net.*\.nupkg/
2323
tag: v$(appveyor_build_version)
2424
on:
25-
branch: master
25+
branch: main

src/Seq.Client.Log4Net/Seq.Client.Log4Net.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net40;net462;netstandard2.0</TargetFrameworks>
4-
<VersionPrefix>3.0.0</VersionPrefix>
4+
<VersionPrefix>3.1.0</VersionPrefix>
55
<Authors>Datalust Pty Ltd and Contributors</Authors>
66
<Description>Apache log4net appender for .NET Framework and .NET Standard/Core that writes to the Seq log server over HTTP.</Description>
77
<PackageIconUrl>http://datalust.co/images/nuget/seq-client-log4net.png</PackageIconUrl>
88
<PackageTags>seq log4net structured logging events</PackageTags>
9-
<Copyright>http://apache.org/licenses/LICENSE-2.0.html</Copyright>
109
<RootNamespace>Seq</RootNamespace>
1110
<SignAssembly>true</SignAssembly>
1211
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
@@ -21,7 +20,7 @@
2120
</PropertyGroup>
2221

2322
<ItemGroup>
24-
<PackageReference Include="log4net" Version="2.0.10" />
23+
<PackageReference Include="log4net" Version="2.0.14" />
2524
</ItemGroup>
2625

2726
<ItemGroup Condition=" '$(TargetFramework)' != 'net40' ">

0 commit comments

Comments
 (0)