Skip to content

Commit

Permalink
Bump YamlDotNet from 15.1.2 to 15.1.4 (#484)
Browse files Browse the repository at this point in the history
* Bump YamlDotNet from 15.1.2 to 15.1.4

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 15.1.2 to 15.1.4.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](aaubry/YamlDotNet@v15.1.2...v15.1.4)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove compiler condition

* Update ReleaseNotes.md

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and thomhurst committed May 23, 2024
1 parent db034d8 commit 9bfc5ee
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 20 deletions.
2 changes: 1 addition & 1 deletion src/ModularPipelines.Build/ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NULL
null
13 changes: 1 addition & 12 deletions src/ModularPipelines/Logging/ModuleLogger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,8 @@ internal abstract class ModuleLogger : IModuleLogger

public abstract bool IsEnabled(LogLevel logLevel);

#if NET6_0
public abstract IDisposable BeginScope<TState>(TState state);
#else
public abstract IDisposable? BeginScope<TState>(TState state)
where TState : notnull;
#endif

public abstract void Dispose();

Expand Down Expand Up @@ -68,18 +64,11 @@ internal class ModuleLogger<T> : ModuleLogger, IModuleLogger, ILogger<T>
{
Dispose();
}

#if NET6_0
public override IDisposable BeginScope<TState>(TState state)
{
return new NoopDisposable();
}
#else

public override IDisposable? BeginScope<TState>(TState state)
{
return new NoopDisposable();
}
#endif

public override bool IsEnabled(LogLevel logLevel)
{
Expand Down
14 changes: 7 additions & 7 deletions src/ModularPipelines/ModularPipelines.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
Expand All @@ -56,7 +56,7 @@
<PackageReference Include="EnumerableAsyncProcessor" Version="1.3.2" />
<PackageReference Include="Initialization.Microsoft.Extensions.DependencyInjection" Version="1.1.44" />
<PackageReference Include="vertical-spectreconsolelogger" Version="0.10.1-dev.20240326.31" />
<PackageReference Include="YamlDotNet" Version="15.1.2" />
<PackageReference Include="YamlDotNet" Version="15.1.4" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 9bfc5ee

Please sign in to comment.