From cd5eb25bb70b6bd03c4720e3566b706fb3c7d962 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 20 Apr 2020 13:27:33 -0400
Subject: [PATCH] Remove C#8 features

---
 .../Components/InstanceManager.cs             |  6 +--
 .../Repository/RepositoryManager.cs           | 38 +++++++++----------
 .../Repository/TestRepositoryFactory.cs       | 16 ++++----
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/src/Tgstation.Server.Host/Components/InstanceManager.cs b/src/Tgstation.Server.Host/Components/InstanceManager.cs
index b0c15cacd8..07bd7aa148 100644
--- a/src/Tgstation.Server.Host/Components/InstanceManager.cs
+++ b/src/Tgstation.Server.Host/Components/InstanceManager.cs
@@ -298,9 +298,9 @@ namespace Tgstation.Server.Host.Components
 		/// </summary>
 		private void CheckSystemCompatibility()
 		{
-			using var systemIdentity = systemIdentityFactory.GetCurrent();
-			if (!systemIdentity.CanCreateSymlinks)
-				throw new InvalidOperationException("The user running tgstation-server cannot create symlinks! Please try running as an administrative user!");
+			using (var systemIdentity = systemIdentityFactory.GetCurrent())
+				if (!systemIdentity.CanCreateSymlinks)
+					throw new InvalidOperationException("The user running tgstation-server cannot create symlinks! Please try running as an administrative user!");
 		}
 	}
 }
diff --git a/src/Tgstation.Server.Host/Components/Repository/RepositoryManager.cs b/src/Tgstation.Server.Host/Components/Repository/RepositoryManager.cs
index 06ce0f0f41..6bcdaf40bc 100644
--- a/src/Tgstation.Server.Host/Components/Repository/RepositoryManager.cs
+++ b/src/Tgstation.Server.Host/Components/Repository/RepositoryManager.cs
@@ -171,26 +171,26 @@ namespace Tgstation.Server.Host.Components.Repository
 			lock (semaphore)
 				if (CloneInProgress)
 					throw new InvalidOperationException("The repository is being cloned!");
-			try
-			{
-				using var context = await SemaphoreSlimContext.Lock(semaphore, cancellationToken).ConfigureAwait(false);
-				var repo = await repositoryFactory.CreateFromPath(ioManager.ResolvePath("."), cancellationToken).ConfigureAwait(false);
-
-				if (repo == null)
-					return null;
-
-				return new Repository(repo, ioManager, eventConsumer, repositoryFactory, repositoryLogger, () =>
+			using (var context = await SemaphoreSlimContext.Lock(semaphore, cancellationToken).ConfigureAwait(false))
+				try
 				{
-					logger.LogTrace("Releasing semaphore due to Repository disposal...");
-					semaphore.Release();
-				});
-			}
-			catch (RepositoryNotFoundException e)
-			{
-				logger.LogDebug("Repository not found!");
-				logger.LogTrace("Exception: {0}", e);
-				return null;
-			}
+					var repo = await repositoryFactory.CreateFromPath(ioManager.ResolvePath("."), cancellationToken).ConfigureAwait(false);
+
+					if (repo == null)
+						return null;
+
+					return new Repository(repo, ioManager, eventConsumer, repositoryFactory, repositoryLogger, () =>
+					{
+						logger.LogTrace("Releasing semaphore due to Repository disposal...");
+						semaphore.Release();
+					});
+				}
+				catch (RepositoryNotFoundException e)
+				{
+					logger.LogDebug("Repository not found!");
+					logger.LogTrace("Exception: {0}", e);
+					return null;
+				}
 		}
 
 		/// <inheritdoc />
diff --git a/tests/Tgstation.Server.Host.Tests/Components/Repository/TestRepositoryFactory.cs b/tests/Tgstation.Server.Host.Tests/Components/Repository/TestRepositoryFactory.cs
index 1434f24e0a..80e63c1e21 100644
--- a/tests/Tgstation.Server.Host.Tests/Components/Repository/TestRepositoryFactory.cs
+++ b/tests/Tgstation.Server.Host.Tests/Components/Repository/TestRepositoryFactory.cs
@@ -28,20 +28,22 @@ namespace Tgstation.Server.Host.Components.Repository.Tests
 		[TestMethod]
 		public void TestInMemoryRepoCreation()
 		{
-			using var repo = new RepositoryFactory(Mock.Of<ILogger<RepositoryFactory>>()).CreateInMemory();
+			new RepositoryFactory(Mock.Of<ILogger<RepositoryFactory>>()).CreateInMemory().Dispose();
 		}
 
 		[TestMethod]
 		public async Task TestLoadedRepoCreation()
 		{
-			using var repo = await TestRepoLoading(Path.GetFullPath("../../../../.."));
+			using (var repo = await TestRepoLoading(Path.GetFullPath("../../../../..")))
+			{
 
-			// Checking the commit previous to the one that creates this function exists
-			var gitObject = repo.Lookup("4802806bdccee27cb3d5fa8c2d0dfbdc117fdb4d");
-			Assert.IsNotNull(gitObject);
-			var commit = gitObject.Peel<Commit>();
+				// Checking the commit previous to the one that creates this function exists
+				var gitObject = repo.Lookup("4802806bdccee27cb3d5fa8c2d0dfbdc117fdb4d");
+				Assert.IsNotNull(gitObject);
+				var commit = gitObject.Peel<Commit>();
 
-			Assert.AreEqual("Cleanup repository management code", commit.Message.Trim());
+				Assert.AreEqual("Cleanup repository management code", commit.Message.Trim());
+			}
 		}
 
 		[TestMethod]