diff --git a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id index 1c1b80757f..43da4b3e67 100644 --- a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -c0601b9f4009f1bab9950f13bfc47c1bd2ab0633 \ No newline at end of file +1c8c63024e2890bc7bef625af05d4c2f6a8f7b5a \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id index 9095711a28..dfff6413f9 100644 --- a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -e76deb5174269b77c69662a96fa3321b040d91c5 \ No newline at end of file +70d2fcb59d657b9d2a69eaf92589ac8dd29b8ae5 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.dll.REMOVED.git-id index 29a458eb10..13fa598873 100644 --- a/mcs/class/lib/monolite/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.dll.REMOVED.git-id @@ -1 +1 @@ -ac019e412b2ae5715cf22065cd72c5765dd5aab5 \ No newline at end of file +433141ac44966433021bb18eca97d0c0bf1eba6e \ No newline at end of file diff --git a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id index 53101bb36b..0b7f2f4f90 100644 --- a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id @@ -1 +1 @@ -57419ef38547f800bed1ac90debb76987485a936 \ No newline at end of file +d36f7fa35e1e825e33423f2bc7ed953ba7ab3d69 \ No newline at end of file diff --git a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id index 4d8d8708a1..8c423219d1 100644 --- a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -273bd37add87ac232bce4ae964cbae67b9954f6b \ No newline at end of file +062186f53d20ad38ba65594e46aa800bcb9ec915 \ No newline at end of file diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile index afa7c217fb..771184c305 100644 --- a/mcs/tools/xbuild/Makefile +++ b/mcs/tools/xbuild/Makefile @@ -109,5 +109,7 @@ EXTRA_DISTFILES = \ targets/Microsoft.Portable.Core.targets \ targets/Microsoft.Portable.Core.props \ targets/Microsoft.WebApplication.targets \ + targets/Microsoft.Portable.VisualBasic_4.0.targets \ + targets/Microsoft.Portable.VisualBasic_4.5.targets \ xbuild.make \ xbuild_test.make diff --git a/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets b/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets new file mode 100644 index 0000000000..bf58fee49b --- /dev/null +++ b/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.0.targets @@ -0,0 +1,5 @@ + + + + + diff --git a/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets b/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets new file mode 100644 index 0000000000..bf58fee49b --- /dev/null +++ b/mcs/tools/xbuild/targets/Microsoft.Portable.VisualBasic_4.5.targets @@ -0,0 +1,5 @@ + + + + + diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c index b385575858..4e97b3ea22 100644 --- a/mono/metadata/assembly.c +++ b/mono/metadata/assembly.c @@ -74,6 +74,9 @@ static char **extra_gac_paths = NULL; * The integer number is an index in the MonoRuntimeInfo structure, whose * values can be found in domain.c - supported_runtimes. Look there * 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 [] = { {"Accessibility", 0}, @@ -102,6 +105,7 @@ static const AssemblyVersionMap framework_assemblies [] = { {"Npgsql", 0}, {"PEAPI", 0}, {"System", 0}, + {"System.ComponentModel.Composition", 2}, {"System.ComponentModel.DataAnnotations", 2}, {"System.Configuration", 0}, {"System.Configuration.Install", 0}, @@ -117,6 +121,8 @@ static const AssemblyVersionMap framework_assemblies [] = { {"System.Drawing", 0}, {"System.Drawing.Design", 0}, {"System.EnterpriseServices", 0}, + {"System.IdentityModel", 3}, + {"System.IdentityModel.Selectors", 3}, {"System.Management", 0}, {"System.Messaging", 0}, {"System.Net", 2}, @@ -124,6 +130,7 @@ static const AssemblyVersionMap framework_assemblies [] = { {"System.Runtime.Serialization", 3}, {"System.Runtime.Serialization.Formatters.Soap", 0}, {"System.Security", 0}, + {"System.ServiceModel", 3}, {"System.ServiceModel.Web", 2}, {"System.ServiceProcess", 0}, {"System.Transactions", 0}, diff --git a/mono/mini/version.h b/mono/mini/version.h index 4e33370a7f..d11da73542 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "(detached/6d5afc1" +#define FULL_VERSION "(detached/11b5830" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index b39d8ae73c..69b19bfc67 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index ac2d809e7f..e2b310450f 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -65ba119d7cf3ba2d6756ceef408fa6d3c1dc41f3 \ No newline at end of file +b18a93586930c4819afa4f63ebc2fd161de5c32e \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 9a9d84572d..42e25e0ff0 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index ca149736b2..a7f52930b6 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -199ee54afc43f2c14d7b11947233338b4a06aaad \ No newline at end of file +98858f5344ebf3d4d728c04aa06f70a98af639f9 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index bb7eae1ff6..5b5d87472d 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index afb8c168ee..949d2668f4 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -e8c87e11713ddafad0975aca279624dcc19e26f2 \ No newline at end of file +906d3946f50e849f48f31362a464c0784f9b48b4 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index a705063d8c..345b99cf61 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mono 4.0.1\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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 4ef4c1f643..d38187de26 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index e4de31f88f..7c2d176011 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -03c731ab53b47f4e52a887e84858acb8c0e874e2 \ No newline at end of file +f860a69e98ef0e4954ebd899879a5c9baa6fd921 \ No newline at end of file