huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Re-use the dotnet-new lock during template package installation (#22007)

This commit is contained in:
Pranav K 2020-05-20 09:56:28 -07:00 committed by GitHub
parent b16a39f42a
commit c486a4bebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
View File

@ -6,10 +6,8 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Internal; using Microsoft.AspNetCore.Internal;
using Microsoft.AspNetCore.Testing;
using Microsoft.Extensions.CommandLineUtils; using Microsoft.Extensions.CommandLineUtils;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
@ -18,7 +16,6 @@ namespace Templates.Test.Helpers
{ {
internal static class TemplatePackageInstaller internal static class TemplatePackageInstaller
{ {
private static readonly SemaphoreSlim InstallerLock = new SemaphoreSlim(1);
private static bool _haveReinstalledTemplatePackages; private static bool _haveReinstalledTemplatePackages;
private static readonly string[] _templatePackages = new[] private static readonly string[] _templatePackages = new[]
@ -52,7 +49,7 @@ namespace Templates.Test.Helpers
public static async Task EnsureTemplatingEngineInitializedAsync(ITestOutputHelper output) public static async Task EnsureTemplatingEngineInitializedAsync(ITestOutputHelper output)
{ {
Assert.True(await InstallerLock.WaitAsync(TimeSpan.FromMinutes(1)), "Unable to grab installer lock"); await ProcessLock.DotNetNewLock.WaitAsync();
try try
{ {
if (!_haveReinstalledTemplatePackages) if (!_haveReinstalledTemplatePackages)
@ -67,7 +64,7 @@ namespace Templates.Test.Helpers
} }
finally finally
{ {
InstallerLock.Release(); ProcessLock.DotNetNewLock.Release();
} }
} }