From 38d3bc975b84288f818e2c1ec570c2e55f74922d Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Fri, 1 Feb 2019 09:11:31 +0100 Subject: [PATCH 1/2] Bump corert Commit list for mono/corert: * mono/corert@1b7d4a1e4 [Number] make double 0.0 cmp more portable (#30) * mono/corert@c4ae51646 Update ISOWeek.cs * mono/corert@7e8bf2382 fix ISOWeek for mcs * mono/corert@0e5f123f6 [corlib] Import System.IO.Stream/BufferedStream from CoreFX (#26) Diff: https://github.com/mono/corert/compare/b6a822b7424dab39eee81f0c08160f996c9e9e27...1b7d4a1e4bd79305905338827cc41eb8303364f0 --- external/corert | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/corert b/external/corert index b6a822b7424d..1b7d4a1e4bd7 160000 --- a/external/corert +++ b/external/corert @@ -1 +1 @@ -Subproject commit b6a822b7424dab39eee81f0c08160f996c9e9e27 +Subproject commit 1b7d4a1e4bd79305905338827cc41eb8303364f0 From 1905006649d8f9ef92a7a3b2782940823b336655 Mon Sep 17 00:00:00 2001 From: monojenkins Date: Mon, 4 Feb 2019 12:46:26 +0000 Subject: [PATCH 2/2] [csproj] Update project files --- bcl.sln | 6 ++++-- mcs/class/Mono.CSharp/Mono.CSharp.csproj | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/bcl.sln b/bcl.sln index f754f24f6afd..97904e4dc790 100644 --- a/bcl.sln +++ b/bcl.sln @@ -3366,8 +3366,10 @@ Global {817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|wasm.ActiveCfg = Release|net_4_x {817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|winaot.ActiveCfg = Debug|net_4_x {817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|winaot.ActiveCfg = Release|net_4_x - {817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|xammac.ActiveCfg = Debug|net_4_x - {817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|xammac.ActiveCfg = Release|net_4_x + {817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|xammac.ActiveCfg = Debug|xammac + {817CE046-07E8-409D-84BF-A6EA4F2879DE}.Debug|xammac.Build.0 = Debug|xammac + {817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|xammac.ActiveCfg = Release|xammac + {817CE046-07E8-409D-84BF-A6EA4F2879DE}.Release|xammac.Build.0 = Release|xammac {8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|net_4_x.ActiveCfg = Debug|net_4_x {8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Debug|net_4_x.Build.0 = Debug|net_4_x {8787A3B7-8A19-4586-8DCF-6F5914FD48D5}.Release|net_4_x.ActiveCfg = Release|net_4_x diff --git a/mcs/class/Mono.CSharp/Mono.CSharp.csproj b/mcs/class/Mono.CSharp/Mono.CSharp.csproj index 88a047860e25..3e87b69a2707 100644 --- a/mcs/class/Mono.CSharp/Mono.CSharp.csproj +++ b/mcs/class/Mono.CSharp/Mono.CSharp.csproj @@ -75,6 +75,11 @@ ./../../class/obj/$(AssemblyName)-testing_aot_full NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;IOS_REFLECTION;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START + + ./../../class/lib/xammac + ./../../class/obj/$(AssemblyName)-xammac + NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START + ./../../class/lib/xammac_net_4_5 ./../../class/obj/$(AssemblyName)-xammac_net_4_5 @@ -123,6 +128,9 @@ + + +