File tree Expand file tree Collapse file tree 4 files changed +12
-11
lines changed
Cli/dotnet/commands/dotnet-workload/install
Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader
Tests/dotnet-workload-search.Tests Expand file tree Collapse file tree 4 files changed +12
-11
lines changed Original file line number Diff line number Diff line change @@ -104,16 +104,16 @@ private void ValidateWorkloadIdsInput()
104
104
var availableWorkloads = _workloadResolver . GetAvailableWorkloads ( ) ;
105
105
foreach ( var workloadId in _workloadIds )
106
106
{
107
- if ( availableWorkloads . Select ( workload => workload . Id . ToString ( ) ) . Contains ( workloadId ) )
107
+ if ( ! availableWorkloads . Select ( workload => workload . Id . ToString ( ) ) . Contains ( workloadId ) )
108
108
{
109
- if ( ! _workloadResolver . IsWorkloadPlatformCompatible ( new WorkloadId ( workloadId ) ) )
109
+ if ( _workloadResolver . IsPlatformIncompatibleWorkload ( new WorkloadId ( workloadId ) ) )
110
110
{
111
111
throw new GracefulException ( string . Format ( LocalizableStrings . WorkloadNotSupportedOnPlatform , workloadId ) ) ;
112
112
}
113
- }
114
- else
115
- {
116
- throw new GracefulException ( string . Format ( LocalizableStrings . WorkloadNotRecognized , workloadId ) ) ;
113
+ else
114
+ {
115
+ throw new GracefulException ( string . Format ( LocalizableStrings . WorkloadNotRecognized , workloadId ) ) ;
116
+ }
117
117
}
118
118
}
119
119
}
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ public interface IWorkloadResolver
11
11
IEnumerable < WorkloadPackId > GetPacksInWorkload ( WorkloadId workloadId ) ;
12
12
ISet < WorkloadResolver . WorkloadInfo > ? GetWorkloadSuggestionForMissingPacks ( IList < WorkloadPackId > packId , out ISet < WorkloadPackId > unsatisfiablePacks ) ;
13
13
IEnumerable < WorkloadResolver . WorkloadInfo > GetAvailableWorkloads ( ) ;
14
- bool IsWorkloadPlatformCompatible ( WorkloadId workloadId ) ;
14
+ bool IsPlatformIncompatibleWorkload ( WorkloadId workloadId ) ;
15
15
string GetManifestVersion ( string manifestId ) ;
16
16
IEnumerable < WorkloadResolver . ManifestInfo > GetInstalledManifests ( ) ;
17
17
Original file line number Diff line number Diff line change @@ -621,13 +621,14 @@ public WorkloadInfo GetWorkloadInfo(WorkloadId workloadId)
621
621
return new WorkloadInfo ( workload . Id , workload . Description ) ;
622
622
}
623
623
624
- public bool IsWorkloadPlatformCompatible ( WorkloadId workloadId )
624
+ public bool IsPlatformIncompatibleWorkload ( WorkloadId workloadId )
625
625
{
626
626
if ( _workloads . TryGetValue ( workloadId ) is not ( WorkloadDefinition workload , WorkloadManifest manifest ) )
627
627
{
628
- throw new ArgumentException ( $ "Workload '{ workloadId } ' not found", nameof ( workloadId ) ) ;
628
+ // Not a recognized workload
629
+ return false ;
629
630
}
630
- return IsWorkloadPlatformCompatible ( workload , manifest ) ;
631
+ return ! IsWorkloadPlatformCompatible ( workload , manifest ) ;
631
632
}
632
633
633
634
private bool IsWorkloadPlatformCompatible ( WorkloadDefinition workload , WorkloadManifest manifest )
Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ public MockWorkloadResolver(IEnumerable<WorkloadResolver.WorkloadInfo> available
23
23
public ISet < WorkloadResolver . WorkloadInfo > GetWorkloadSuggestionForMissingPacks ( IList < WorkloadPackId > packId , out ISet < WorkloadPackId > unsatisfiablePacks ) => throw new NotImplementedException ( ) ;
24
24
public void RefreshWorkloadManifests ( ) => throw new NotImplementedException ( ) ;
25
25
public WorkloadResolver . PackInfo TryGetPackInfo ( WorkloadPackId packId ) => throw new NotImplementedException ( ) ;
26
- public bool IsWorkloadPlatformCompatible ( WorkloadId workloadId ) => throw new NotImplementedException ( ) ;
26
+ public bool IsPlatformIncompatibleWorkload ( WorkloadId workloadId ) => throw new NotImplementedException ( ) ;
27
27
public string GetManifestVersion ( string manifestId ) => throw new NotImplementedException ( ) ;
28
28
public IEnumerable < WorkloadResolver . ManifestInfo > GetInstalledManifests ( ) => throw new NotImplementedException ( ) ;
29
29
public IWorkloadResolver CreateOverlayResolver ( IWorkloadManifestProvider overlayManifestProvider ) => throw new NotImplementedException ( ) ;
You can’t perform that action at this time.
0 commit comments