mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.2.1.124

Browse Source 
Former-commit-id: 3b6a300a4ce80578c93599ba6e26a8f66743cde0
This commit is contained in:
Xamarin Public Jenkins
2015-12-09 05:54:53 -05:00
parent 4c37e28ac4
commit d11e8b35fd
33 changed files with 84 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
msvc/libmonoruntime.vcxproj
View File

@@ -71,13 +71,11 @@
<ClCompile Include="..\mono\metadata\mono-basic-block.c" />
<ClCompile Include="..\mono\metadata\mono-config.c" />
<ClCompile Include="..\mono\metadata\mono-config-dirs.c" />
<ClCompile Include="..\mono\metadata\mono-cq.c" />
<ClCompile Include="..\mono\metadata\mono-debug.c" />
<ClCompile Include="..\mono\metadata\mono-endian.c" />
<ClCompile Include="..\mono\metadata\mono-hash.c" />
<ClCompile Include="..\mono\metadata\mono-mlist.c" />
<ClCompile Include="..\mono\metadata\mono-perfcounters.c" />
<ClCompile Include="..\mono\metadata\mono-wsq.c" />
<ClCompile Include="..\mono\metadata\nacl-stub.c" />
<ClCompile Include="..\mono\metadata\null-gc.c" />
<ClCompile Include="..\mono\metadata\number-ms.c" />
@@ -129,8 +127,6 @@
<ClCompile Include="..\mono\metadata\socket-io.c" />
<ClCompile Include="..\mono\metadata\string-icalls.c" />
<ClCompile Include="..\mono\metadata\sysmath.c" />
<ClCompile Include="..\mono\metadata\threadpool.c" />
<ClCompile Include="..\mono\metadata\tpool-poll.c" />
<ClCompile Include="..\mono\metadata\threads.c" />
<ClCompile Include="..\mono\metadata\verify.c" />
<ClCompile Include="..\mono\mini\mini-cross-helpers.c" />
@@ -178,7 +174,6 @@
<ClInclude Include="..\mono\metadata\mono-basic-block.h" />
<ClInclude Include="..\mono\metadata\mono-config.h" />
<ClInclude Include="..\mono\metadata\mono-config-dirs.h" />
<ClInclude Include="..\mono\metadata\mono-cq.h" />
<ClInclude Include="..\mono\metadata\mono-debug-debugger.h" />
<ClInclude Include="..\mono\metadata\mono-debug.h" />
<ClInclude Include="..\mono\metadata\mono-endian.h" />
@@ -187,7 +182,6 @@
<ClInclude Include="..\mono\metadata\mono-perfcounters-def.h" />
<ClInclude Include="..\mono\metadata\mono-perfcounters.h" />
<ClInclude Include="..\mono\metadata\mono-ptr-array.h" />
<ClInclude Include="..\mono\metadata\mono-wsq.h" />
<ClInclude Include="..\mono\metadata\normalization-tables.h" />
<ClInclude Include="..\mono\metadata\number-formatter.h" />
<ClInclude Include="..\mono\metadata\object-internals.h" />
@@ -226,8 +220,6 @@
<ClInclude Include="..\mono\metadata\string-icalls.h" />
<ClInclude Include="..\mono\metadata\sysmath.h" />
<ClInclude Include="..\mono\metadata\tabledefs.h" />
<ClInclude Include="..\mono\metadata\threadpool-internals.h" />
<ClInclude Include="..\mono\metadata\threadpool.h" />
<ClInclude Include="..\mono\metadata\threads-types.h" />
<ClInclude Include="..\mono\metadata\verify-internals.h" />
<ClInclude Include="..\mono\metadata\verify.h" />
@@ -483,4 +475,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

4
msvc/libmonoutils.vcxproj
View File

@@ -180,7 +180,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
<Import Project=".\masm.fixed.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -297,4 +297,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>
</Project>

2
msvc/mono.def
View File

@@ -472,8 +472,6 @@ mono_install_assembly_refonly_preload_hook
mono_install_assembly_refonly_search_hook
mono_install_assembly_search_hook
mono_install_runtime_cleanup
mono_install_threadpool_item_hooks
mono_install_threadpool_thread_hooks
mono_install_unhandled_exception_hook
mono_invoke_unhandled_exception_hook
mono_is_debugger_attached

22
msvc/mono.sln
View File

@@ -51,12 +51,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profiler-logging", "profile
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profiler-cov", "profiler-cov.vcxproj", "{83D4D926-2983-4770-BA92-EB9CB8828C95}"
ProjectSection(ProjectDependencies) = postProject
{CB0D9E92-293C-439C-9AC7-C5F59B6E0771} = {CB0D9E92-293C-439C-9AC7-C5F59B6E0771}
{158073ED-99AE-4196-9EDC-DDB2344F8466} = {158073ED-99AE-4196-9EDC-DDB2344F8466}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jay", "..\mcs\jay\jay.vcxproj", "{5D485D32-3B9F-4287-AB24-C8DA5B89F537}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "profiler-codeanalyst", "profiler-codeanalyst.vcxproj", "{8FEF7F9E-F5F3-470E-91F4-404B7D6BC1BB}"
@@ -273,21 +267,6 @@ Global
{86663B87-4CD2-42B6-8D8E-C79DA1CCDEE6}.Release_SGen|x64.ActiveCfg = Release|x64
{86663B87-4CD2-42B6-8D8E-C79DA1CCDEE6}.Release|Win32.ActiveCfg = Release|Win32
{86663B87-4CD2-42B6-8D8E-C79DA1CCDEE6}.Release|x64.ActiveCfg = Release|x64
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug_SGen|Win32.ActiveCfg = Debug|Win32
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug_SGen|x64.ActiveCfg = Debug|x64
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug_SGen|x64.Build.0 = Debug|x64
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug|Win32.ActiveCfg = Debug|Win32
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug|Win32.Build.0 = Debug|Win32
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug|x64.ActiveCfg = Debug|x64
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Debug|x64.Build.0 = Debug|x64
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release_SGen|Win32.ActiveCfg = Release|Win32
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release_SGen|Win32.Build.0 = Release|Win32
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release_SGen|x64.ActiveCfg = Release|x64
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release_SGen|x64.Build.0 = Release|x64
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release|Win32.ActiveCfg = Release|Win32
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release|Win32.Build.0 = Release|Win32
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release|x64.ActiveCfg = Release|x64
{83D4D926-2983-4770-BA92-EB9CB8828C95}.Release|x64.Build.0 = Release|x64
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug_SGen|Win32.ActiveCfg = Debug|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug_SGen|Win32.Build.0 = Debug|Win32
{5D485D32-3B9F-4287-AB24-C8DA5B89F537}.Debug_SGen|x64.ActiveCfg = Debug|Win32
@@ -371,7 +350,6 @@ Global
{C36612BD-22D3-4B95-85E2-7FDC4FC5D739} = {0EBA83B7-0EB4-4C83-A900-77300A97E8B1}
{80A0620A-3478-4E1A-AA7C-0D2387B892AB} = {ECA11C76-E192-4F67-A8FA-28B637D9716F}
{5A435710-E6D2-4DD4-9B3F-A7239A32C6F4} = {ECA11C76-E192-4F67-A8FA-28B637D9716F}
{83D4D926-2983-4770-BA92-EB9CB8828C95} = {4CFD7702-60B2-4E82-BFAD-FCBB53EB4DA2}
{8FEF7F9E-F5F3-470E-91F4-404B7D6BC1BB} = {4CFD7702-60B2-4E82-BFAD-FCBB53EB4DA2}
{86663B87-4CD2-42B6-8D8E-C79DA1CCDEE6} = {4CFD7702-60B2-4E82-BFAD-FCBB53EB4DA2}
{F51017F9-B7FB-4F87-B7B5-12799D965783} = {4CFD7702-60B2-4E82-BFAD-FCBB53EB4DA2}