Skip to content

Commit 88bc040

Browse files
committed
Use WorkloadId type for Id on WorkloadInfo
IIRC WorkloadId used to be private but now it's public there's no reason not to use it
1 parent 8a7983e commit 88bc040

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadId.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,7 @@ public WorkloadId(string id)
3232
public override bool Equals(object? obj) => obj is WorkloadId id && Equals(id);
3333

3434
public override string ToString() => _id;
35+
36+
public static implicit operator string(WorkloadId id) => id._id;
3537
}
3638
}

src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadResolver.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ public ISet<WorkloadInfo> GetWorkloadSuggestionForMissingPacks(IList<string> pac
422422

423423
return new HashSet<WorkloadInfo>
424424
(
425-
finder.GetBestSuggestion().Workloads.Select(s => new WorkloadInfo(s.ToString(), _workloads[s].workload.Description))
425+
finder.GetBestSuggestion().Workloads.Select(s => new WorkloadInfo(s, _workloads[s].workload.Description))
426426
);
427427
}
428428

@@ -538,21 +538,21 @@ public PackInfo(string id, string version, WorkloadPackKind kind, string path, s
538538

539539
public class WorkloadInfo
540540
{
541-
public WorkloadInfo(string id, string? description)
541+
public WorkloadInfo(WorkloadId id, string? description)
542542
{
543543
Id = id;
544544
Description = description;
545545
}
546546

547-
public string Id { get; }
547+
public WorkloadId Id { get; }
548548
public string? Description { get; }
549549
}
550550

551551
public WorkloadInfo GetWorkloadInfo(WorkloadId WorkloadId)
552552
{
553553
if (_workloads.TryGetValue(WorkloadId) is (WorkloadDefinition workload, _))
554554
{
555-
return new WorkloadInfo(workload.Id.ToString(), workload.Description);
555+
return new WorkloadInfo(workload.Id, workload.Description);
556556
}
557557
throw new Exception("Workload not found");
558558
}

0 commit comments

Comments
 (0)