Skip to content

Commit

Permalink
Re-support .NET 5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thohng committed Jan 12, 2024
1 parent 1f4258a commit 01d0325
Show file tree
Hide file tree
Showing 18 changed files with 294 additions and 175 deletions.
File renamed without changes.
4 changes: 3 additions & 1 deletion Directory.Build.targets
Expand Up @@ -2,7 +2,7 @@

<Import Project="$(MSBuildThisFileDirectory)Common.props" Condition="'$(ImportedCommonProps)' == ''" />

<Import Project="$(MSBuildThisFileDirectory)Directory.Build.pre.targets" Condition="Exists('$(MSBuildThisFileDirectory)Directory.Build.pre.targets')" />
<Import Project="$(MSBuildThisFileDirectory)Directory.Build.initial.targets" Condition="Exists('$(MSBuildThisFileDirectory)Directory.Build.initial.targets')" />

<PropertyGroup Condition="'$(LatestDevFrameworkVersion)' == ''">
<LatestDevFrameworkVersion>9.*-*</LatestDevFrameworkVersion>
Expand Down Expand Up @@ -34,6 +34,8 @@
<PropertyGroup>
<SystemTextJsonVersion Condition="'$(SystemTextJsonVersion)' == '' And '$(NET_5_0_LESS)' == true">8.*</SystemTextJsonVersion>
<SystemTextJsonVersion Condition="'$(SystemTextJsonVersion)' == ''">$(FrameworkVersion)</SystemTextJsonVersion>
<SwashbuckleVersion Condition="'$(SwashbuckleVersion)' == '' And '$(NET_5_0_LESS)' == true">6.3.1</SwashbuckleVersion>
<SwashbuckleVersion Condition="'$(SwashbuckleVersion)' == '' And '$(NET_6_0)' == true">6.4.*</SwashbuckleVersion>
<SwashbuckleVersion Condition="'$(SwashbuckleVersion)' == ''">6.*</SwashbuckleVersion>
</PropertyGroup>

Expand Down
24 changes: 8 additions & 16 deletions NetLah.Serilog.sln
Expand Up @@ -8,18 +8,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{2D57
samples\Directory.Build.props = samples\Directory.Build.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples7", "samples7", "{29D9BC81-0F7D-4046-856D-30172EA3CD67}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{43ECBF11-5D83-49DE-BE0A-1A8B4E254A3B}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.azure\pipelines\azure-pipelines.yml = .azure\pipelines\azure-pipelines.yml
Common.props = Common.props
DevNotes.md = DevNotes.md
Directory.Build.initial.targets = Directory.Build.initial.targets
Directory.Build.override.targets = Directory.Build.override.targets
Directory.Build.pre.targets = Directory.Build.pre.targets
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
README.md = README.md
EndProjectSection
EndProject
Expand Down Expand Up @@ -52,9 +51,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWorkerService", "samp
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetLah.Extensions.Logging.Reference.Test", "test\NetLah.Extensions.Logging.Reference.Test\NetLah.Extensions.Logging.Reference.Test.csproj", "{759D3749-BAB0-4B21-AEAF-B5522C54B02A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleConsoleApp7", "sample7\SampleConsoleApp7\SampleConsoleApp7.csproj", "{AAC70FC1-FD5B-401C-885E-F90CFC63D008}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleConsoleAppDI7", "sample7\SampleConsoleAppDI7\SampleConsoleAppDI7.csproj", "{84839BA7-DE35-4660-9555-D73F5AB07C7D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApi5", "samples\SampleWebApi5\SampleWebApi5.csproj", "{667FF67C-C861-43EE-B1E4-A24A083C4E8A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -98,14 +95,10 @@ Global
{759D3749-BAB0-4B21-AEAF-B5522C54B02A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{759D3749-BAB0-4B21-AEAF-B5522C54B02A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{759D3749-BAB0-4B21-AEAF-B5522C54B02A}.Release|Any CPU.Build.0 = Release|Any CPU
{AAC70FC1-FD5B-401C-885E-F90CFC63D008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AAC70FC1-FD5B-401C-885E-F90CFC63D008}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AAC70FC1-FD5B-401C-885E-F90CFC63D008}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AAC70FC1-FD5B-401C-885E-F90CFC63D008}.Release|Any CPU.Build.0 = Release|Any CPU
{84839BA7-DE35-4660-9555-D73F5AB07C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{84839BA7-DE35-4660-9555-D73F5AB07C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{84839BA7-DE35-4660-9555-D73F5AB07C7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{84839BA7-DE35-4660-9555-D73F5AB07C7D}.Release|Any CPU.Build.0 = Release|Any CPU
{667FF67C-C861-43EE-B1E4-A24A083C4E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{667FF67C-C861-43EE-B1E4-A24A083C4E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{667FF67C-C861-43EE-B1E4-A24A083C4E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{667FF67C-C861-43EE-B1E4-A24A083C4E8A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -120,8 +113,7 @@ Global
{068A9B74-0D51-4C99-B929-E64243BF5F52} = {2D574F61-A8A3-409A-9041-171544CAA477}
{1F7A9ED1-EC3A-4404-A426-50A4B2865750} = {2D574F61-A8A3-409A-9041-171544CAA477}
{759D3749-BAB0-4B21-AEAF-B5522C54B02A} = {7ECD3F17-05A7-4A7C-9A95-C8C75D73EA49}
{AAC70FC1-FD5B-401C-885E-F90CFC63D008} = {29D9BC81-0F7D-4046-856D-30172EA3CD67}
{84839BA7-DE35-4660-9555-D73F5AB07C7D} = {29D9BC81-0F7D-4046-856D-30172EA3CD67}
{667FF67C-C861-43EE-B1E4-A24A083C4E8A} = {2D574F61-A8A3-409A-9041-171544CAA477}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {756FF949-EAAC-4047-89DB-EB559A767C6C}
Expand Down
10 changes: 0 additions & 10 deletions sample7/Directory.Build.props

This file was deleted.

11 changes: 0 additions & 11 deletions sample7/SampleConsoleApp7/Properties/launchSettings.json

This file was deleted.

61 changes: 0 additions & 61 deletions sample7/SampleConsoleApp7/SampleConsoleApp7.csproj

This file was deleted.

11 changes: 0 additions & 11 deletions sample7/SampleConsoleAppDI7/Properties/launchSettings.json

This file was deleted.

63 changes: 0 additions & 63 deletions sample7/SampleConsoleAppDI7/SampleConsoleAppDI7.csproj

This file was deleted.

37 changes: 37 additions & 0 deletions samples/SampleWebApi5/Controllers/WeatherForecastController.cs
@@ -0,0 +1,37 @@
using Microsoft.AspNetCore.Mvc;

namespace SampleWebApi.Controllers;

[ApiController]
[Route("[controller]")]
public class WeatherForecastController : ControllerBase
{
private static readonly string[] Summaries = new[]
{
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
};

private readonly ILogger<WeatherForecastController> _logger;

public WeatherForecastController(ILogger<WeatherForecastController> logger)
{
_logger = logger;
}

[HttpGet]
public IEnumerable<WeatherForecast> Get()
{
var rng = new Random();
var result = Enumerable.Range(1, 5).Select(index => new WeatherForecast
{
Date = DateTime.Now.AddDays(index),
TemperatureC = rng.Next(-20, 55),
Summary = Summaries[rng.Next(Summaries.Length)]
})
.ToArray();

_logger.LogInformation("Returns {name}", result.Select(w => w.Summary));

return result;
}
}
42 changes: 42 additions & 0 deletions samples/SampleWebApi5/Program.cs
@@ -0,0 +1,42 @@
using NetLah.Diagnostics;
using NetLah.Extensions.Logging;

namespace SampleWebApi;

internal class Program
{
public static void Main(string[] args)
{
ApplicationInfo.Initialize(null);
AppLog.InitLogger();
try
{
AppLog.Logger.LogInformation("Application configure..."); // write log console only

CreateHostBuilder(args).Build().Run();
}
catch (Exception ex)
{
AppLog.Logger.LogCritical(ex, "Host terminated unexpectedly");
}
finally
{
Serilog.Log.CloseAndFlush();
}
}

public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.UseSerilog2(logger =>
{
if (ApplicationInfo.Instance is { } appInfo)
{
logger.LogInformation("Application initializing... AppTitle:{appTitle}; Version:{appVersion} BuildTime:{appBuildTime}; Framework:{frameworkName}",
appInfo.Title, appInfo.InformationalVersion, appInfo.BuildTimestampLocal, appInfo.FrameworkName);
}
}) // write log to sinks
.ConfigureWebHostDefaults(webBuilder =>
{
webBuilder.UseStartup<Startup>();
});
}
31 changes: 31 additions & 0 deletions samples/SampleWebApi5/Properties/launchSettings.json
@@ -0,0 +1,31 @@
{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
"anonymousAuthentication": true,
"iisExpress": {
"applicationUrl": "http://localhost:38544",
"sslPort": 44357
}
},
"profiles": {
"SampleWebApi5": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": false,
"launchUrl": "swagger",
"applicationUrl": "https://localhost:5001;http://localhost:5000",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"IIS Express": {
"commandName": "IISExpress",
"launchBrowser": true,
"launchUrl": "swagger",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
}
}
}
39 changes: 39 additions & 0 deletions samples/SampleWebApi5/SampleWebApi5.csproj
@@ -0,0 +1,39 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
<IsPackable>false</IsPackable>
<UserSecretsId>netlah-serilog-31ba4057fe93</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Logs\**" />
<Content Remove="Logs\**" />
<EmbeddedResource Remove="Logs\**" />
<None Remove="Logs\**" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" />
<PackageReference Include="NetLah.Abstractions" />
<PackageReference Include="Serilog" />
<PackageReference Include="Serilog.AspNetCore" />
<PackageReference Include="Serilog.Enrichers.Thread" />
<PackageReference Include="Serilog.Extensions.Hosting" />
<PackageReference Include="Serilog.Extensions.Logging" />
<PackageReference Include="Serilog.Settings.Configuration" />
<PackageReference Include="Serilog.Sinks.Console" />
<PackageReference Include="Serilog.Sinks.Debug" />
<PackageReference Include="Serilog.Sinks.File" />
<PackageReference Include="Serilog.Sinks.Seq" />
<PackageReference Include="Swashbuckle.AspNetCore" />
<PackageReference Condition="'$(NET_5_0_LESS)' == true" Include="System.Net.Http.Json" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\NetLah.Extensions.Logging.Serilog.AspNetCore\NetLah.Extensions.Logging.Serilog.AspNetCore.csproj" />
</ItemGroup>

</Project>

0 comments on commit 01d0325

Please sign in to comment.