Skip to content

Commit 1b6d660

Browse files
authored
Fix DisableWorkloadResolverSentinelPath on .NET Framework (#40787)
As pointed out in dotnet/msbuild#10118, we currently look for the file in arch subfolders such as `MSBuild\Current\Bin\amd64\SdkResolvers`), which doesn't look expected. `SdkResolvers` is present only under the base (x86) installation path.
1 parent 97be90e commit 1b6d660

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ Copyright (c) .NET Foundation. All rights reserved.
141141
putting an EnableWorkloadResolver.sentinel file beside the MSBuild SDK resolver DLL -->
142142
<PropertyGroup Condition="'$(MSBuildEnableWorkloadResolver)' == ''">
143143
<__DisableWorkloadResolverSentinelPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildBinPath)\DisableWorkloadResolver.sentinel</__DisableWorkloadResolverSentinelPath>
144-
<__DisableWorkloadResolverSentinelPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildBinPath)\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver\DisableWorkloadResolver.sentinel</__DisableWorkloadResolverSentinelPath>
144+
<__DisableWorkloadResolverSentinelPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildToolsPath32)\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver\DisableWorkloadResolver.sentinel</__DisableWorkloadResolverSentinelPath>
145145
<MSBuildEnableWorkloadResolver Condition="!Exists('$(__DisableWorkloadResolverSentinelPath)')">true</MSBuildEnableWorkloadResolver>
146146
</PropertyGroup>
147147

0 commit comments

Comments
 (0)