Skip to content

Commit fb22faa

Browse files
author
Troy Schmidt
committed
Updated project references, upgraded projects to newest csproj file format, and made it multi targeting to .Net Core as well as .Net full.
1 parent 0bcfb43 commit fb22faa

11 files changed

+98
-1852
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,3 +181,4 @@ UpgradeLog*.htm
181181

182182
# Microsoft Fakes
183183
FakesAssemblies/
184+
/.vs/serilog-sinks-mssqlserver/v15/sqlite3

global.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

serilog-sinks-mssqlserver.sln

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.26730.16
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{04226074-C72F-42BC-AB02-4D70A7BAE7E1}"
77
EndProject
8-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.MSSqlServer", "src\Serilog.Sinks.MSSqlServer\Serilog.Sinks.MSSqlServer.xproj", "{803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}"
9-
EndProject
108
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F02D6513-6F45-452E-85A0-41A872A2C1F8}"
119
EndProject
12-
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.MSSqlServer.Tests", "test\Serilog.Sinks.MSSqlServer.Tests\Serilog.Sinks.MSSqlServer.Tests.xproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}"
13-
EndProject
1410
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{70667ADA-A2FD-4821-A6A1-8D18D0D71507}"
1511
ProjectSection(SolutionItems) = preProject
1612
appveyor.yml = appveyor.yml
1713
Build.ps1 = Build.ps1
1814
CHANGES.md = CHANGES.md
19-
global.json = global.json
2015
README.md = README.md
2116
EndProjectSection
2217
EndProject
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.MSSqlServer", "src\Serilog.Sinks.MSSqlServer\Serilog.Sinks.MSSqlServer.csproj", "{803CD13A-D54B-4CEC-A55F-E22AE3D93B3C}"
19+
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.Sinks.MSSqlServer.Tests", "test\Serilog.Sinks.MSSqlServer.Tests\Serilog.Sinks.MSSqlServer.Tests.csproj", "{3C2D8E01-5580-426A-BDD9-EC59CD98E618}"
21+
EndProject
2322
Global
2423
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2524
Debug|Any CPU = Debug|Any CPU
@@ -42,4 +41,7 @@ Global
4241
{803CD13A-D54B-4CEC-A55F-E22AE3D93B3C} = {04226074-C72F-42BC-AB02-4D70A7BAE7E1}
4342
{3C2D8E01-5580-426A-BDD9-EC59CD98E618} = {F02D6513-6F45-452E-85A0-41A872A2C1F8}
4443
EndGlobalSection
44+
GlobalSection(ExtensibilityGlobals) = postSolution
45+
SolutionGuid = {AAA6BF8D-7B53-4A5F-A79A-D1B306383B45}
46+
EndGlobalSection
4547
EndGlobal
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>A Serilog sink that writes events to Microsoft SQL Server</Description>
5+
<VersionPrefix>5.0.1</VersionPrefix>
6+
<Authors>Michiel van Oudheusden;Serilog Contributors</Authors>
7+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
8+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<AssemblyName>Serilog.Sinks.MSSqlServer</AssemblyName>
11+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
12+
<SignAssembly>true</SignAssembly>
13+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
14+
<PackageId>Serilog.Sinks.MSSqlServer</PackageId>
15+
<PackageTags>serilog;sinks;mssqlserver</PackageTags>
16+
<PackageIconUrl>http://serilog.net/images/serilog-sink-nuget.png</PackageIconUrl>
17+
<PackageProjectUrl>https://github.com/serilog/serilog-sinks-mssqlserver</PackageProjectUrl>
18+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
19+
<RuntimeIdentifiers>win</RuntimeIdentifiers>
20+
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
21+
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
22+
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
23+
</PropertyGroup>
24+
25+
<ItemGroup>
26+
<PackageReference Include="Serilog" Version="2.5.0" />
27+
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.1.1" />
28+
</ItemGroup>
29+
30+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
31+
<DefineConstants>NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
32+
</PropertyGroup>
33+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
34+
<PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
35+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
36+
</ItemGroup>
37+
38+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
39+
<Reference Include="System.Data" />
40+
<Reference Include="System.Xml" />
41+
<Reference Include="System.Xml.Linq" />
42+
<Reference Include="System.Configuration" />
43+
<Reference Include="System" />
44+
<Reference Include="Microsoft.CSharp" />
45+
</ItemGroup>
46+
47+
</Project>

src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.xproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/Serilog.Sinks.MSSqlServer/project.json

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/Serilog.Sinks.MSSqlServer/project.lock.json

Lines changed: 0 additions & 98 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
5+
<AssemblyName>Serilog.Sinks.MSSqlServer.Tests</AssemblyName>
6+
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
7+
<SignAssembly>true</SignAssembly>
8+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
9+
<PackageId>Serilog.Sinks.MSSqlServer.Tests</PackageId>
10+
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
11+
<RuntimeIdentifiers>win</RuntimeIdentifiers>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="..\..\src\Serilog.Sinks.MSSqlServer\Serilog.Sinks.MSSqlServer.csproj" />
16+
</ItemGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="FluentAssertions" Version="4.19.4" />
20+
<PackageReference Include="Dapper.StrongName" Version="1.50.2" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
24+
<Reference Include="System" />
25+
<Reference Include="Microsoft.CSharp" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
27+
<PackageReference Include="xunit" Version="2.2.0" />
28+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
29+
</ItemGroup>
30+
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
32+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20171012-09" />
33+
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
34+
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
35+
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
36+
<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
37+
<PackageReference Include="xunit" Version="2.3.0" />
38+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" NoWarn="NU1701" />
39+
</ItemGroup>
40+
41+
</Project>

test/Serilog.Sinks.MSSqlServer.Tests/Serilog.Sinks.MSSqlServer.Tests.xproj

Lines changed: 0 additions & 21 deletions
This file was deleted.

test/Serilog.Sinks.MSSqlServer.Tests/project.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)