-
Notifications
You must be signed in to change notification settings - Fork 67
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #40 from serilog/dev
Release 2.3
- Loading branch information
Showing
13 changed files
with
166 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| { | ||
| "projects": [ "src", "test" ], | ||
| "sdk": { | ||
| "version": "1.0.0-preview2-003121" | ||
| "version": "1.0.1" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <Description>The file sink for Serilog</Description> | ||
| <VersionPrefix>2.3.0</VersionPrefix> | ||
| <Authors>Serilog Contributors</Authors> | ||
| <TargetFrameworks>net45;netstandard1.3</TargetFrameworks> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <AssemblyName>Serilog.Sinks.Email</AssemblyName> | ||
| <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile> | ||
| <SignAssembly>true</SignAssembly> | ||
| <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign> | ||
| <PackageId>Serilog.Sinks.Email</PackageId> | ||
| <PackageTags>serilog;file;io</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> | ||
| <!-- Don't reference the full NETStandard.Library --> | ||
| <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Serilog" Version="2.0.0" /> | ||
| <PackageReference Include="Serilog.Sinks.PeriodicBatching" Version="2.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'net45' "> | ||
| <Reference Include="System.Net" /> | ||
| <Reference Include="System" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(TargetFramework)' == 'net45' "> | ||
| <DefineConstants>$(DefineConstants);SYSTEM_NET</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' "> | ||
| <DefineConstants>$(DefineConstants);MAIL_KIT</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' "> | ||
| <PackageReference Include="MailKit" Version="1.4.2" /> | ||
| <PackageReference Include="System.Linq" Version="4.1.0" /> | ||
| <PackageReference Include="System.Threading" Version="4.0.11" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
50 changes: 50 additions & 0 deletions
50
test/Serilog.Sinks.Email.Tests/Serilog.Sinks.Email.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <VersionPrefix>2.0.0</VersionPrefix> | ||
| <TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks> | ||
| <AssemblyName>Serilog.Sinks.Email.Tests</AssemblyName> | ||
| <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile> | ||
| <SignAssembly>true</SignAssembly> | ||
| <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign> | ||
| <PackageId>Serilog.Sinks.Email.Tests</PackageId> | ||
| <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> | ||
| <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback> | ||
| <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.3</RuntimeFrameworkVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\Serilog.Sinks.Email\Serilog.Sinks.Email.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="Serilog" Version="2.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'net452' "> | ||
| <Reference Include="System.Configuration" /> | ||
| <Reference Include="System" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(TargetFramework)' == 'net452' "> | ||
| <DefineConstants>$(DefineConstants);SYSTEM_NET</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> | ||
| <DefineConstants>$(DefineConstants);MAIL_KIT</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> | ||
| <PackageReference Include="System.Linq" Version="4.1.0" /> | ||
| <PackageReference Include="System.Threading" Version="4.0.11" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
21 changes: 0 additions & 21 deletions
21
test/Serilog.Sinks.Email.Tests/Serilog.Sinks.Email.Tests.xproj
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.