Merge branch 'upstream'
Former-commit-id: 3817106a8e3305ab8104ed6193f5d355ced99707
This commit is contained in:
commit
f77e3b8388
mcs
class/lib/monolite
Mono.Security.dll.REMOVED.git-idSystem.Xml.dll.REMOVED.git-idSystem.dll.REMOVED.git-idbasic.exe.REMOVED.git-idmscorlib.dll.REMOVED.git-id
tools/xbuild
mono
po/mcs
@ -1 +1 @@
|
|||||||
c0601b9f4009f1bab9950f13bfc47c1bd2ab0633
|
1c8c63024e2890bc7bef625af05d4c2f6a8f7b5a
|
@ -1 +1 @@
|
|||||||
e76deb5174269b77c69662a96fa3321b040d91c5
|
70d2fcb59d657b9d2a69eaf92589ac8dd29b8ae5
|
@ -1 +1 @@
|
|||||||
ac019e412b2ae5715cf22065cd72c5765dd5aab5
|
433141ac44966433021bb18eca97d0c0bf1eba6e
|
@ -1 +1 @@
|
|||||||
57419ef38547f800bed1ac90debb76987485a936
|
d36f7fa35e1e825e33423f2bc7ed953ba7ab3d69
|
@ -1 +1 @@
|
|||||||
273bd37add87ac232bce4ae964cbae67b9954f6b
|
062186f53d20ad38ba65594e46aa800bcb9ec915
|
@ -109,5 +109,7 @@ EXTRA_DISTFILES = \
|
|||||||
targets/Microsoft.Portable.Core.targets \
|
targets/Microsoft.Portable.Core.targets \
|
||||||
targets/Microsoft.Portable.Core.props \
|
targets/Microsoft.Portable.Core.props \
|
||||||
targets/Microsoft.WebApplication.targets \
|
targets/Microsoft.WebApplication.targets \
|
||||||
|
targets/Microsoft.Portable.VisualBasic_4.0.targets \
|
||||||
|
targets/Microsoft.Portable.VisualBasic_4.5.targets \
|
||||||
xbuild.make \
|
xbuild.make \
|
||||||
xbuild_test.make
|
xbuild_test.make
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="..\Microsoft.Portable.Core.props" />
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||||
|
<Import Project="..\Microsoft.Portable.Core.targets" />
|
||||||
|
</Project>
|
@ -0,0 +1,5 @@
|
|||||||
|
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="..\Microsoft.Portable.Core.props" />
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
|
||||||
|
<Import Project="..\Microsoft.Portable.Core.targets" />
|
||||||
|
</Project>
|
@ -74,6 +74,9 @@ static char **extra_gac_paths = NULL;
|
|||||||
* The integer number is an index in the MonoRuntimeInfo structure, whose
|
* The integer number is an index in the MonoRuntimeInfo structure, whose
|
||||||
* values can be found in domain.c - supported_runtimes. Look there
|
* values can be found in domain.c - supported_runtimes. Look there
|
||||||
* to understand what remapping will be made.
|
* to understand what remapping will be made.
|
||||||
|
*
|
||||||
|
* .NET version can be found at https://github.com/dotnet/coreclr/blob/master/src/inc/fxretarget.h#L99
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
static const AssemblyVersionMap framework_assemblies [] = {
|
static const AssemblyVersionMap framework_assemblies [] = {
|
||||||
{"Accessibility", 0},
|
{"Accessibility", 0},
|
||||||
@ -102,6 +105,7 @@ static const AssemblyVersionMap framework_assemblies [] = {
|
|||||||
{"Npgsql", 0},
|
{"Npgsql", 0},
|
||||||
{"PEAPI", 0},
|
{"PEAPI", 0},
|
||||||
{"System", 0},
|
{"System", 0},
|
||||||
|
{"System.ComponentModel.Composition", 2},
|
||||||
{"System.ComponentModel.DataAnnotations", 2},
|
{"System.ComponentModel.DataAnnotations", 2},
|
||||||
{"System.Configuration", 0},
|
{"System.Configuration", 0},
|
||||||
{"System.Configuration.Install", 0},
|
{"System.Configuration.Install", 0},
|
||||||
@ -117,6 +121,8 @@ static const AssemblyVersionMap framework_assemblies [] = {
|
|||||||
{"System.Drawing", 0},
|
{"System.Drawing", 0},
|
||||||
{"System.Drawing.Design", 0},
|
{"System.Drawing.Design", 0},
|
||||||
{"System.EnterpriseServices", 0},
|
{"System.EnterpriseServices", 0},
|
||||||
|
{"System.IdentityModel", 3},
|
||||||
|
{"System.IdentityModel.Selectors", 3},
|
||||||
{"System.Management", 0},
|
{"System.Management", 0},
|
||||||
{"System.Messaging", 0},
|
{"System.Messaging", 0},
|
||||||
{"System.Net", 2},
|
{"System.Net", 2},
|
||||||
@ -124,6 +130,7 @@ static const AssemblyVersionMap framework_assemblies [] = {
|
|||||||
{"System.Runtime.Serialization", 3},
|
{"System.Runtime.Serialization", 3},
|
||||||
{"System.Runtime.Serialization.Formatters.Soap", 0},
|
{"System.Runtime.Serialization.Formatters.Soap", 0},
|
||||||
{"System.Security", 0},
|
{"System.Security", 0},
|
||||||
|
{"System.ServiceModel", 3},
|
||||||
{"System.ServiceModel.Web", 2},
|
{"System.ServiceModel.Web", 2},
|
||||||
{"System.ServiceProcess", 0},
|
{"System.ServiceProcess", 0},
|
||||||
{"System.Transactions", 0},
|
{"System.Transactions", 0},
|
||||||
|
@ -1 +1 @@
|
|||||||
#define FULL_VERSION "(detached/6d5afc1"
|
#define FULL_VERSION "(detached/11b5830"
|
||||||
|
BIN
po/mcs/de.gmo
BIN
po/mcs/de.gmo
Binary file not shown.
@ -1 +1 @@
|
|||||||
65ba119d7cf3ba2d6756ceef408fa6d3c1dc41f3
|
b18a93586930c4819afa4f63ebc2fd161de5c32e
|
BIN
po/mcs/es.gmo
BIN
po/mcs/es.gmo
Binary file not shown.
@ -1 +1 @@
|
|||||||
199ee54afc43f2c14d7b11947233338b4a06aaad
|
98858f5344ebf3d4d728c04aa06f70a98af639f9
|
BIN
po/mcs/ja.gmo
BIN
po/mcs/ja.gmo
Binary file not shown.
@ -1 +1 @@
|
|||||||
e8c87e11713ddafad0975aca279624dcc19e26f2
|
906d3946f50e849f48f31362a464c0784f9b48b4
|
@ -8,7 +8,7 @@ msgid ""
|
|||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: mono 4.0.1\n"
|
"Project-Id-Version: mono 4.0.1\n"
|
||||||
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
|
||||||
"POT-Creation-Date: 2015-05-15 04:26-0400\n"
|
"POT-Creation-Date: 2015-05-20 07:16-0400\n"
|
||||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
BIN
po/mcs/pt_BR.gmo
BIN
po/mcs/pt_BR.gmo
Binary file not shown.
@ -1 +1 @@
|
|||||||
03c731ab53b47f4e52a887e84858acb8c0e874e2
|
f860a69e98ef0e4954ebd899879a5c9baa6fd921
|
Loading…
x
Reference in New Issue
Block a user