diff options
| author | Johan Lorensson <lateralusx.github@gmail.com> | 2017-09-26 09:33:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 09:33:40 +0300 |
| commit | f0cb764a7eaf46ef5c71feab8d505091fd257b42 (patch) | |
| tree | a7e5da42ff402faff346f6112d1b726569a8df5d /msvc | |
| parent | 932a58ea407d6878d610cbe516d901293977aba1 (diff) | |
| parent | 1df9fdf61349296ce621e3ef73d5cc594cdbb539 (diff) | |
Merge pull request #5433 from lateralusX/lateralusX/windows-mono-debugger-soft-hang
Fix sporadic hang in Mono.Debugger.Soft test suite on Windows.
Diffstat (limited to 'msvc')
| -rw-r--r-- | msvc/libmonoutils.vcxproj | 6 | ||||
| -rw-r--r-- | msvc/libmonoutils.vcxproj.filters | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/msvc/libmonoutils.vcxproj b/msvc/libmonoutils.vcxproj index 350a54654e4..beba4278b8e 100644 --- a/msvc/libmonoutils.vcxproj +++ b/msvc/libmonoutils.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -68,6 +68,7 @@ <ClCompile Include="..\mono\utils\mono-mmap-windows.c" />
<ClCompile Include="..\mono\utils\mono-mmap.c" />
<ClCompile Include="..\mono\utils\mono-networkinterfaces.c" />
+ <ClCompile Include="..\mono\utils\mono-os-wait-win32.c" />
<ClCompile Include="..\mono\utils\mono-proclib-windows.c" />
<ClCompile Include="..\mono\utils\mono-rand-windows.c" />
<ClCompile Include="..\mono\utils\mono-rand.c" />
@@ -165,6 +166,7 @@ <ClInclude Include="..\mono\utils\mono-once.h" />
<ClInclude Include="..\mono\utils\mono-os-mutex.h" />
<ClInclude Include="..\mono\utils\mono-os-semaphore.h" />
+ <ClInclude Include="..\mono\utils\mono-os-wait.h" />
<ClInclude Include="..\mono\utils\mono-path.h" />
<ClInclude Include="..\mono\utils\mono-poll.h" />
<ClInclude Include="..\mono\utils\mono-proclib-windows-internals.h" />
@@ -189,7 +191,7 @@ <ClInclude Include="..\mono\utils\strenc.h" />
<ClInclude Include="..\mono\utils\valgrind.h" />
<ClInclude Include="..\mono\utils\atomic.h" />
- <ClInclude Include="..\mono\utils\unlocked.h" /> + <ClInclude Include="..\mono\utils\unlocked.h" />
<ClInclude Include="..\mono\utils\mono-hwcap.h" />
<ClInclude Include="..\mono\utils\mono-hwcap-x86.h" />
<ClInclude Include="..\mono\utils\bsearch.h" />
diff --git a/msvc/libmonoutils.vcxproj.filters b/msvc/libmonoutils.vcxproj.filters index a8b85cafce8..e4b82690a18 100644 --- a/msvc/libmonoutils.vcxproj.filters +++ b/msvc/libmonoutils.vcxproj.filters @@ -193,6 +193,9 @@ <ClCompile Include="..\mono\utils\mono-os-mutex.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\mono\utils\mono-os-wait-win32.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\mono\utils\atomic.h">
@@ -417,9 +420,12 @@ <ClInclude Include="..\mono\utils\os-event.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\mono\utils\unlocked.h"> - <Filter>Header Files</Filter> - </ClInclude> + <ClInclude Include="..\mono\utils\unlocked.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\mono\utils\mono-os-wait.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="Header Files">
|