Skip to content

Commit de37e9c

Browse files
committed
!fixup! Correct version substitutions
- do not change 4.5.1 to 5.0.0-preview.8.20354.5 - use RTM assemblies when building on Linux and macOS
1 parent 2114a73 commit de37e9c

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

eng/targets/ResolveReferences.targets

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,15 +222,16 @@
222222
LeftKey="Filename"
223223
ItemSpecToUse="Left"
224224
LeftMetadata="*"
225-
RightMetadata="RTMVersion">
225+
RightMetadata="RTMVersion;Version">
226226
<Output TaskParameter="JoinResult" ItemName="_ResolvedCompileFileDefinitionsToChange" />
227227
</JoinItems>
228228

229229
<ItemGroup>
230230
<ResolvedCompileFileDefinitions Remove="@(_ResolvedCompileFileDefinitionsToChange)" />
231231

232+
<!-- Ignore %(NuGetPackageVersion) when doing substitution because some projects use downlevel packages. -->
232233
<_ResolvedCompileFileDefinitionsToChange
233-
HintPath="$([System.String]::new('%(Identity)').Replace('\%(NuGetPackageVersion)\', '\%(RTMVersion)\'))" />
234+
HintPath="$([System.String]::new('%(Identity)').Replace('\%(Version)\', '\%(RTMVersion)\').Replace('/%(Version)/', '/%(RTMVersion)/'))" />
234235
<ResolvedCompileFileDefinitions Include="@(_ResolvedCompileFileDefinitionsToChange -> '%(HintPath)')" />
235236

236237
<_ResolvedCompileFileDefinitionsToChange Remove="@(_ResolvedCompileFileDefinitionsToChange)" />

0 commit comments

Comments
 (0)