Skip to content

Commit aee3b0e

Browse files
authored
Merge pull request #504 from tonyhallett/fix-502
catch exception
2 parents 9733b47 + ccfa121 commit aee3b0e

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

SharedProject/Core/MsTestPlatform/TestingPlatform/DisableTestingPlatformServerCapabilityGlobalPropertiesProvider.cs

+10-5
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,16 @@ private bool AllProjectsDisabled()
5353
return !appOptions.Enabled && appOptions.DisabledNoCoverage;
5454
}
5555

56-
private async Task<bool> IsTUnitAsync()
56+
private async Task<bool> IsApplicableAsync()
5757
{
58-
var configuredProject = await unconfiguredProject.GetSuggestedConfiguredProjectAsync();
59-
var references = await configuredProject.Services.PackageReferences.GetUnresolvedReferencesAsync();
60-
return references.Any(r => r.UnevaluatedInclude == TUnitConstants.TUnitPackageId);
58+
try
59+
{
60+
var configuredProject = await unconfiguredProject.GetSuggestedConfiguredProjectAsync();
61+
var references = await configuredProject.Services.PackageReferences.GetUnresolvedReferencesAsync();
62+
return !references.Any(r => r.UnevaluatedInclude == TUnitConstants.TUnitPackageId);
63+
}
64+
catch { }
65+
return false;
6166
}
6267

6368
private async Task<bool> ProjectEnabledAsync()
@@ -99,7 +104,7 @@ private CoverageProject GetCoverageProject(Guid projectGuid)
99104

100105
public override async Task<IImmutableDictionary<string, string>> GetGlobalPropertiesAsync(CancellationToken cancellationToken)
101106
{
102-
if (!await IsTUnitAsync() && !AllProjectsDisabled() && await ProjectEnabledAsync())
107+
if (await IsApplicableAsync() && !AllProjectsDisabled() && await ProjectEnabledAsync())
103108
{
104109
return Empty.PropertiesMap.Add("DisableTestingPlatformServerCapability", "true");
105110
}

0 commit comments

Comments
 (0)