Remove C#8 features

This commit is contained in:
Jordan Brown
2020-04-20 13:27:33 -04:00
parent daf5d113e3
commit cd5eb25bb7
3 changed files with 31 additions and 29 deletions
@@ -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!");
}
}
}
@@ -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 />
@@ -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]