Skip to content

Commit 13c4ef5

Browse files
nagilsonnagilson
authored
Merge branch 'release/9.0.1xx-preview7' into darc-release/9.0.1xx-preview7-cf1c44a1-55c1-4f72-9538-5a022ad920c9
2 parents 2e9008c + 557f8b8 commit 13c4ef5

File tree

8 files changed

+130
-75
lines changed

8 files changed

+130
-75
lines changed

‎eng/Version.Details.xml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -93,43 +93,43 @@
9393
<Sha>c14b2b7bfec6cbaadea1951196118a6cb95aeb4a</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
96-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-1.24372.7">
96+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-1.24372.18">
9797
<Uri>https://github.com/dotnet/roslyn</Uri>
98-
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
98+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
9999
</Dependency>
100100
<!-- Intermediate is necessary for source build. -->
101-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-1.24372.7">
101+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-1.24372.18">
102102
<Uri>https://github.com/dotnet/roslyn</Uri>
103-
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
103+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
104104
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
105105
</Dependency>
106-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-1.24372.7">
106+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.12.0-1.24372.18">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108-
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
108+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-1.24372.7">
110+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.12.0-1.24372.18">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
112+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-1.24372.7">
114+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-1.24372.18">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
116+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-1.24372.7">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.12.0-1.24372.18">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
120+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-1.24372.7">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-1.24372.18">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
124+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-1.24372.7">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-1.24372.18">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
128+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-1.24372.7">
130+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-1.24372.18">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>a54b3d37a6e65feb5c25a9320f9ee63b0aaa87c6</Sha>
132+
<Sha>aea9e82da403c397265f7fd0fefee5ebbb886179</Sha>
133133
</Dependency>
134134
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-preview.7.24372.9">
135135
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -246,26 +246,26 @@
246246
<Uri>https://github.com/dotnet/runtime</Uri>
247247
<Sha>1f70f0cc663b5d45f77840e9728386e5fa7944f9</Sha>
248248
</Dependency>
249-
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.7.24372.2">
249+
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.7.24373.1">
250250
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
251-
<Sha>8c30fff21aec51c13d23cee7d0a7aa9fdba1c831</Sha>
251+
<Sha>f565396bbe92ec8a0097fdf49692952dbf458b20</Sha>
252252
<SourceBuildTarball RepoName="windowsdesktop" ManagedOnly="true" />
253253
</Dependency>
254-
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24372.2">
254+
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0" Version="9.0.0-preview.7.24373.1">
255255
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
256-
<Sha>8c30fff21aec51c13d23cee7d0a7aa9fdba1c831</Sha>
256+
<Sha>f565396bbe92ec8a0097fdf49692952dbf458b20</Sha>
257257
</Dependency>
258-
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.7.24372.2">
258+
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="9.0.0-preview.7.24373.1">
259259
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
260-
<Sha>8c30fff21aec51c13d23cee7d0a7aa9fdba1c831</Sha>
260+
<Sha>f565396bbe92ec8a0097fdf49692952dbf458b20</Sha>
261261
</Dependency>
262-
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.7.24372.2">
262+
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0" Version="9.0.0-preview.7.24373.1">
263263
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
264-
<Sha>8c30fff21aec51c13d23cee7d0a7aa9fdba1c831</Sha>
264+
<Sha>f565396bbe92ec8a0097fdf49692952dbf458b20</Sha>
265265
</Dependency>
266-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-preview.7.24372.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
266+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="9.0.0-preview.7.24373.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
267267
<Uri>https://github.com/dotnet/wpf</Uri>
268-
<Sha>1bb5c431ea0474f5b433b1d766a303167d640ccd</Sha>
268+
<Sha>d5a5a2cf36826893ebda2b37286fcfa2f3d2fb18</Sha>
269269
</Dependency>
270270
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="9.0.0-preview.7.24372.9">
271271
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@@ -317,22 +317,22 @@
317317
<Sha>ed7ea4042be01dad1d45397173df5a3738a2e650</Sha>
318318
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
319319
</Dependency>
320-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24372.4">
320+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24373.1">
321321
<Uri>https://github.com/dotnet/razor</Uri>
322-
<Sha>27e921a6992ebe18d44fe59ffb860f032cd9f98a</Sha>
322+
<Sha>9ae2a8541c1968055ec917c2448ece623d769aad</Sha>
323323
</Dependency>
324-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24372.4">
324+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.24373.1">
325325
<Uri>https://github.com/dotnet/razor</Uri>
326-
<Sha>27e921a6992ebe18d44fe59ffb860f032cd9f98a</Sha>
326+
<Sha>9ae2a8541c1968055ec917c2448ece623d769aad</Sha>
327327
</Dependency>
328-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24372.4">
328+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.24373.1">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330-
<Sha>27e921a6992ebe18d44fe59ffb860f032cd9f98a</Sha>
330+
<Sha>9ae2a8541c1968055ec917c2448ece623d769aad</Sha>
331331
</Dependency>
332332
<!-- Intermediate is necessary for source build. -->
333-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.24372.4">
333+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.24373.1">
334334
<Uri>https://github.com/dotnet/razor</Uri>
335-
<Sha>27e921a6992ebe18d44fe59ffb860f032cd9f98a</Sha>
335+
<Sha>9ae2a8541c1968055ec917c2448ece623d769aad</Sha>
336336
<SourceBuild RepoName="razor" ManagedOnly="true" />
337337
</Dependency>
338338
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.0-preview.7.24372.9">
@@ -382,13 +382,13 @@
382382
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
383383
</Dependency>
384384
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
385-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.7.24368.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
385+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="9.0.0-preview.7.24371.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
386386
<Uri>https://github.com/dotnet/winforms</Uri>
387-
<Sha>1fe50581398f481ac2abaa470b79c565f2b42e41</Sha>
387+
<Sha>d89527ce140a396301fec098e85b34bca9d2f694</Sha>
388388
</Dependency>
389-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.7.24372.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
389+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="9.0.0-preview.7.24373.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
390390
<Uri>https://github.com/dotnet/wpf</Uri>
391-
<Sha>1bb5c431ea0474f5b433b1d766a303167d640ccd</Sha>
391+
<Sha>d5a5a2cf36826893ebda2b37286fcfa2f3d2fb18</Sha>
392392
</Dependency>
393393
<Dependency Name="Microsoft.Web.Xdt" Version="9.0.0-preview.24317.2">
394394
<Uri>https://github.com/dotnet/xdt</Uri>

‎eng/Versions.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
</PropertyGroup>
111111
<PropertyGroup>
112112
<!-- Dependency from https://github.com/dotnet/winforms -->
113-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24368.5</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
113+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.7.24371.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
114114
</PropertyGroup>
115115
<PropertyGroup>
116116
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -161,10 +161,10 @@
161161
</PropertyGroup>
162162
<PropertyGroup>
163163
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
164-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24372.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
165-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24372.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
166-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24372.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
167-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24372.2</MicrosoftWindowsDesktopAppRefPackageVersion>
164+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24373.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
165+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24373.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
166+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24373.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
167+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24373.1</MicrosoftWindowsDesktopAppRefPackageVersion>
168168
</PropertyGroup>
169169
<PropertyGroup>
170170
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -230,14 +230,14 @@
230230
</PropertyGroup>
231231
<PropertyGroup>
232232
<!-- Dependencies from https://github.com/dotnet/roslyn -->
233-
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24372.7</MicrosoftNetCompilersToolsetVersion>
234-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24372.7</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisPackageVersion>
236-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisCSharpPackageVersion>
237-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24372.7</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
233+
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24372.18</MicrosoftNetCompilersToolsetVersion>
234+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24372.18</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisPackageVersion>
236+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpPackageVersion>
237+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
241241
</PropertyGroup>
242242
<PropertyGroup>
243243
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -257,14 +257,14 @@
257257
</PropertyGroup>
258258
<PropertyGroup>
259259
<!-- Dependencies from https://github.com/dotnet/razor -->
260-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24372.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
261-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24372.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
262-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24372.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
260+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24373.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
261+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24373.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
262+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24373.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
263263
</PropertyGroup>
264264
<PropertyGroup>
265265
<!-- Dependencies from https://github.com/dotnet/wpf -->
266-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24372.1</MicrosoftNETSdkWindowsDesktopPackageVersion>
267-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24372.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
266+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-preview.7.24373.3</MicrosoftNETSdkWindowsDesktopPackageVersion>
267+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.7.24373.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
268268
</PropertyGroup>
269269
<PropertyGroup Label="Runtime and Apphost aliases">
270270
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->

‎src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -177,31 +177,28 @@ bool TryGetWorkloadSet(string workloadSetVersion, out WorkloadSet? workloadSet)
177177
}
178178
}
179179

180+
_installStateFilePath = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkVersionBand, _sdkRootPath), "default.json");
181+
var installState = InstallStateContents.FromPath(_installStateFilePath);
180182
if (_workloadSet is null)
181183
{
182-
var installStateFilePath = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkVersionBand, _sdkRootPath), "default.json");
183-
if (File.Exists(installStateFilePath))
184+
if (!string.IsNullOrEmpty(installState.WorkloadVersion))
184185
{
185-
var installState = InstallStateContents.FromPath(installStateFilePath);
186-
if (!string.IsNullOrEmpty(installState.WorkloadVersion))
186+
if (!TryGetWorkloadSet(installState.WorkloadVersion!, out _workloadSet))
187187
{
188-
if (!TryGetWorkloadSet(installState.WorkloadVersion!, out _workloadSet))
189-
{
190-
throw new FileNotFoundException(string.Format(Strings.WorkloadVersionFromInstallStateNotFound, installState.WorkloadVersion, installStateFilePath));
191-
}
188+
throw new FileNotFoundException(string.Format(Strings.WorkloadVersionFromInstallStateNotFound, installState.WorkloadVersion, _installStateFilePath));
192189
}
193-
194-
// Note: It is possible here to have both a workload set and loose manifests listed in the install state. This might happen if there is a
195-
// third-party workload manifest installed that's not part of the workload set
196-
_manifestsFromInstallState = installState.Manifests is null ? null : WorkloadSet.FromDictionaryForJson(installState.Manifests!, _sdkVersionBand);
197-
_installStateFilePath = installStateFilePath;
198190
}
191+
192+
// Note: It is possible here to have both a workload set and loose manifests listed in the install state. This might happen if there is a
193+
// third-party workload manifest installed that's not part of the workload set
194+
_manifestsFromInstallState = installState.Manifests is null ? null : WorkloadSet.FromDictionaryForJson(installState.Manifests!, _sdkVersionBand);
199195
}
200196

201-
if (_workloadSet == null && availableWorkloadSets.Any())
197+
if (_workloadSet == null && installState.UseWorkloadSets == true && availableWorkloadSets.Any())
202198
{
203199
var maxWorkloadSetVersion = availableWorkloadSets.Keys.Aggregate((s1, s2) => VersionCompare(s1, s2) >= 0 ? s1 : s2);
204200
_workloadSet = availableWorkloadSets[maxWorkloadSetVersion.ToString()];
201+
_useManifestsFromInstallState = false;
205202
}
206203
}
207204

0 commit comments

Comments
 (0)