Skip to content

Commit 01d0325

Browse files
thohngthohng
committed
Re-support .NET 5.0
1 parent 1f4258a commit 01d0325

18 files changed

+294
-175
lines changed

Directory.Build.pre.targets renamed to Directory.Build.initial.targets

File renamed without changes.

‎Directory.Build.targets‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

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

77
<PropertyGroup Condition="'$(LatestDevFrameworkVersion)' == ''">
88
<LatestDevFrameworkVersion>9.*-*</LatestDevFrameworkVersion>
@@ -34,6 +34,8 @@
3434
<PropertyGroup>
3535
<SystemTextJsonVersion Condition="'$(SystemTextJsonVersion)' == '' And '$(NET_5_0_LESS)' == true">8.*</SystemTextJsonVersion>
3636
<SystemTextJsonVersion Condition="'$(SystemTextJsonVersion)' == ''">$(FrameworkVersion)</SystemTextJsonVersion>
37+
<SwashbuckleVersion Condition="'$(SwashbuckleVersion)' == '' And '$(NET_5_0_LESS)' == true">6.3.1</SwashbuckleVersion>
38+
<SwashbuckleVersion Condition="'$(SwashbuckleVersion)' == '' And '$(NET_6_0)' == true">6.4.*</SwashbuckleVersion>
3739
<SwashbuckleVersion Condition="'$(SwashbuckleVersion)' == ''">6.*</SwashbuckleVersion>
3840
</PropertyGroup>
3941

‎NetLah.Serilog.sln‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{2D57
88
samples\Directory.Build.props = samples\Directory.Build.props
99
EndProjectSection
1010
EndProject
11-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples7", "samples7", "{29D9BC81-0F7D-4046-856D-30172EA3CD67}"
12-
EndProject
1311
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{43ECBF11-5D83-49DE-BE0A-1A8B4E254A3B}"
1412
ProjectSection(SolutionItems) = preProject
1513
.editorconfig = .editorconfig
1614
.azure\pipelines\azure-pipelines.yml = .azure\pipelines\azure-pipelines.yml
1715
Common.props = Common.props
1816
DevNotes.md = DevNotes.md
17+
Directory.Build.initial.targets = Directory.Build.initial.targets
1918
Directory.Build.override.targets = Directory.Build.override.targets
20-
Directory.Build.pre.targets = Directory.Build.pre.targets
2119
Directory.Build.props = Directory.Build.props
2220
Directory.Build.targets = Directory.Build.targets
21+
.github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml
2322
README.md = README.md
2423
EndProjectSection
2524
EndProject
@@ -52,9 +51,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWorkerService", "samp
5251
EndProject
5352
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}"
5453
EndProject
55-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleConsoleApp7", "sample7\SampleConsoleApp7\SampleConsoleApp7.csproj", "{AAC70FC1-FD5B-401C-885E-F90CFC63D008}"
56-
EndProject
57-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleConsoleAppDI7", "sample7\SampleConsoleAppDI7\SampleConsoleAppDI7.csproj", "{84839BA7-DE35-4660-9555-D73F5AB07C7D}"
54+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleWebApi5", "samples\SampleWebApi5\SampleWebApi5.csproj", "{667FF67C-C861-43EE-B1E4-A24A083C4E8A}"
5855
EndProject
5956
Global
6057
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -98,14 +95,10 @@ Global
9895
{759D3749-BAB0-4B21-AEAF-B5522C54B02A}.Debug|Any CPU.Build.0 = Debug|Any CPU
9996
{759D3749-BAB0-4B21-AEAF-B5522C54B02A}.Release|Any CPU.ActiveCfg = Release|Any CPU
10097
{759D3749-BAB0-4B21-AEAF-B5522C54B02A}.Release|Any CPU.Build.0 = Release|Any CPU
101-
{AAC70FC1-FD5B-401C-885E-F90CFC63D008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102-
{AAC70FC1-FD5B-401C-885E-F90CFC63D008}.Debug|Any CPU.Build.0 = Debug|Any CPU
103-
{AAC70FC1-FD5B-401C-885E-F90CFC63D008}.Release|Any CPU.ActiveCfg = Release|Any CPU
104-
{AAC70FC1-FD5B-401C-885E-F90CFC63D008}.Release|Any CPU.Build.0 = Release|Any CPU
105-
{84839BA7-DE35-4660-9555-D73F5AB07C7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
106-
{84839BA7-DE35-4660-9555-D73F5AB07C7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
107-
{84839BA7-DE35-4660-9555-D73F5AB07C7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
108-
{84839BA7-DE35-4660-9555-D73F5AB07C7D}.Release|Any CPU.Build.0 = Release|Any CPU
98+
{667FF67C-C861-43EE-B1E4-A24A083C4E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
99+
{667FF67C-C861-43EE-B1E4-A24A083C4E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
100+
{667FF67C-C861-43EE-B1E4-A24A083C4E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
101+
{667FF67C-C861-43EE-B1E4-A24A083C4E8A}.Release|Any CPU.Build.0 = Release|Any CPU
109102
EndGlobalSection
110103
GlobalSection(SolutionProperties) = preSolution
111104
HideSolutionNode = FALSE
@@ -120,8 +113,7 @@ Global
120113
{068A9B74-0D51-4C99-B929-E64243BF5F52} = {2D574F61-A8A3-409A-9041-171544CAA477}
121114
{1F7A9ED1-EC3A-4404-A426-50A4B2865750} = {2D574F61-A8A3-409A-9041-171544CAA477}
122115
{759D3749-BAB0-4B21-AEAF-B5522C54B02A} = {7ECD3F17-05A7-4A7C-9A95-C8C75D73EA49}
123-
{AAC70FC1-FD5B-401C-885E-F90CFC63D008} = {29D9BC81-0F7D-4046-856D-30172EA3CD67}
124-
{84839BA7-DE35-4660-9555-D73F5AB07C7D} = {29D9BC81-0F7D-4046-856D-30172EA3CD67}
116+
{667FF67C-C861-43EE-B1E4-A24A083C4E8A} = {2D574F61-A8A3-409A-9041-171544CAA477}
125117
EndGlobalSection
126118
GlobalSection(ExtensibilityGlobals) = postSolution
127119
SolutionGuid = {756FF949-EAAC-4047-89DB-EB559A767C6C}

‎sample7/Directory.Build.props‎

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

‎sample7/SampleConsoleApp7/Properties/launchSettings.json‎

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

‎sample7/SampleConsoleApp7/SampleConsoleApp7.csproj‎

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

‎sample7/SampleConsoleAppDI7/Properties/launchSettings.json‎

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

‎sample7/SampleConsoleAppDI7/SampleConsoleAppDI7.csproj‎

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

‎samples/SampleWebApi5/Controllers/WeatherForecastController.cs‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using Microsoft.AspNetCore.Mvc;
2+
3+
namespace SampleWebApi.Controllers;
4+
5+
[ApiController]
6+
[Route("[controller]")]
7+
public class WeatherForecastController : ControllerBase
8+
{
9+
private static readonly string[] Summaries = new[]
10+
{
11+
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
12+
};
13+
14+
private readonly ILogger<WeatherForecastController> _logger;
15+
16+
public WeatherForecastController(ILogger<WeatherForecastController> logger)
17+
{
18+
_logger = logger;
19+
}
20+
21+
[HttpGet]
22+
public IEnumerable<WeatherForecast> Get()
23+
{
24+
var rng = new Random();
25+
var result = Enumerable.Range(1, 5).Select(index => new WeatherForecast
26+
{
27+
Date = DateTime.Now.AddDays(index),
28+
TemperatureC = rng.Next(-20, 55),
29+
Summary = Summaries[rng.Next(Summaries.Length)]
30+
})
31+
.ToArray();
32+
33+
_logger.LogInformation("Returns {name}", result.Select(w => w.Summary));
34+
35+
return result;
36+
}
37+
}

‎samples/SampleWebApi5/Program.cs‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
using NetLah.Diagnostics;
2+
using NetLah.Extensions.Logging;
3+
4+
namespace SampleWebApi;
5+
6+
internal class Program
7+
{
8+
public static void Main(string[] args)
9+
{
10+
ApplicationInfo.Initialize(null);
11+
AppLog.InitLogger();
12+
try
13+
{
14+
AppLog.Logger.LogInformation("Application configure..."); // write log console only
15+
16+
CreateHostBuilder(args).Build().Run();
17+
}
18+
catch (Exception ex)
19+
{
20+
AppLog.Logger.LogCritical(ex, "Host terminated unexpectedly");
21+
}
22+
finally
23+
{
24+
Serilog.Log.CloseAndFlush();
25+
}
26+
}
27+
28+
public static IHostBuilder CreateHostBuilder(string[] args) =>
29+
Host.CreateDefaultBuilder(args)
30+
.UseSerilog2(logger =>
31+
{
32+
if (ApplicationInfo.Instance is { } appInfo)
33+
{
34+
logger.LogInformation("Application initializing... AppTitle:{appTitle}; Version:{appVersion} BuildTime:{appBuildTime}; Framework:{frameworkName}",
35+
appInfo.Title, appInfo.InformationalVersion, appInfo.BuildTimestampLocal, appInfo.FrameworkName);
36+
}
37+
}) // write log to sinks
38+
.ConfigureWebHostDefaults(webBuilder =>
39+
{
40+
webBuilder.UseStartup<Startup>();
41+
});
42+
}

0 commit comments

Comments
 (0)