Merged changes in master libmonoruntime into PR.

diff --git a/msvc/libmonoruntime-common.targets b/msvc/libmonoruntime-common.targets
index 67e0bc8e8379178bed6bec0c983732987292529e..2a18201825f5e6a9a57740ad8ff3682502d35360 100644 (file)
--- a/msvc/libmonoruntime-common.targets
+++ b/msvc/libmonoruntime-common.targets
@@ -152,8 +152,10 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-encode.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\sre-save.c" />
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\custom-attrs.c" />
-    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\fdhandle.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\fdhandle.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\fdhandle.c" />
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\callspec.h" />
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\callspec.c" />
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\runtime.h" />
   </ItemGroup>
   <ItemGroup Label="config_sources">

diff --git a/msvc/libmonoruntime-common.targets.filters b/msvc/libmonoruntime-common.targets.filters
index fdabb43654645d1f914353fa3b4f2e8c3f5ffa42..ed6eb918e58089531c4f39d79bdc65c85bb2c9ba 100644 (file)
--- a/msvc/libmonoruntime-common.targets.filters
+++ b/msvc/libmonoruntime-common.targets.filters
@@ -454,12 +454,18 @@
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\custom-attrs.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClCompile>
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\fdhandle.h">
+      <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClInclude>
     <ClCompile Include="$(MonoSourceLocation)\mono\metadata\fdhandle.c">
       <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClCompile>
-    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\fdhandle.h">
+    <ClInclude Include="$(MonoSourceLocation)\mono\metadata\callspec.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>
+    <ClCompile Include="$(MonoSourceLocation)\mono\metadata\callspec.c">
+      <Filter>Source Files$(MonoRuntimeFilterSubFolder)\common</Filter>
+    </ClCompile>
     <ClInclude Include="$(MonoSourceLocation)\mono\metadata\runtime.h">
       <Filter>Header Files$(MonoRuntimeFilterSubFolder)\common</Filter>
     </ClInclude>