Skip to content

Commit 749beb4

Browse files
authored
use stage 2 MSBuild version instead of stage 0 for msbuild disjoint c… (#42551)
2 parents 0fe3fbd + 0d87bb2 commit 749beb4

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/Installer/redist-installer/targets/GenerateBundledVersions.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,9 @@ Copyright (c) .NET Foundation. All rights reserved.
12471247
<PropertyGroup>
12481248
<MinimumMSBuildVersionFile>$(RedistLayoutPath)sdk/$(Version)/minimumMSBuildVersion</MinimumMSBuildVersionFile>
12491249
<BundledMSBuildPropsFileName>Microsoft.NETCoreSdk.BundledMSBuildInformation.props</BundledMSBuildPropsFileName>
1250-
<BundledMSBuildVersion>$(MSBuildVersion)</BundledMSBuildVersion>
1250+
<_ShippingMSBuildVersion>$(MicrosoftBuildVersion)</_ShippingMSBuildVersion>
1251+
<_ShippingMSBuildVersion Condition="$(_ShippingMSBuildVersion.Contains('-'))">$(MicrosoftBuildVersion.Split('-')[0])</_ShippingMSBuildVersion>
1252+
<BundledMSBuildVersion>$(_ShippingMSBuildVersion)</BundledMSBuildVersion>
12511253
</PropertyGroup>
12521254

12531255
<Error Text="No MSBuild version file found under '$(RedistLayoutPath)sdk/$(Version)'" Condition="!Exists('$(MinimumMSBuildVersionFile)')" />

0 commit comments

Comments
 (0)