From 1970c9658aec2c71563799a1bbd2e35df7d53866 Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Thu, 1 Dec 2022 07:38:35 +1000 Subject: [PATCH 1/7] Dev version bump [skip ci] --- src/Serilog.AspNetCore/Serilog.AspNetCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj index d468a42..ca38a5c 100644 --- a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj +++ b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj @@ -2,7 +2,7 @@ Serilog support for ASP.NET Core logging - 6.1.0 + 6.1.1 Microsoft;Serilog Contributors netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0 true From 731d94fb06ef0ea5ee11ad48b4d5ae21719ca3c3 Mon Sep 17 00:00:00 2001 From: Julian Silden Langlo Date: Mon, 19 Dec 2022 16:39:44 +0100 Subject: [PATCH 2/7] Update Serilog.Settings.Configuration to latest version. --- src/Serilog.AspNetCore/Serilog.AspNetCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj index ca38a5c..748fcae 100644 --- a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj +++ b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj @@ -30,7 +30,7 @@ - + From 01f95fb463370e69a9dce95e9a59c4dfe3dd8480 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Sat, 4 Feb 2023 06:45:20 +1100 Subject: [PATCH 3/7] build on vs 2022 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index fcd8868..867832f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ version: '{build}' skip_tags: true -image: Visual Studio 2019 +image: Visual Studio 2022 install: - ps: ./Setup.ps1 build_script: From 045ea0bed3aea1b24837904fff6ec2dfcfea48a3 Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Wed, 3 May 2023 16:00:17 +1000 Subject: [PATCH 4/7] (Non-building) v7; waiting for Serilog.Extensions.Hosting and Serilog.Settings.Configuration v7-dev-*. --- global.json | 2 +- samples/Sample/Sample.csproj | 2 +- serilog-aspnetcore.sln | 14 +++ .../Properties/AssemblyInfo.cs | 2 +- .../Serilog.AspNetCore.csproj | 47 +++----- .../SerilogWebHostBuilderExtensions.cs | 8 +- .../Serilog.AspNetCore.Tests.csproj | 15 +-- .../Support/DisposeTrackingLogger.cs | 101 +++++++++--------- .../Support/Extensions.cs | 4 +- 9 files changed, 93 insertions(+), 102 deletions(-) diff --git a/global.json b/global.json index 99ee408..2c23bfe 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "allowPrerelease": false, - "version": "6.0.401", + "version": "7.0.100", "rollForward": "latestFeature" } } diff --git a/samples/Sample/Sample.csproj b/samples/Sample/Sample.csproj index f32c84b..99ca1cf 100644 --- a/samples/Sample/Sample.csproj +++ b/samples/Sample/Sample.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 diff --git a/serilog-aspnetcore.sln b/serilog-aspnetcore.sln index a9b5e42..9f3ca5f 100644 --- a/serilog-aspnetcore.sln +++ b/serilog-aspnetcore.sln @@ -26,6 +26,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.AspNetCore.Tests", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "samples\Sample\Sample.csproj", "{4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Logging", "..\serilog-extensions-logging\src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj", "{03EC6680-9D1F-4D51-A1F4-E6863781982B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Hosting", "..\serilog-extensions-hosting\src\Serilog.Extensions.Hosting\Serilog.Extensions.Hosting.csproj", "{49220185-3DA4-49C1-B08C-F5C38F53378B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -44,6 +48,14 @@ Global {4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU {4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU {4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}.Release|Any CPU.Build.0 = Release|Any CPU + {03EC6680-9D1F-4D51-A1F4-E6863781982B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {03EC6680-9D1F-4D51-A1F4-E6863781982B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {03EC6680-9D1F-4D51-A1F4-E6863781982B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {03EC6680-9D1F-4D51-A1F4-E6863781982B}.Release|Any CPU.Build.0 = Release|Any CPU + {49220185-3DA4-49C1-B08C-F5C38F53378B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {49220185-3DA4-49C1-B08C-F5C38F53378B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {49220185-3DA4-49C1-B08C-F5C38F53378B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {49220185-3DA4-49C1-B08C-F5C38F53378B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -52,6 +64,8 @@ Global {0549D23F-986B-4FB2-BACE-16FD7A7BC9EF} = {A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0} {AD51759B-CD58-473F-9620-0B0E56A123A1} = {E30F638E-BBBE-4AD1-93CE-48CC69CFEFE1} {4FA0FE41-973E-4555-AB4A-0F400DBA9DD3} = {F2407211-6043-439C-8E06-3641634332E7} + {03EC6680-9D1F-4D51-A1F4-E6863781982B} = {A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0} + {49220185-3DA4-49C1-B08C-F5C38F53378B} = {A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {811E61C5-3871-4633-AFAE-B35B619C8A10} diff --git a/src/Serilog.AspNetCore/Properties/AssemblyInfo.cs b/src/Serilog.AspNetCore/Properties/AssemblyInfo.cs index 9e85a56..b8042d5 100644 --- a/src/Serilog.AspNetCore/Properties/AssemblyInfo.cs +++ b/src/Serilog.AspNetCore/Properties/AssemblyInfo.cs @@ -1,7 +1,7 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyVersion("2.0.0.0")] +[assembly: AssemblyVersion("7.0.0.0")] [assembly: InternalsVisibleTo("Serilog.AspNetCore.Tests, PublicKey=" + "0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c" + diff --git a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj index 748fcae..231c822 100644 --- a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj +++ b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj @@ -2,9 +2,10 @@ Serilog support for ASP.NET Core logging - 6.1.1 + + 7.0.0 Microsoft;Serilog Contributors - netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0 + net462;netstandard2.0;netstandard2.1;net6.0;net7.0 true serilog;aspnet;aspnetcore icon.png @@ -20,44 +21,30 @@ - - $(DefineConstants);HOSTBUILDER - - - - + - - - - - - - - - - - - - + + + + + + - + + - - - - - - - + + + + - + diff --git a/src/Serilog.AspNetCore/SerilogWebHostBuilderExtensions.cs b/src/Serilog.AspNetCore/SerilogWebHostBuilderExtensions.cs index a144808..c998f4f 100644 --- a/src/Serilog.AspNetCore/SerilogWebHostBuilderExtensions.cs +++ b/src/Serilog.AspNetCore/SerilogWebHostBuilderExtensions.cs @@ -37,9 +37,7 @@ public static class SerilogWebHostBuilderExtensions /// WriteTo.Providers() configuration method, enabling other s to receive events. By /// default, only Serilog sinks will receive events. /// The web host builder. -#if HOSTBUILDER - [Obsolete("Prefer UseSerilog() on IHostBuilder")] -#endif + [Obsolete("Prefer UseSerilog() on IHostBuilder")] public static IWebHostBuilder UseSerilog( this IWebHostBuilder builder, ILogger? logger = null, @@ -85,9 +83,7 @@ public static IWebHostBuilder UseSerilog( /// the Microsoft.Extensions.Logging API. Normally, equivalent Serilog sinks are used in place of providers. Specify /// true to write events to all providers. /// The web host builder. -#if HOSTBUILDER - [Obsolete("Prefer UseSerilog() on IHostBuilder")] -#endif + [Obsolete("Prefer UseSerilog() on IHostBuilder")] public static IWebHostBuilder UseSerilog( this IWebHostBuilder builder, Action configureLogger, diff --git a/test/Serilog.AspNetCore.Tests/Serilog.AspNetCore.Tests.csproj b/test/Serilog.AspNetCore.Tests/Serilog.AspNetCore.Tests.csproj index 240288c..0f65b57 100644 --- a/test/Serilog.AspNetCore.Tests/Serilog.AspNetCore.Tests.csproj +++ b/test/Serilog.AspNetCore.Tests/Serilog.AspNetCore.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1;net6.0 + net7.0 true @@ -11,16 +11,9 @@ - - - - - - - - - - + + + diff --git a/test/Serilog.AspNetCore.Tests/Support/DisposeTrackingLogger.cs b/test/Serilog.AspNetCore.Tests/Support/DisposeTrackingLogger.cs index a441089..14278ef 100644 --- a/test/Serilog.AspNetCore.Tests/Support/DisposeTrackingLogger.cs +++ b/test/Serilog.AspNetCore.Tests/Support/DisposeTrackingLogger.cs @@ -1,11 +1,12 @@ -using Serilog.Core; +using System.Diagnostics.CodeAnalysis; +using Serilog.Core; using Serilog.Events; namespace Serilog.AspNetCore.Tests.Support; -public class DisposeTrackingLogger : ILogger, IDisposable +sealed class DisposeTrackingLogger : ILogger, IDisposable { - public bool IsDisposed { get; set; } + public bool IsDisposed { get; private set; } public ILogger ForContext(ILogEventEnricher enricher) { @@ -17,7 +18,7 @@ public ILogger ForContext(IEnumerable enrichers) return new LoggerConfiguration().CreateLogger(); } - public ILogger ForContext(string propertyName, object value, bool destructureObjects = false) + public ILogger ForContext(string propertyName, object? value, bool destructureObjects = false) { return new LoggerConfiguration().CreateLogger(); } @@ -53,29 +54,29 @@ public void Write(LogEventLevel level, string messageTemplate, T0 pr { } - public void Write(LogEventLevel level, string messageTemplate, params object[] propertyValues) + public void Write(LogEventLevel level, string messageTemplate, params object?[]? propertyValues) { } - public void Write(LogEventLevel level, Exception exception, string messageTemplate) + public void Write(LogEventLevel level, Exception? exception, string messageTemplate) { } - public void Write(LogEventLevel level, Exception exception, string messageTemplate, T propertyValue) + public void Write(LogEventLevel level, Exception? exception, string messageTemplate, T propertyValue) { } - public void Write(LogEventLevel level, Exception exception, string messageTemplate, T0 propertyValue0, + public void Write(LogEventLevel level, Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) { } - public void Write(LogEventLevel level, Exception exception, string messageTemplate, T0 propertyValue0, + public void Write(LogEventLevel level, Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2) { } - public void Write(LogEventLevel level, Exception exception, string messageTemplate, params object[] propertyValues) + public void Write(LogEventLevel level, Exception? exception, string messageTemplate, params object?[]? propertyValues) { } @@ -100,28 +101,28 @@ public void Verbose(string messageTemplate, T0 propertyValue0, T1 pr { } - public void Verbose(string messageTemplate, params object[] propertyValues) + public void Verbose(string messageTemplate, params object?[]? propertyValues) { } - public void Verbose(Exception exception, string messageTemplate) + public void Verbose(Exception? exception, string messageTemplate) { } - public void Verbose(Exception exception, string messageTemplate, T propertyValue) + public void Verbose(Exception? exception, string messageTemplate, T propertyValue) { } - public void Verbose(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) + public void Verbose(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) { } - public void Verbose(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, + public void Verbose(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2) { } - public void Verbose(Exception exception, string messageTemplate, params object[] propertyValues) + public void Verbose(Exception? exception, string messageTemplate, params object?[]? propertyValues) { } @@ -141,28 +142,28 @@ public void Debug(string messageTemplate, T0 propertyValue0, T1 prop { } - public void Debug(string messageTemplate, params object[] propertyValues) + public void Debug(string messageTemplate, params object?[]? propertyValues) { } - public void Debug(Exception exception, string messageTemplate) + public void Debug(Exception? exception, string messageTemplate) { } - public void Debug(Exception exception, string messageTemplate, T propertyValue) + public void Debug(Exception? exception, string messageTemplate, T propertyValue) { } - public void Debug(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) + public void Debug(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) { } - public void Debug(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, + public void Debug(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2) { } - public void Debug(Exception exception, string messageTemplate, params object[] propertyValues) + public void Debug(Exception? exception, string messageTemplate, params object?[]? propertyValues) { } @@ -182,28 +183,28 @@ public void Information(string messageTemplate, T0 propertyValue0, T { } - public void Information(string messageTemplate, params object[] propertyValues) + public void Information(string messageTemplate, params object?[]? propertyValues) { } - public void Information(Exception exception, string messageTemplate) + public void Information(Exception? exception, string messageTemplate) { } - public void Information(Exception exception, string messageTemplate, T propertyValue) + public void Information(Exception? exception, string messageTemplate, T propertyValue) { } - public void Information(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) + public void Information(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) { } - public void Information(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, + public void Information(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2) { } - public void Information(Exception exception, string messageTemplate, params object[] propertyValues) + public void Information(Exception? exception, string messageTemplate, params object?[]? propertyValues) { } @@ -223,28 +224,28 @@ public void Warning(string messageTemplate, T0 propertyValue0, T1 pr { } - public void Warning(string messageTemplate, params object[] propertyValues) + public void Warning(string messageTemplate, params object?[]? propertyValues) { } - public void Warning(Exception exception, string messageTemplate) + public void Warning(Exception? exception, string messageTemplate) { } - public void Warning(Exception exception, string messageTemplate, T propertyValue) + public void Warning(Exception? exception, string messageTemplate, T propertyValue) { } - public void Warning(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) + public void Warning(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) { } - public void Warning(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, + public void Warning(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2) { } - public void Warning(Exception exception, string messageTemplate, params object[] propertyValues) + public void Warning(Exception? exception, string messageTemplate, params object?[]? propertyValues) { } @@ -264,28 +265,28 @@ public void Error(string messageTemplate, T0 propertyValue0, T1 prop { } - public void Error(string messageTemplate, params object[] propertyValues) + public void Error(string messageTemplate, params object?[]? propertyValues) { } - public void Error(Exception exception, string messageTemplate) + public void Error(Exception? exception, string messageTemplate) { } - public void Error(Exception exception, string messageTemplate, T propertyValue) + public void Error(Exception? exception, string messageTemplate, T propertyValue) { } - public void Error(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) + public void Error(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) { } - public void Error(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, + public void Error(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2) { } - public void Error(Exception exception, string messageTemplate, params object[] propertyValues) + public void Error(Exception? exception, string messageTemplate, params object?[]? propertyValues) { } @@ -305,43 +306,43 @@ public void Fatal(string messageTemplate, T0 propertyValue0, T1 prop { } - public void Fatal(string messageTemplate, params object[] propertyValues) + public void Fatal(string messageTemplate, params object?[]? propertyValues) { } - public void Fatal(Exception exception, string messageTemplate) + public void Fatal(Exception? exception, string messageTemplate) { } - public void Fatal(Exception exception, string messageTemplate, T propertyValue) + public void Fatal(Exception? exception, string messageTemplate, T propertyValue) { } - public void Fatal(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) + public void Fatal(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1) { } - public void Fatal(Exception exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, + public void Fatal(Exception? exception, string messageTemplate, T0 propertyValue0, T1 propertyValue1, T2 propertyValue2) { } - public void Fatal(Exception exception, string messageTemplate, params object[] propertyValues) + public void Fatal(Exception? exception, string messageTemplate, params object?[]? propertyValues) { } public bool BindMessageTemplate( string messageTemplate, - object[] propertyValues, - out MessageTemplate? parsedTemplate, - out IEnumerable? boundProperties) + object?[]? propertyValues, + [NotNullWhen(true)] out MessageTemplate? parsedTemplate, + [NotNullWhen(true)] out IEnumerable? boundProperties) { parsedTemplate = null; boundProperties = null; return false; } - public bool BindProperty(string propertyName, object value, bool destructureObjects, out LogEventProperty? property) + public bool BindProperty(string? propertyName, object? value, bool destructureObjects, [NotNullWhen(true)] out LogEventProperty? property) { property = null; return false; diff --git a/test/Serilog.AspNetCore.Tests/Support/Extensions.cs b/test/Serilog.AspNetCore.Tests/Support/Extensions.cs index 78ac692..822dd61 100644 --- a/test/Serilog.AspNetCore.Tests/Support/Extensions.cs +++ b/test/Serilog.AspNetCore.Tests/Support/Extensions.cs @@ -2,9 +2,9 @@ namespace Serilog.AspNetCore.Tests.Support; -public static class Extensions +static class Extensions { - public static object LiteralValue(this LogEventPropertyValue @this) + public static object? LiteralValue(this LogEventPropertyValue @this) { return ((ScalarValue)@this).Value; } From 892f90e979957c860b95ce010f1620876b92539e Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Wed, 3 May 2023 18:52:28 +1000 Subject: [PATCH 5/7] Quick README update to note the versioning policy --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 2c3e9e8..f4c2578 100644 --- a/README.md +++ b/README.md @@ -286,3 +286,7 @@ using (logger.PushProperty("OperationType", "update")) // UserId and OperationType are set for all logging events in these brackets } ``` + +### Versioning + +This package tracks the versioning and target framework support of its (indirect) [_Microsoft.Extensions.Hosting_](https://nuget.org/packages/Microsoft.Extensions.Hosting) dependency. From cfb2031f4a1a2228865f7303011f53bcb833adce Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Fri, 5 May 2023 11:30:21 +1000 Subject: [PATCH 6/7] Update references to v7-dev-* dependencies --- serilog-aspnetcore.sln | 14 -------------- src/Serilog.AspNetCore/Serilog.AspNetCore.csproj | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/serilog-aspnetcore.sln b/serilog-aspnetcore.sln index 9f3ca5f..a9b5e42 100644 --- a/serilog-aspnetcore.sln +++ b/serilog-aspnetcore.sln @@ -26,10 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Serilog.AspNetCore.Tests", EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "samples\Sample\Sample.csproj", "{4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Logging", "..\serilog-extensions-logging\src\Serilog.Extensions.Logging\Serilog.Extensions.Logging.csproj", "{03EC6680-9D1F-4D51-A1F4-E6863781982B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serilog.Extensions.Hosting", "..\serilog-extensions-hosting\src\Serilog.Extensions.Hosting\Serilog.Extensions.Hosting.csproj", "{49220185-3DA4-49C1-B08C-F5C38F53378B}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -48,14 +44,6 @@ Global {4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}.Debug|Any CPU.Build.0 = Debug|Any CPU {4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}.Release|Any CPU.ActiveCfg = Release|Any CPU {4FA0FE41-973E-4555-AB4A-0F400DBA9DD3}.Release|Any CPU.Build.0 = Release|Any CPU - {03EC6680-9D1F-4D51-A1F4-E6863781982B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03EC6680-9D1F-4D51-A1F4-E6863781982B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03EC6680-9D1F-4D51-A1F4-E6863781982B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03EC6680-9D1F-4D51-A1F4-E6863781982B}.Release|Any CPU.Build.0 = Release|Any CPU - {49220185-3DA4-49C1-B08C-F5C38F53378B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49220185-3DA4-49C1-B08C-F5C38F53378B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49220185-3DA4-49C1-B08C-F5C38F53378B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49220185-3DA4-49C1-B08C-F5C38F53378B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -64,8 +52,6 @@ Global {0549D23F-986B-4FB2-BACE-16FD7A7BC9EF} = {A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0} {AD51759B-CD58-473F-9620-0B0E56A123A1} = {E30F638E-BBBE-4AD1-93CE-48CC69CFEFE1} {4FA0FE41-973E-4555-AB4A-0F400DBA9DD3} = {F2407211-6043-439C-8E06-3641634332E7} - {03EC6680-9D1F-4D51-A1F4-E6863781982B} = {A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0} - {49220185-3DA4-49C1-B08C-F5C38F53378B} = {A1893BD1-333D-4DFE-A0F0-DDBB2FE526E0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {811E61C5-3871-4633-AFAE-B35B619C8A10} diff --git a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj index 231c822..605b1de 100644 --- a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj +++ b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj @@ -31,8 +31,8 @@ - - + + From e6e51d8f64f50833bb539734816a91d5efd669b4 Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Thu, 11 May 2023 11:22:03 +1000 Subject: [PATCH 7/7] Update Serilog.AspNetCore.csproj to non-prerelease dependencies --- src/Serilog.AspNetCore/Serilog.AspNetCore.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj index 605b1de..2e18f90 100644 --- a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj +++ b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj @@ -31,8 +31,8 @@ - - + +