Skip to content

Commit c91db54

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.1xx' of https://github.com/dotnet/sdk into darc-release/8.0.1xx-b9834071-8de8-4768-bbcb-67d1809fb943
2 parents 2e103a4 + 08e5646 commit c91db54

26 files changed

+371
-192
lines changed

‎eng/Version.Details.xml‎

Lines changed: 119 additions & 119 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -36,48 +36,48 @@
3636
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
3737
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23463.1</MicrosoftDotNetSignToolVersion>
3838
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
39-
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rc.2.23470.7</SystemSecurityCryptographyProtectedDataPackageVersion>
39+
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-rtm.23472.12</SystemSecurityCryptographyProtectedDataPackageVersion>
4040
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
4141
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
4242
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
4343
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
44-
<SystemReflectionMetadataLoadContextVersion>8.0.0-rc.2.23470.7</SystemReflectionMetadataLoadContextVersion>
44+
<SystemReflectionMetadataLoadContextVersion>8.0.0-rtm.23472.12</SystemReflectionMetadataLoadContextVersion>
4545
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
4646
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
4747
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.23463.1</MicrosoftDeploymentDotNetReleasesVersion>
4848
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
4949
</PropertyGroup>
5050
<PropertyGroup>
5151
<!-- Dependencies from https://github.com/dotnet/runtime -->
52-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.2.23470.7</MicrosoftNETCoreAppRefPackageVersion>
53-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rc.2.23470.7</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
54-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rc.2.23470.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
52+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rtm.23472.12</MicrosoftNETCoreAppRefPackageVersion>
53+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-rtm.23472.12</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
54+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-rtm.23472.12</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
5555
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
56-
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rc.2.23470.7</MicrosoftExtensionsDependencyModelPackageVersion>
57-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.2.23470.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
58-
<MicrosoftNETHostModelVersion>8.0.0-rc.2.23470.7</MicrosoftNETHostModelVersion>
59-
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rc.2.23470.7</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
56+
<MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-rtm.23472.12</MicrosoftExtensionsDependencyModelPackageVersion>
57+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rtm.23472.12</MicrosoftNETCoreDotNetHostResolverPackageVersion>
58+
<MicrosoftNETHostModelVersion>8.0.0-rtm.23472.12</MicrosoftNETHostModelVersion>
59+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>8.0.0-rtm.23472.12</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
6060
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
61-
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rc.2.23470.7</MicrosoftExtensionsLoggingConsoleVersion>
62-
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.2.23470.7</MicrosoftNETILLinkTasksPackageVersion>
63-
<SystemServiceProcessServiceControllerVersion>8.0.0-rc.2.23470.7</SystemServiceProcessServiceControllerVersion>
61+
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-rtm.23472.12</MicrosoftExtensionsLoggingConsoleVersion>
62+
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rtm.23472.12</MicrosoftNETILLinkTasksPackageVersion>
63+
<SystemServiceProcessServiceControllerVersion>8.0.0-rtm.23472.12</SystemServiceProcessServiceControllerVersion>
6464
<MicrosoftExtensionsLoggingPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingPackageVersion>
6565
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>$(MicrosoftExtensionsLoggingConsoleVersion)</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
6666
</PropertyGroup>
6767
<PropertyGroup>
6868
<!-- Dependencies from https://github.com/nuget/nuget.client -->
69-
<NuGetBuildTasksPackageVersion>6.8.0-rc.112</NuGetBuildTasksPackageVersion>
70-
<NuGetBuildTasksConsolePackageVersion>6.8.0-rc.112</NuGetBuildTasksConsolePackageVersion>
69+
<NuGetBuildTasksPackageVersion>6.8.0-rc.117</NuGetBuildTasksPackageVersion>
70+
<NuGetBuildTasksConsolePackageVersion>6.8.0-rc.117</NuGetBuildTasksConsolePackageVersion>
7171
<NuGetLocalizationPackageVersion>6.0.0-rc.278</NuGetLocalizationPackageVersion>
72-
<NuGetBuildTasksPackPackageVersion>6.8.0-rc.112</NuGetBuildTasksPackPackageVersion>
73-
<NuGetCommandLineXPlatPackageVersion>6.8.0-rc.112</NuGetCommandLineXPlatPackageVersion>
74-
<NuGetProjectModelPackageVersion>6.8.0-rc.112</NuGetProjectModelPackageVersion>
75-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.8.0-rc.112</MicrosoftBuildNuGetSdkResolverPackageVersion>
76-
<NuGetCommonPackageVersion>6.8.0-rc.112</NuGetCommonPackageVersion>
77-
<NuGetConfigurationPackageVersion>6.8.0-rc.112</NuGetConfigurationPackageVersion>
78-
<NuGetFrameworksPackageVersion>6.8.0-rc.112</NuGetFrameworksPackageVersion>
79-
<NuGetPackagingPackageVersion>6.8.0-rc.112</NuGetPackagingPackageVersion>
80-
<NuGetVersioningPackageVersion>6.8.0-rc.112</NuGetVersioningPackageVersion>
72+
<NuGetBuildTasksPackPackageVersion>6.8.0-rc.117</NuGetBuildTasksPackPackageVersion>
73+
<NuGetCommandLineXPlatPackageVersion>6.8.0-rc.117</NuGetCommandLineXPlatPackageVersion>
74+
<NuGetProjectModelPackageVersion>6.8.0-rc.117</NuGetProjectModelPackageVersion>
75+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.8.0-rc.117</MicrosoftBuildNuGetSdkResolverPackageVersion>
76+
<NuGetCommonPackageVersion>6.8.0-rc.117</NuGetCommonPackageVersion>
77+
<NuGetConfigurationPackageVersion>6.8.0-rc.117</NuGetConfigurationPackageVersion>
78+
<NuGetFrameworksPackageVersion>6.8.0-rc.117</NuGetFrameworksPackageVersion>
79+
<NuGetPackagingPackageVersion>6.8.0-rc.117</NuGetPackagingPackageVersion>
80+
<NuGetVersioningPackageVersion>6.8.0-rc.117</NuGetVersioningPackageVersion>
8181
<NuGetPackagingVersion>$(NuGetPackagingPackageVersion)</NuGetPackagingVersion>
8282
<NuGetProjectModelVersion>$(NuGetProjectModelPackageVersion)</NuGetProjectModelVersion>
8383
</PropertyGroup>
@@ -89,9 +89,9 @@
8989
</PropertyGroup>
9090
<PropertyGroup>
9191
<!-- Dependencies from https://github.com/dotnet/runtime -->
92-
<SystemCodeDomPackageVersion>8.0.0-rc.2.23470.7</SystemCodeDomPackageVersion>
93-
<SystemTextEncodingCodePagesPackageVersion>8.0.0-rc.2.23470.7</SystemTextEncodingCodePagesPackageVersion>
94-
<SystemResourcesExtensionsPackageVersion>8.0.0-rc.2.23470.7</SystemResourcesExtensionsPackageVersion>
92+
<SystemCodeDomPackageVersion>8.0.0-rtm.23472.12</SystemCodeDomPackageVersion>
93+
<SystemTextEncodingCodePagesPackageVersion>8.0.0-rtm.23472.12</SystemTextEncodingCodePagesPackageVersion>
94+
<SystemResourcesExtensionsPackageVersion>8.0.0-rtm.23472.12</SystemResourcesExtensionsPackageVersion>
9595
</PropertyGroup>
9696
<PropertyGroup>
9797
<!-- Dependencies from https://github.com/dotnet/format -->
@@ -133,7 +133,7 @@
133133
</PropertyGroup>
134134
<PropertyGroup>
135135
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
136-
<MicrosoftFSharpCompilerPackageVersion>12.8.0-beta.23471.1</MicrosoftFSharpCompilerPackageVersion>
136+
<MicrosoftFSharpCompilerPackageVersion>12.8.0-beta.23472.4</MicrosoftFSharpCompilerPackageVersion>
137137
</PropertyGroup>
138138
<PropertyGroup>
139139
<!-- Dependencies from https://github.com/dotnet/roslyn -->
@@ -148,13 +148,13 @@
148148
</PropertyGroup>
149149
<PropertyGroup>
150150
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
151-
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-rtm.23471.8</MicrosoftAspNetCoreAppRefPackageVersion>
152-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.0-rtm.23471.8</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
153-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.0-rtm.23471.8</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
154-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.0-rtm.23471.8</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
155-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.0-rtm.23471.8</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
156-
<MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.0-rtm.23471.8</MicrosoftAspNetCoreAnalyzersPackageVersion>
157-
<MicrosoftAspNetCoreTestHostPackageVersion>8.0.0-rtm.23471.8</MicrosoftAspNetCoreTestHostPackageVersion>
151+
<MicrosoftAspNetCoreAppRefPackageVersion>8.0.0-rtm.23474.1</MicrosoftAspNetCoreAppRefPackageVersion>
152+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.0-rtm.23474.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
153+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.0-rtm.23474.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
154+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.0-rtm.23474.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
155+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.0-rtm.23474.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
156+
<MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.0-rtm.23474.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
157+
<MicrosoftAspNetCoreTestHostPackageVersion>8.0.0-rtm.23474.1</MicrosoftAspNetCoreTestHostPackageVersion>
158158
</PropertyGroup>
159159
<!-- Dependencies from https://github.com/dotnet/razor -->
160160
<PropertyGroup>
@@ -177,12 +177,12 @@
177177
</PropertyGroup>
178178
<PropertyGroup>
179179
<!-- Dependencies from https://github.com/dotnet/sourcelink -->
180-
<MicrosoftBuildTasksGitVersion>8.0.0-beta.23469.2</MicrosoftBuildTasksGitVersion>
181-
<MicrosoftSourceLinkCommonVersion>8.0.0-beta.23469.2</MicrosoftSourceLinkCommonVersion>
182-
<MicrosoftSourceLinkAzureReposGitVersion>8.0.0-beta.23469.2</MicrosoftSourceLinkAzureReposGitVersion>
183-
<MicrosoftSourceLinkGitHubVersion>8.0.0-beta.23469.2</MicrosoftSourceLinkGitHubVersion>
184-
<MicrosoftSourceLinkGitLabVersion>8.0.0-beta.23469.2</MicrosoftSourceLinkGitLabVersion>
185-
<MicrosoftSourceLinkBitbucketGitVersion>8.0.0-beta.23469.2</MicrosoftSourceLinkBitbucketGitVersion>
180+
<MicrosoftBuildTasksGitVersion>8.0.0-beta.23473.1</MicrosoftBuildTasksGitVersion>
181+
<MicrosoftSourceLinkCommonVersion>8.0.0-beta.23473.1</MicrosoftSourceLinkCommonVersion>
182+
<MicrosoftSourceLinkAzureReposGitVersion>8.0.0-beta.23473.1</MicrosoftSourceLinkAzureReposGitVersion>
183+
<MicrosoftSourceLinkGitHubVersion>8.0.0-beta.23473.1</MicrosoftSourceLinkGitHubVersion>
184+
<MicrosoftSourceLinkGitLabVersion>8.0.0-beta.23473.1</MicrosoftSourceLinkGitLabVersion>
185+
<MicrosoftSourceLinkBitbucketGitVersion>8.0.0-beta.23473.1</MicrosoftSourceLinkBitbucketGitVersion>
186186
</PropertyGroup>
187187
<!-- Get .NET Framework reference assemblies from NuGet packages -->
188188
<PropertyGroup>

‎src/Cli/dotnet/CommandLineInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ public static void PrintInfo()
1919
DotnetVersionFile versionFile = DotnetFiles.VersionFileObject;
2020
var commitSha = versionFile.CommitSha ?? "N/A";
2121
Reporter.Output.WriteLine($"{LocalizableStrings.DotNetSdkInfoLabel}");
22-
Reporter.Output.WriteLine($" Version: {Product.Version}");
23-
Reporter.Output.WriteLine($" Commit: {commitSha}");
22+
Reporter.Output.WriteLine($" Version: {Product.Version}");
23+
Reporter.Output.WriteLine($" Commit: {commitSha}");
24+
Reporter.Output.WriteLine($" Workload version: {WorkloadCommandParser.GetWorkloadsVersion()}");
2425
Reporter.Output.WriteLine();
2526
Reporter.Output.WriteLine($"{LocalizableStrings.DotNetRuntimeInfoLabel}");
2627
Reporter.Output.WriteLine($" OS Name: {RuntimeEnvironment.OperatingSystem}");
@@ -29,7 +30,6 @@ public static void PrintInfo()
2930
Reporter.Output.WriteLine($" RID: {GetDisplayRid(versionFile)}");
3031
Reporter.Output.WriteLine($" Base Path: {AppContext.BaseDirectory}");
3132
PrintWorkloadsInfo();
32-
3333
}
3434

3535
private static void PrintWorkloadsInfo()

‎src/Cli/dotnet/commands/dotnet-workload/LocalizableStrings.resx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,4 +160,7 @@
160160
<value>An issue was encountered verifying workloads. For more information, run "dotnet workload update".</value>
161161
<comment>{Locked="dotnet workload update"}</comment>
162162
</data>
163-
</root>
163+
<data name="WorkloadVersionDescription" xml:space="preserve">
164+
<value>Display the currently installed workload version.</value>
165+
</data>
166+
</root>

‎src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandParser.cs‎

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
using System.CommandLine;
55
using System.CommandLine.Parsing;
6+
using System.IO;
7+
using System.Linq;
8+
using Microsoft.Deployment.DotNet.Releases;
9+
using Microsoft.DotNet.Cli.Utils;
10+
using Microsoft.DotNet.Configurer;
11+
using Microsoft.DotNet.Workloads.Workload.Install;
612
using Microsoft.DotNet.Workloads.Workload.List;
713
using Microsoft.NET.Sdk.WorkloadManifestReader;
814
using Microsoft.TemplateEngine.Cli.Commands;
@@ -22,27 +28,35 @@ internal static class WorkloadCommandParser
2228
Description = CommonStrings.WorkloadInfoDescription
2329
};
2430

31+
public static readonly CliOption<bool> VersionOption = new("--version")
32+
{
33+
Description = CommonStrings.WorkloadVersionDescription
34+
};
35+
2536
public static CliCommand GetCommand()
2637
{
2738
Command.Options.Add(InfoOption);
39+
Command.Options.Add(VersionOption);
2840
return Command;
2941
}
3042

31-
internal static void ShowWorkloadsInfo(ParseResult parseResult = null, IWorkloadInfoHelper workloadInfoHelper = null, IReporter reporter = null, string dotnetDir = null)
43+
internal static string GetWorkloadsVersion(WorkloadInfoHelper workloadInfoHelper = null)
3244
{
33-
if (workloadInfoHelper != null)
34-
{
35-
workloadInfoHelper ??= new WorkloadInfoHelper(parseResult != null ? parseResult.HasOption(SharedOptions.InteractiveOption) : false);
36-
}
37-
else
38-
{
39-
workloadInfoHelper ??= new WorkloadInfoHelper(false);
40-
}
45+
workloadInfoHelper ??= new WorkloadInfoHelper(false);
46+
47+
return workloadInfoHelper.ManifestProvider.GetWorkloadVersion();
48+
}
49+
50+
internal static void ShowWorkloadsInfo(ParseResult parseResult = null, WorkloadInfoHelper workloadInfoHelper = null, IReporter reporter = null, string dotnetDir = null)
51+
{
52+
workloadInfoHelper ??= new WorkloadInfoHelper(parseResult != null ? parseResult.HasOption(SharedOptions.InteractiveOption) : false);
4153
IEnumerable<WorkloadId> installedList = workloadInfoHelper.InstalledSdkWorkloadIds;
4254
InstalledWorkloadsCollection installedWorkloads = workloadInfoHelper.AddInstalledVsWorkloads(installedList);
4355
reporter ??= Cli.Utils.Reporter.Output;
4456
string dotnetPath = dotnetDir ?? Path.GetDirectoryName(Environment.ProcessPath);
4557

58+
reporter.WriteLine($" Workload version: {workloadInfoHelper.ManifestProvider.GetWorkloadVersion()}");
59+
4660
if (installedWorkloads.Count == 0)
4761
{
4862
reporter.WriteLine(CommonStrings.NoWorkloadsInstalledInfoWarning);
@@ -59,7 +73,7 @@ internal static void ShowWorkloadsInfo(ParseResult parseResult = null, IWorkload
5973
const int align = 10;
6074
const string separator = " ";
6175

62-
reporter.WriteLine($" {'[' + workload.Key + ']'}");
76+
reporter.WriteLine($" [{workload.Key}]");
6377

6478
reporter.Write($"{separator}{CommonStrings.WorkloadSourceColumn}:");
6579
reporter.WriteLine($" {workload.Value,align}");
@@ -82,7 +96,13 @@ private static int ProcessArgs(ParseResult parseResult)
8296
if (parseResult.HasOption(InfoOption) && parseResult.RootSubCommandResult() == "workload")
8397
{
8498
ShowWorkloadsInfo(parseResult);
85-
Cli.Utils.Reporter.Output.WriteLine("");
99+
Reporter.Output.WriteLine(string.Empty);
100+
return 0;
101+
}
102+
else if (parseResult.HasOption(VersionOption) && parseResult.RootSubCommandResult() == "workload")
103+
{
104+
Reporter.Output.WriteLine(GetWorkloadsVersion());
105+
Reporter.Output.WriteLine(string.Empty);
86106
return 0;
87107
}
88108
return parseResult.HandleMissingCommand();
@@ -104,7 +124,7 @@ private static CliCommand ConstructCommand()
104124

105125
command.Validators.Add(commandResult =>
106126
{
107-
if (commandResult.GetResult(InfoOption) is null && !commandResult.Children.Any(child => child is CommandResult))
127+
if (commandResult.GetResult(InfoOption) is null && commandResult.GetResult(VersionOption) is null && !commandResult.Children.Any(child => child is System.CommandLine.Parsing.CommandResult))
108128
{
109129
commandResult.AddError(Tools.CommonLocalizableStrings.RequiredCommandNotPassed);
110130
}

‎src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ public WorkloadInfoHelper(
3636

3737
_targetSdkVersion = targetSdkVersion;
3838
userProfileDir ??= CliFolderPathCalculator.DotnetUserProfileFolderPath;
39-
var workloadManifestProvider =
39+
ManifestProvider =
4040
new SdkDirectoryWorkloadManifestProvider(dotnetPath,
4141
string.IsNullOrWhiteSpace(_targetSdkVersion)
4242
? currentSdkReleaseVersion.ToString()
4343
: _targetSdkVersion,
4444
userProfileDir, SdkDirectoryWorkloadManifestProvider.GetGlobalJsonPath(Environment.CurrentDirectory));
4545
WorkloadResolver = workloadResolver ?? NET.Sdk.WorkloadManifestReader.WorkloadResolver.Create(
46-
workloadManifestProvider, dotnetPath,
46+
ManifestProvider, dotnetPath,
4747
currentSdkReleaseVersion.ToString(), userProfileDir);
4848

4949
var restoreConfig = new RestoreActionConfig(Interactive: isInteractive);
@@ -62,6 +62,7 @@ public WorkloadInfoHelper(
6262
}
6363

6464
public IInstaller Installer { get; private init; }
65+
public SdkDirectoryWorkloadManifestProvider ManifestProvider { get; }
6566
public IWorkloadInstallationRecordRepository WorkloadRecordRepo { get; private init; }
6667
public IWorkloadResolver WorkloadResolver { get; private init; }
6768

‎src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.cs.xlf‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.de.xlf‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Cli/dotnet/commands/dotnet-workload/xlf/LocalizableStrings.es.xlf‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)