Skip to content
This repository was archived by the owner on Feb 27, 2022. It is now read-only.

support .net 4.0 #10

Open
seayxu wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

support .net 4.0 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67789c8
support .net 4.0
seayxu Jul 16, 2021
0a00bce
upgrade ci
seayxu Jul 16, 2021
a0acfd5
upgrade ci
seayxu Jul 16, 2021
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
6 changes: 3 additions & 3 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
version: '{build}'
skip_tags: true
image: Visual Studio 2015
image: Visual Studio 2019
configuration: Release
install:
- ps: mkdir -Force ".\build\" | Out-Null
- ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0-preview2/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
- ps: Invoke-WebRequest "https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
build_script:
- ps: ./Build.ps1
Expand Down
6 changes: 0 additions & 6 deletions global.json
View file
Open in desktop

This file was deleted.

30 changes: 15 additions & 15 deletions serilog-sinks-nlog.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,36 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26114.2
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.NLog", "src\Serilog.Sinks.NLog\Serilog.Sinks.NLog.xproj", "{BE40FF8E-7EEA-4094-90F0-CD67B061DCE4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{88A2B525-3326-4652-9BA4-A26227703B4C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DC682EBD-33E3-4ECF-922A-C022758E34E6}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.NLog.Tests", "test\Serilog.Sinks.NLog.Tests\Serilog.Sinks.NLog.Tests.xproj", "{2C54FEB0-E282-40E8-90F4-0CDB4E7CB680}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.NLog", "src\Serilog.Sinks.NLog\Serilog.Sinks.NLog.csproj", "{DCFCF977-0008-425D-8293-EC931AC25B64}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.NLog.Tests", "test\Serilog.Sinks.NLog.Tests\Serilog.Sinks.NLog.Tests.csproj", "{9C8F0F2F-4CCE-472B-AD67-4304A33A9545}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BE40FF8E-7EEA-4094-90F0-CD67B061DCE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE40FF8E-7EEA-4094-90F0-CD67B061DCE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE40FF8E-7EEA-4094-90F0-CD67B061DCE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE40FF8E-7EEA-4094-90F0-CD67B061DCE4}.Release|Any CPU.Build.0 = Release|Any CPU
{2C54FEB0-E282-40E8-90F4-0CDB4E7CB680}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2C54FEB0-E282-40E8-90F4-0CDB4E7CB680}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2C54FEB0-E282-40E8-90F4-0CDB4E7CB680}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2C54FEB0-E282-40E8-90F4-0CDB4E7CB680}.Release|Any CPU.Build.0 = Release|Any CPU
{DCFCF977-0008-425D-8293-EC931AC25B64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DCFCF977-0008-425D-8293-EC931AC25B64}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DCFCF977-0008-425D-8293-EC931AC25B64}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DCFCF977-0008-425D-8293-EC931AC25B64}.Release|Any CPU.Build.0 = Release|Any CPU
{9C8F0F2F-4CCE-472B-AD67-4304A33A9545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9C8F0F2F-4CCE-472B-AD67-4304A33A9545}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9C8F0F2F-4CCE-472B-AD67-4304A33A9545}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9C8F0F2F-4CCE-472B-AD67-4304A33A9545}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{BE40FF8E-7EEA-4094-90F0-CD67B061DCE4} = {88A2B525-3326-4652-9BA4-A26227703B4C}
{2C54FEB0-E282-40E8-90F4-0CDB4E7CB680} = {DC682EBD-33E3-4ECF-922A-C022758E34E6}
{DCFCF977-0008-425D-8293-EC931AC25B64} = {88A2B525-3326-4652-9BA4-A26227703B4C}
{9C8F0F2F-4CCE-472B-AD67-4304A33A9545} = {DC682EBD-33E3-4ECF-922A-C022758E34E6}
EndGlobalSection
EndGlobal
43 changes: 43 additions & 0 deletions src/Serilog.Sinks.NLog/Serilog.Sinks.NLog.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>Serilog event sink that writes to NLog. Merge your new Serilog event stream into your existing NLog infrastructure.</Description>
<VersionPrefix>3.0.2</VersionPrefix>
<Authors>Serilog Contributors</Authors>
<TargetFrameworks>net40;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
<AssemblyName>Serilog.Sinks.NLog</AssemblyName>
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<PackageId>Serilog.Sinks.NLog</PackageId>
<PackageTags>serilog;logging;NLog</PackageTags>
<PackageIconUrl>http://serilog.net/images/serilog-sink-nuget.png</PackageIconUrl>
<PackageProjectUrl>http://serilog.net</PackageProjectUrl>
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NLog" Version="4.7.10" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
<PackageReference Include="Serilog" Version="[1.4.1,1.5.14]" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<PackageReference Include="Serilog" Version="[2.0.0,)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="Serilog" Version="[2.0.0,)" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Serilog" Version="[2.8.0,)" />
</ItemGroup>

</Project>
19 changes: 0 additions & 19 deletions src/Serilog.Sinks.NLog/Serilog.Sinks.NLog.xproj
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/Serilog.Sinks.NLog/project.json
View file
Open in desktop

This file was deleted.

41 changes: 41 additions & 0 deletions test/Serilog.Sinks.NLog.Tests/Serilog.Sinks.NLog.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<!--<TargetFramework>net4.0</TargetFramework>-->
<TargetFrameworks>net40;net45;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<AssemblyName>Serilog.Sinks.NLog.Tests</AssemblyName>
<PackageId>Serilog.Sinks.NLog.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<!--<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>-->
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Serilog.Sinks.NLog\Serilog.Sinks.NLog.csproj" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
<PackageReference Include="xunit" Version="1.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<PackageReference Include="xunit" Version="2.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
</ItemGroup>

</Project>
21 changes: 0 additions & 21 deletions test/Serilog.Sinks.NLog.Tests/Serilog.Sinks.NLog.Tests.xproj
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions test/Serilog.Sinks.NLog.Tests/project.json
View file
Open in desktop

This file was deleted.