Skip to content

Switch to the VS2022 build worker and .NET 6 SDK #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 8, 2022
Merged

Switch to the VS2022 build worker and .NET 6 SDK #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03278e6
Switch to the VS2022 build worker and .NET 6 SDK
nblumhardt Jul 8, 2022
3af92b5
Target 6.0.300, roll forwards
nblumhardt Jul 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: '{build}'
skip_tags: true
image: Visual Studio 2019
image: Visual Studio 2022
test: off
build_script:
- ps: ./Build.ps1
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"allowPrerelease": false,
"version": "5.0.409",
"version": "6.0.300",
"rollForward": "latestFeature"
}
}
8 changes: 6 additions & 2 deletions src/Serilog.Extensions.Hosting/Extensions/Hosting/ReloadableLogger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,13 @@ public bool BindProperty(string propertyName, object value, bool destructureObje
[MethodImpl(MethodImplOptions.AggressiveInlining)]
(ILogger, bool) UpdateForCaller(ILogger root, ILogger cached, IReloadableLogger caller, out ILogger newRoot, out ILogger newCached, out bool frozen)
{
// Synchronization on `_sync` is not required in this method; it will be called without a lock
// if `_frozen` and under a lock if not.

if (_frozen)
{
// If we're frozen, then the caller hasn't observed this yet and should update.
// If we're frozen, then the caller hasn't observed this yet and should update. We could optimize a little here
// and only signal an update if the cached logger is stale (as per the next condition below).
newRoot = _logger;
newCached = caller.ReloadLogger();
frozen = true;
Expand All @@ -384,7 +388,7 @@ public bool BindProperty(string propertyName, object value, bool destructureObje
frozen = false;
return (cached, false);
}

newRoot = _logger;
newCached = caller.ReloadLogger();
frozen = false;
Expand Down
2 changes: 1 addition & 1 deletion test/Serilog.Extensions.Hosting.Tests/Serilog.Extensions.Hosting.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.1;net5.0;net4.8</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6.0;net4.8</TargetFrameworks>
<AssemblyName>Serilog.Extensions.Hosting.Tests</AssemblyName>
<AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
Expand Down