Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 2f531ea

Browse files
committed
Hardcode LKG version of ucrtbased.dll (#25444)
* Hardcode LKG version of ucrtbased.dll * Only use hardcoded UCRT version when search path fails * Add missing single-quotes
1 parent 17112db commit 2f531ea

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

tests/src/Interop/Interop.settings.targets

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525

2626
<None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(Platform)/Microsoft.VC*.DebugCRT/vcruntime*d.dll" CopyToOutputDirectory="Always" />
2727
<None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(Platform)/Microsoft.VC*.DebugCRT/msvcp*d.dll" CopyToOutputDirectory="Always" />
28-
<None Include="$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(Platform)/ucrtbased.dll" CopyToOutputDirectory="Always" />
28+
<None Include="$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(Platform)/ucrtbased.dll" CopyToOutputDirectory="Always"
29+
Condition="Exists('$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(Platform)/ucrtbased.dll')" />
30+
31+
<!-- There's a bug in VS that causes UCRTVersion env var to get set to a version that isn't actually installed on the machine. -->
32+
<!-- Until that gets resolved, we need this workaround to grab the last "known" good version of ucrtbased.dll -->
33+
<None Include="$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/10.0.17763.0/Redist/Debug/$(Platform)/ucrtbased.dll" CopyToOutputDirectory="Always"
34+
Condition="!Exists('$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(Platform)/ucrtbased.dll')" />
2935
</ItemGroup>
3036
</Project>

0 commit comments

Comments
 (0)