Add .NET 6 to other target frameworks, add conditions based on TFM for Nuget packages. #57
There are no files selected for viewing
This file contains hidden or 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 @@ | ||
| version: '{build}' | ||
| skip_tags: true | ||
| image: Visual Studio 2022 | ||
| test: off | ||
| build_script: | ||
| - ps: ./Build.ps1 | ||
|
|
||
This file contains hidden or 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,7 +1,7 @@ | ||
| { | ||
| "sdk": { | ||
| "allowPrerelease": false, | ||
| "version": "6.0.100", | ||
| "rollForward": "latestFeature" | ||
| } | ||
| } |
This file contains hidden or 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,17 +1,16 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Worker"> | ||
| <PropertyGroup> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\Serilog.Extensions.Hosting\Serilog.Extensions.Hosting.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" /> | ||
| <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" /> | ||
| <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
This file contains hidden or 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,17 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\Serilog.Extensions.Hosting\Serilog.Extensions.Hosting.csproj" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> | ||
| <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" /> | ||
| <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains hidden or 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,42 +1,57 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
ArminShoeibi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <Description>Serilog support for .NET Core logging in hosted services</Description> | ||
| <VersionPrefix>4.2.1</VersionPrefix> | ||
| <Authors>Microsoft;Serilog Contributors</Authors> | ||
| <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks> | ||
| <LangVersion>8</LangVersion> | ||
| <TreatWarningsAsErrors>true</TreatWarningsAsErrors> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <AssemblyName>Serilog.Extensions.Hosting</AssemblyName> | ||
| <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile> | ||
| <SignAssembly>true</SignAssembly> | ||
| <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign> | ||
| <PackageId>Serilog.Extensions.Hosting</PackageId> | ||
| <PackageTags>serilog;aspnet;aspnetcore;hosting</PackageTags> | ||
| <PackageIcon>icon.png</PackageIcon> | ||
| <PackageProjectUrl>https://github.com/serilog/serilog-extensions-hosting</PackageProjectUrl> | ||
| <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression> | ||
| <RepositoryUrl>https://github.com/serilog/serilog-extensions-hosting</RepositoryUrl> | ||
| <RepositoryType>git</RepositoryType> | ||
| <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute> | ||
| <RootNamespace>Serilog</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> | ||
| <DefineConstants>$(DefineConstants);NO_RELOADABLE_LOGGER</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' "> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' "> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' "> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.22" /> | ||
| <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.22" /> | ||
| <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.22" /> | ||
| </ItemGroup> | ||
|
There was a problem hiding this comment. Just a note for the next pass through - we've done this in other packages previously and IIRC it made life difficult in some situations. I'll need to go back over our old threads/tickets/PRs and review how it was that we landed on the current approach. |
||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Serilog" Version="2.10.0" /> | ||
| <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" /> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" /> | ||
| </ItemGroup> | ||
| </Project> | ||
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.