From 930d6e82b209a30cd4b041c8667a3fe4cedcae92 Mon Sep 17 00:00:00 2001
From: "Michael C. Fanning" <mikefan@microsoft.com>
Date: Wed, 24 Jul 2024 08:51:01 -0700
Subject: [PATCH] Further style updates and command-line enforcement.

---
 src/Sarif/Core/Notification.cs                                | 2 ++
 src/Test.FunctionalTests.Sarif/MultitoolCommandLineTests.cs   | 4 +++-
 .../BuiltinConverterFactoryTests.cs                           | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Sarif/Core/Notification.cs b/src/Sarif/Core/Notification.cs
index b0fed5c07..aebf72afe 100644
--- a/src/Sarif/Core/Notification.cs
+++ b/src/Sarif/Core/Notification.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+#if DEBUG
 using System;
+#endif
 
 namespace Microsoft.CodeAnalysis.Sarif
 {
diff --git a/src/Test.FunctionalTests.Sarif/MultitoolCommandLineTests.cs b/src/Test.FunctionalTests.Sarif/MultitoolCommandLineTests.cs
index ad11b5ff5..c8351f43e 100644
--- a/src/Test.FunctionalTests.Sarif/MultitoolCommandLineTests.cs
+++ b/src/Test.FunctionalTests.Sarif/MultitoolCommandLineTests.cs
@@ -5,9 +5,11 @@
 using System.IO;
 
 using FluentAssertions;
-using FluentAssertions.Execution;
 
+#if DEBUG
+using FluentAssertions.Execution;
 using Microsoft.CodeAnalysis.Sarif.Driver;
+#endif
 
 using Xunit;
 
diff --git a/src/Test.UnitTests.Sarif.Converters/BuiltinConverterFactoryTests.cs b/src/Test.UnitTests.Sarif.Converters/BuiltinConverterFactoryTests.cs
index 15b1f1dd8..ef2833a65 100644
--- a/src/Test.UnitTests.Sarif.Converters/BuiltinConverterFactoryTests.cs
+++ b/src/Test.UnitTests.Sarif.Converters/BuiltinConverterFactoryTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 using Microsoft.CodeAnalysis.Sarif.Converters;