From 652c7803d59488e432257b7c2cace50691654ea5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 09:31:23 +0000
Subject: [PATCH 1/3] 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](https://github.com/aaubry/YamlDotNet/compare/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>
---
 src/ModularPipelines/ModularPipelines.csproj | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ModularPipelines/ModularPipelines.csproj b/src/ModularPipelines/ModularPipelines.csproj
index 9ea0f8e153..62407892dc 100644
--- a/src/ModularPipelines/ModularPipelines.csproj
+++ b/src/ModularPipelines/ModularPipelines.csproj
@@ -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'">
@@ -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>

From d8753092ef5f98b866e1a3a54562dc9a69a00437 Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Thu, 23 May 2024 22:08:54 +0100
Subject: [PATCH 2/3] Remove compiler condition

---
 src/ModularPipelines/Logging/ModuleLogger.cs | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/ModularPipelines/Logging/ModuleLogger.cs b/src/ModularPipelines/Logging/ModuleLogger.cs
index ec3958292e..b4469a6131 100644
--- a/src/ModularPipelines/Logging/ModuleLogger.cs
+++ b/src/ModularPipelines/Logging/ModuleLogger.cs
@@ -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();
 
@@ -68,18 +64,11 @@ public ModuleLogger(ILogger<T> defaultLogger,
     {
         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)
     {

From 033ea9d49a2f0ce60aee8b28b31862400b0a8e4f Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Thu, 23 May 2024 22:20:36 +0100
Subject: [PATCH 3/3] Update ReleaseNotes.md

---
 src/ModularPipelines.Build/ReleaseNotes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ModularPipelines.Build/ReleaseNotes.md b/src/ModularPipelines.Build/ReleaseNotes.md
index 7951defec1..19765bd501 100644
--- a/src/ModularPipelines.Build/ReleaseNotes.md
+++ b/src/ModularPipelines.Build/ReleaseNotes.md
@@ -1 +1 @@
-NULL
+null