diff options
| author | William Godbe <wigodbe@microsoft.com> | 2019-06-26 20:41:42 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2019-06-26 20:43:00 -0700 |
| commit | 2f531ea343cc59cd2389f6e4999c8cb3381f05d3 (patch) | |
| tree | d469d338de11ae127eea7da38df737a290b837fc /tests | |
| parent | 17112db9d9a4e3aa6c5280ce2059796e168de0f9 (diff) | |
| download | coreclr-2f531ea343cc59cd2389f6e4999c8cb3381f05d3.tar.gz coreclr-2f531ea343cc59cd2389f6e4999c8cb3381f05d3.tar.bz2 coreclr-2f531ea343cc59cd2389f6e4999c8cb3381f05d3.zip | |
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/Interop/Interop.settings.targets | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/src/Interop/Interop.settings.targets b/tests/src/Interop/Interop.settings.targets index 117a54f012..f56113cf9f 100644 --- a/tests/src/Interop/Interop.settings.targets +++ b/tests/src/Interop/Interop.settings.targets @@ -25,6 +25,12 @@ <None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(Platform)/Microsoft.VC*.DebugCRT/vcruntime*d.dll" CopyToOutputDirectory="Always" /> <None Include="$(VCToolsRedistDir)onecore/debug_nonredist/$(Platform)/Microsoft.VC*.DebugCRT/msvcp*d.dll" CopyToOutputDirectory="Always" /> - <None Include="$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(Platform)/ucrtbased.dll" CopyToOutputDirectory="Always" /> + <None Include="$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(Platform)/ucrtbased.dll" CopyToOutputDirectory="Always" + Condition="Exists('$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(Platform)/ucrtbased.dll')" /> + + <!-- 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. --> + <!-- Until that gets resolved, we need this workaround to grab the last "known" good version of ucrtbased.dll --> + <None Include="$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/10.0.17763.0/Redist/Debug/$(Platform)/ucrtbased.dll" CopyToOutputDirectory="Always" + Condition="!Exists('$(ExtensionSdkDir)/Microsoft.UniversalCRT.Debug/$(UCRTVersion)/Redist/Debug/$(Platform)/ucrtbased.dll')" /> </ItemGroup> </Project> |