From 6f3b5c01d51ac5daacd27f5e6c4695b00a17c922 Mon Sep 17 00:00:00 2001
From: "Michael B. Gale" <mbg@github.com>
Date: Tue, 28 Feb 2023 13:56:06 +0000
Subject: [PATCH] Fix `IDisposable` contract violation

---
 .../Semmle.Autobuild.Shared/Autobuilder.cs         |  2 +-
 csharp/extractor/Semmle.Util/ToolStatusPage.cs     | 14 ++------------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
index d5523f1b6e7..a9ab909ad98 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
+++ b/csharp/autobuilder/Semmle.Autobuild.Shared/Autobuilder.cs
@@ -240,7 +240,7 @@ namespace Semmle.Autobuild.Shared
             SourceArchiveDir = RequireEnvironmentVariable(EnvVars.SourceArchiveDir(this.Options.Language));
             DiagnosticsDir = RequireEnvironmentVariable(EnvVars.DiagnosticDir(this.Options.Language));
 
-            this.diagnostics = DiagnosticsStream.ForFile(Path.Combine(DiagnosticsDir, $"autobuilder-{DateTime.UtcNow:yyyyMMddHHmm}.jsonc"));
+            this.diagnostics = new DiagnosticsStream(Path.Combine(DiagnosticsDir, $"autobuilder-{DateTime.UtcNow:yyyyMMddHHmm}.jsonc"));
         }
 
         /// <summary>
diff --git a/csharp/extractor/Semmle.Util/ToolStatusPage.cs b/csharp/extractor/Semmle.Util/ToolStatusPage.cs
index 8c650659595..49ca3be1031 100644
--- a/csharp/extractor/Semmle.Util/ToolStatusPage.cs
+++ b/csharp/extractor/Semmle.Util/ToolStatusPage.cs
@@ -157,18 +157,10 @@ namespace Semmle.Util
         /// Initialises a new <see cref="DiagnosticsStream" /> for a file at <paramref name="path" />.
         /// </summary>
         /// <param name="path">The path to the file that should be created.</param>
-        /// <returns>
-        /// A <see cref="DiagnosticsStream" /> object which allows diagnostics to be
-        /// written to a file at <paramname name="path" />.
-        /// </returns>
-        public static DiagnosticsStream ForFile(string path)
+        public DiagnosticsStream(string path)
         {
-            var stream = File.CreateText(path);
-            return new DiagnosticsStream(stream);
-        }
+            this.writer = File.CreateText(path);
 
-        public DiagnosticsStream(StreamWriter streamWriter)
-        {
             var contractResolver = new DefaultContractResolver
             {
                 NamingStrategy = new CamelCaseNamingStrategy()
@@ -179,8 +171,6 @@ namespace Semmle.Util
                 ContractResolver = contractResolver,
                 NullValueHandling = NullValueHandling.Ignore
             };
-
-            writer = streamWriter;
         }
 
         /// <summary>