Skip to content

Commit

Permalink
feat: Migrate project to csproj
Browse files Browse the repository at this point in the history
- feat: downgrade from netstandard1.5 to netstandard1.3 and convert project to csproj
- chore: clean up build warnings in the csproj files
- chore: Update appveyor.yml image Visual Studio 2017 and remove install steps to install dotnet cli
- chore: update package information
- chore: remove assembly info generation from csproj
- docs(changelog): update
- chore: update csproj to not reference entire netstandard and reference System.Net.Sockets for netstandard1.3
- chore: treat warnings as errors

closes #7
  • Loading branch information
scottamartin authored and FantasticFiasco committed Apr 14, 2017
1 parent a4cdeac commit ff296b1
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 149 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ This project adheres to [Semantic Versioning](http://semver.org/) and is followi

## Unreleased

### Added

- [#7](https://github.com/FantasticFiasco/serilog-sinks-udp/issues/7) - Support for .NET Standard 1.3 (contribution by [scottamartin](https://github.com/scottamartin))

## 2.2.0 2017-03-16

### Added
Expand Down
11 changes: 1 addition & 10 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,7 @@ skip_tags: true
#---------------------------------#

# build worker image (VM template)
image: Visual Studio 2015

# scripts that run after cloning repository
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: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"
- ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.0-preview2-003121'
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
- ps: $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = "true"
image: Visual Studio 2017

#---------------------------------#
# build configuration #
Expand Down
6 changes: 0 additions & 6 deletions global.json

This file was deleted.

10 changes: 5 additions & 5 deletions serilog-sinks-udp.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "documentation", "documentation", "{21948E8D-F145-4F2C-86FF-95521C2F7D5C}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -20,11 +20,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{724B250D
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{DB19D3CD-BF05-45EA-97D8-FC9F64BF0B7B}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Udp", "src\Serilog.Sinks.Udp\Serilog.Sinks.Udp.xproj", "{33E1DD8E-E72D-43A9-AB5B-31356F6E794D}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Udp", "src\Serilog.Sinks.Udp\Serilog.Sinks.Udp.csproj", "{33E1DD8E-E72D-43A9-AB5B-31356F6E794D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4921D7A1-CCB2-4DAA-A5BA-1EF24F2D0ADA}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Serilog.Sinks.Udp.Tests", "test\Serilog.Sinks.Udp.Tests\Serilog.Sinks.Udp.Tests.xproj", "{432880A0-3304-48F9-93E9-E00B3369686A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Sinks.Udp.Tests", "test\Serilog.Sinks.Udp.Tests\Serilog.Sinks.Udp.Tests.csproj", "{432880A0-3304-48F9-93E9-E00B3369686A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
6 changes: 0 additions & 6 deletions src/Serilog.Sinks.Udp/Properties/AssemblyInfo.cs

This file was deleted.

43 changes: 43 additions & 0 deletions src/Serilog.Sinks.Udp/Serilog.Sinks.Udp.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>2.3.0-beta2</Version>
<AssemblyName>Serilog.Sinks.Udp</AssemblyName>
<Description>Serilog event sink that sends UDP packages over the network.</Description>
<TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
<Authors>Mattias Kindborg</Authors>
<Company />
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
<TreatSpecificWarningsAsErrors />
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<AssemblyOriginatorKeyFile>../../Serilog.snk</AssemblyOriginatorKeyFile>
<PackageId>Serilog.Sinks.Udp</PackageId>
<PackageTags>serilog;udp</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>
<!-- Don't reference the full NETStandard.Library -->
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog" Version="2.4.0" />
<PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.0.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
<DefineConstants>$(DefineConstants);NET4</DefineConstants>
</PropertyGroup>

</Project>
19 changes: 0 additions & 19 deletions src/Serilog.Sinks.Udp/Serilog.Sinks.Udp.xproj

This file was deleted.

37 changes: 0 additions & 37 deletions src/Serilog.Sinks.Udp/project.json

This file was deleted.

18 changes: 0 additions & 18 deletions test/Serilog.Sinks.Udp.Tests/Properties/AssemblyInfo.cs

This file was deleted.

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

<PropertyGroup>
<TargetFrameworks>netcoreapp1.1</TargetFrameworks>
<AssemblyName>Serilog.Sinks.Udp.Tests</AssemblyName>
<PackageId>Serilog.Sinks.Udp.Tests</PackageId>
<Authors>Mattias Kindborg</Authors>
<Description>Tests for Serilog.Sinks.Udp.</Description>
</PropertyGroup>

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

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="Moq" Version="4.7.8" />
</ItemGroup>

</Project>
21 changes: 0 additions & 21 deletions test/Serilog.Sinks.Udp.Tests/Serilog.Sinks.Udp.Tests.xproj

This file was deleted.

27 changes: 0 additions & 27 deletions test/Serilog.Sinks.Udp.Tests/project.json

This file was deleted.

0 comments on commit ff296b1

Please sign in to comment.