Skip to content
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

Jump to bottom

Bump YamlDotNet from 15.1.2 to 15.1.4 #484

Merged
merged 3 commits into from
May 23, 2024
Merged

Bump YamlDotNet from 15.1.2 to 15.1.4 #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
652c780
Bump YamlDotNet from 15.1.2 to 15.1.4
dependabot[bot] May 21, 2024
d875309
Remove compiler condition
thomhurst May 23, 2024
033ea9d
Update ReleaseNotes.md
thomhurst May 23, 2024
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 src/ModularPipelines.Build/ReleaseNotes.md
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading