File tree Expand file tree Collapse file tree 3 files changed +5
-4
lines changed
Cli/Microsoft.DotNet.Cli.Utils Expand file tree Collapse file tree 3 files changed +5
-4
lines changed Original file line number Diff line number Diff line change 107
107
<PropertyGroup >
108
108
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
109
109
<MicrosoftBuildPackageVersion >17.4.0-preview-22469-04</MicrosoftBuildPackageVersion >
110
- <!-- .NET Framework-targeted tasks will need to run in an MSBuild that is older than the very latest,
110
+ <MicrosoftBuildCurrentPackageVersion >$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion >
111
+ <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
111
112
so target one that matches the version in minimumMSBuildVersion.
112
113
113
114
This avoids the need to juggle references to packages that have been updated in newer MSBuild. -->
114
- <MicrosoftBuildPackageVersion Condition =" '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETFramework' and exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion')" >$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion >
115
+ <MicrosoftBuildPackageVersion Condition =" exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion')" >$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion >
115
116
<MicrosoftBuildFrameworkPackageVersion >$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion >
116
117
<MicrosoftBuildRuntimePackageVersion >$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion >
117
118
<MicrosoftBuildLocalizationPackageVersion >17.4.0-preview-22469-04</MicrosoftBuildLocalizationPackageVersion >
Original file line number Diff line number Diff line change 22
22
23
23
<Target Name =" VerifyMSBuildDependency" BeforeTargets =" ResolveAssemblyReferences" Condition =" '$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETCoreApp'" >
24
24
<PropertyGroup >
25
- <MSBuildPathInPackage >$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7 .0\MSBuild.dll</MSBuildPathInPackage >
25
+ <MSBuildPathInPackage >$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6 .0\MSBuild.dll</MSBuildPathInPackage >
26
26
</PropertyGroup >
27
27
<Error Condition =" !Exists('$(MSBuildPathInPackage)')" Text =" Something moved around in Microsoft.Build.Runtime, adjust code here accordingly." />
28
28
<ItemGroup >
Original file line number Diff line number Diff line change 7
7
</PropertyGroup >
8
8
9
9
<ItemGroup >
10
- <PackageReference Include =" Microsoft.Build.Runtime" Version =" $(MicrosoftBuildRuntimePackageVersion )" />
10
+ <PackageReference Include =" Microsoft.Build.Runtime" Version =" $(MicrosoftBuildRuntimeCurrentPackageVersion )" />
11
11
<PackageReference Include =" Microsoft.Build.Localization" Version =" $(MicrosoftBuildLocalizationPackageVersion)" />
12
12
<PackageReference Include =" System.Resources.Extensions" Version =" $(SystemResourcesExtensionsPackageVersion)" />
13
13
</ItemGroup >
You can’t perform that action at this time.
0 commit comments