From 9da4a6d09bbb8a98b9825797b7ebf7124c254ca5 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 11 Dec 2017 10:45:51 -0500 Subject: [PATCH 01/22] Bump to mono:2017-12 --- .gitmodules | 2 +- Configuration.props | 4 ++-- build-tools/dependencies/dependencies.projitems | 4 ++-- external/Java.Interop | 2 +- external/llvm | 2 +- external/mono | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6ad93cededd..7656774ae89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [submodule "external/mono"] path = external/mono url = https://github.com/mono/mono.git - branch = 2017-10 + branch = 2017-12 [submodule "external/mxe"] path = external/mxe url = https://github.com/xamarin/mxe.git diff --git a/Configuration.props b/Configuration.props index 7074d85a246..cc984158c2b 100644 --- a/Configuration.props +++ b/Configuration.props @@ -54,8 +54,8 @@ $(MSBuildThisFileDirectory)external\Java.Interop $(MSBuildThisFileDirectory)external\llvm $(MSBuildThisFileDirectory)external\mono - 5.8.0 - 5.9.0 + 5.10.0 + 5.11.0 True $(MonoRequiredMinimumVersion).22 $(MSBuildThisFileDirectory)external\mono\external\linker diff --git a/build-tools/dependencies/dependencies.projitems b/build-tools/dependencies/dependencies.projitems index a75e37dbb07..5c73b4a3386 100644 --- a/build-tools/dependencies/dependencies.projitems +++ b/build-tools/dependencies/dependencies.projitems @@ -1,7 +1,7 @@ - <_DarwinMonoFramework>MonoFramework-MDK-5.8.0.22.macos10.xamarin.universal.pkg + <_DarwinMonoFramework>MonoFramework-MDK-5.10.0.0.macos10.xamarin.universal.pkg <_AptGetInstall>apt-get -f -u install @@ -59,7 +59,7 @@ $(MonoRequiredMaximumVersion) $(MonoRequiredDarwinMinimumVersion) $(MSBuildThisFileDirectory)..\scripts\mono-version - https://bosstoragemirror.azureedge.net/wrench/mono-2017-10/7e/7e85cfa5d228cd5148e59cde1d4d663457f96966/$(_DarwinMonoFramework) + https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2017-12/2/$(_DarwinMonoFramework) installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target / diff --git a/external/Java.Interop b/external/Java.Interop index cc1bb5f4e87..0afb2b0fe9d 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit cc1bb5f4e8732af56c306921301db81b67a0b4d8 +Subproject commit 0afb2b0fe9d8670b51c551bdea41fbed459a4103 diff --git a/external/llvm b/external/llvm index 21492ec92e2..a9cfb50e5af 160000 --- a/external/llvm +++ b/external/llvm @@ -1 +1 @@ -Subproject commit 21492ec92e255a43bc6b687468f1eb18a635d94e +Subproject commit a9cfb50e5af3d632f8c1c9620ca52d0118523b53 diff --git a/external/mono b/external/mono index b06c50f3911..0c5a524e50e 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit b06c50f3911120456dfff7a389021d1c9299b2b6 +Subproject commit 0c5a524e50e64b2fcea4cb3c6366092c5b8c76f9 From e064e110ecef3271988251206ebb80775e03e045 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 13 Dec 2017 13:31:26 -0500 Subject: [PATCH 02/22] Fix compilation errors with mono:2017-12 --- build-tools/mono-runtimes/ProfileAssemblies.projitems | 4 +--- build-tools/mono-runtimes/mono-runtimes.targets | 8 ++++++-- external/mono | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build-tools/mono-runtimes/ProfileAssemblies.projitems b/build-tools/mono-runtimes/ProfileAssemblies.projitems index 9c43186c783..053c5aa9684 100644 --- a/build-tools/mono-runtimes/ProfileAssemblies.projitems +++ b/build-tools/mono-runtimes/ProfileAssemblies.projitems @@ -252,8 +252,6 @@ System.Xml.Linq - - lib/monodroid - + diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets index a921fabbb74..7bf854c3b52 100644 --- a/build-tools/mono-runtimes/mono-runtimes.targets +++ b/build-tools/mono-runtimes/mono-runtimes.targets @@ -57,10 +57,14 @@ <_BclAssembly Include="@(MonoProfileAssembly)" /> <_BclExcludeDebugSymbols Include="System.Windows.dll" /> <_BclExcludeDebugSymbols Include="System.Xml.Serialization.dll" /> - <_BclTestAssemblySource Include="@(MonoTestAssembly->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Identity)')" /> - <_BclTestAssemblySource Include="@(MonoTestAssembly->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Filename).pdb')" /> + <_BclTestAssemblySource Include="@(MonoTestAssembly->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Identity)')" /> + <_BclTestAssemblySource Include="@(MonoTestAssembly->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Filename).pdb')" /> + <_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" /> + <_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" /> <_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" /> <_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Filename).pdb')" /> + <_BclTestAssemblyDestination Include="@(MonoTestRunner->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" /> + <_BclTestAssemblyDestination Include="@(MonoTestRunner->'$(XAInstallPrefix)\..\..\bcl-tests\%(Filename).pdb')" /> <_BclTestOutput Include="@(_BclTestAssemblyDestination)" /> diff --git a/external/mono b/external/mono index 0c5a524e50e..febbfd1e3e5 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 0c5a524e50e64b2fcea4cb3c6366092c5b8c76f9 +Subproject commit febbfd1e3e573785682eed8e13f597665d3d5486 From c48be82c8c20a4857a184ebe7e635077f35b8978 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 20 Dec 2017 10:34:01 +0100 Subject: [PATCH 03/22] Fix compilation errors with mono:2017-12 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index febbfd1e3e5..34634352e1f 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit febbfd1e3e573785682eed8e13f597665d3d5486 +Subproject commit 34634352e1fb7386a7130fc175d0a89ddf1bb301 From 0edb4b321eb8fda0bd3762b362829529ad1fd07e Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 12 Jan 2018 12:00:54 +0100 Subject: [PATCH 04/22] Bump to mono/2017-12 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 34634352e1f..70fe915df2f 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 34634352e1fb7386a7130fc175d0a89ddf1bb301 +Subproject commit 70fe915df2f9108a60a2d7b2d19c9a861ac64323 From 07b188dab489d9f5c1f0706c9bcc1340fb457513 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 19 Jan 2018 10:58:22 -0500 Subject: [PATCH 05/22] Copy XUnit assemblies from a different location than NUnit assemblies --- .../mono-runtimes/mono-runtimes.targets | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets index e157a8c3140..32590c60420 100644 --- a/build-tools/mono-runtimes/mono-runtimes.targets +++ b/build-tools/mono-runtimes/mono-runtimes.targets @@ -57,10 +57,6 @@ <_BclAssembly Include="@(MonoProfileAssembly)" /> <_BclExcludeDebugSymbols Include="System.Windows.dll" /> <_BclExcludeDebugSymbols Include="System.Xml.Serialization.dll" /> - <_BclTestAssemblySource Include="@(MonoTestAssembly->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Identity)')" /> - <_BclTestAssemblySource Include="@(MonoTestAssembly->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Filename).pdb')" /> - <_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" /> - <_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" /> <_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" /> <_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Filename).pdb')" /> <_BclTestAssemblyDestination Include="@(MonoTestRunner->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" /> @@ -319,12 +315,23 @@ Command="make -C $(MonoSourceFullPath)\mcs\class\%(MonoTestAssembly.SourcePath) xunit-test-local" WorkingDirectory="$(MonoSourceFullPath)" /> + + + <_BclTestAssemblyXUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == 'xunit'" /> + <_BclTestAssemblyNUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' != 'xunit'" /> + <_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Identity)')" /> + <_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Filename).pdb')" /> + <_BclTestAssemblySource Include="@(_BclTestAssemblyNUnit->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Identity)')" /> + <_BclTestAssemblySource Include="@(_BclTestAssemblyNUnit->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Filename).pdb')" /> + <_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" /> + <_BclTestAssemblySource Include="@(MonoTestRunner->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" /> + <_BclTestContent Include="$(MonoSourceFullPath)\mcs\class\%(MonoTestAssembly.SourcePath)\Test\**\*.*" /> From 89444df8f941b0566879a89b3599c786707fb3da Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 19 Jan 2018 11:00:05 -0500 Subject: [PATCH 06/22] Bump to mono/2017-12 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 70fe915df2f..12fa379c6a4 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 70fe915df2f9108a60a2d7b2d19c9a861ac64323 +Subproject commit 12fa379c6a4fd4e9e2a8a65c637127933e10204b From 678818fbab083c8267bd73c6467fefa5c92726f0 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 22 Jan 2018 18:14:12 -0500 Subject: [PATCH 07/22] Bump to mono/2017-12 --- external/mono | 2 +- .../Xamarin.Android.Build.Tasks.csproj | 68 ++++++++++--------- 2 files changed, 38 insertions(+), 32 deletions(-) diff --git a/external/mono b/external/mono index 12fa379c6a4..9ccd1450abb 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 12fa379c6a4fd4e9e2a8a65c637127933e10204b +Subproject commit 9ccd1450abb197c186e13db62581afc8d9fc8fb6 diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj index c84f365b2ba..ffc86f7cd91 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -269,99 +269,105 @@ - + Linker\Mono.Linker\Annotations.cs - + Linker\Mono.Linker\AssemblyAction.cs - + Linker\Mono.Linker\AssemblyResolver.cs - + Linker\Mono.Linker\I18nAssemblies.cs - + Linker\Mono.Linker\IXApiVisitor.cs - + Linker\Mono.Linker\LinkContext.cs - + Linker\Mono.Linker\MethodAction.cs - + Linker\Mono.Linker\MethodReferenceExtensions.cs - + Linker\Mono.Linker\Pipeline.cs - + Linker\Mono.Linker\TypePreserve.cs - + Linker\Mono.Linker\TypeReferenceExtensions.cs - + Linker\Mono.Linker\XApiReader.cs - + Linker\Mono.Linker.Steps\BlacklistStep.cs - + Linker\Mono.Linker.Steps\BaseStep.cs - + Linker\Mono.Linker.Steps\CleanStep.cs - + Linker\Mono.Linker.Steps\IStep.cs - + Linker\Mono.Linker.Steps\LoadI18nAssemblies.cs - + Linker\Mono.Linker.Steps\LoadReferencesStep.cs - + Linker\Mono.Linker.Steps\OutputStep.cs - + Linker\Mono.Linker.Steps\RegenerateGuidStep.cs - + Linker\Mono.Linker.Steps\ResolveFromAssemblyStep.cs - + Linker\Mono.Linker.Steps\ResolveFromXApiStep.cs - + Linker\Mono.Linker.Steps\ResolveFromXmlStep.cs - + Linker\Mono.Linker.Steps\ResolveStep.cs - + Linker\Mono.Linker.Steps\TypeMapStep.cs - + Linker\Mono.Linker.Steps\SweepStep.cs - + Linker\Mono.Linker.Steps\MarkStep.cs - + Linker\Mono.Linker\LoadException.cs - + Linker\Mono.Linker\MarkException.cs - + Linker\Mono.Linker\ConsoleLogger.cs - + Linker\Mono.Linker\ILogger.cs + + Linker\Mono.Linker\MarkingHelpers.cs + + + Linker\Mono.Linker\Tracer.cs + From 30e7561ef64e07f240f5582e33053128c5da1b86 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 24 Jan 2018 17:01:32 -0500 Subject: [PATCH 08/22] Bump to mono/2017-12 --- build-tools/dependencies/dependencies.projitems | 4 ++-- external/mono | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-tools/dependencies/dependencies.projitems b/build-tools/dependencies/dependencies.projitems index 5c73b4a3386..a3046d44919 100644 --- a/build-tools/dependencies/dependencies.projitems +++ b/build-tools/dependencies/dependencies.projitems @@ -1,7 +1,7 @@ - <_DarwinMonoFramework>MonoFramework-MDK-5.10.0.0.macos10.xamarin.universal.pkg + <_DarwinMonoFramework>MonoFramework-MDK-5.10.0.47.macos10.xamarin.universal.pkg <_AptGetInstall>apt-get -f -u install @@ -59,7 +59,7 @@ $(MonoRequiredMaximumVersion) $(MonoRequiredDarwinMinimumVersion) $(MSBuildThisFileDirectory)..\scripts\mono-version - https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2017-12/2/$(_DarwinMonoFramework) + https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2017-12/41/$(_DarwinMonoFramework) installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target / diff --git a/external/mono b/external/mono index 9ccd1450abb..57500fce5d7 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 9ccd1450abb197c186e13db62581afc8d9fc8fb6 +Subproject commit 57500fce5d7e46b15152cd0461cf5a6354c20fa4 From 4ab19ee8407f507b79fc98d39b911913518553ff Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 31 Jan 2018 13:04:24 -0500 Subject: [PATCH 09/22] Bump to mono/2017-12 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 57500fce5d7..e87f9d77e78 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 57500fce5d7e46b15152cd0461cf5a6354c20fa4 +Subproject commit e87f9d77e78f768935c477c1f41fb5a13977350f From 533c7c06da4b34cacd066b93000d334c98bf54e1 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 31 Jan 2018 13:17:04 -0500 Subject: [PATCH 10/22] Bump to Java.Interop/mono-2017-12 --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 0afb2b0fe9d..884cab571aa 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 0afb2b0fe9d8670b51c551bdea41fbed459a4103 +Subproject commit 884cab571aac24a94dbe06e5c263c37a72125f5e From def9f758526f83637358ebc52bd001bc93368797 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Thu, 1 Feb 2018 17:42:09 -0500 Subject: [PATCH 11/22] Fix msbuild variable for copying mono tests --- build-tools/mono-runtimes/mono-runtimes.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets index aedccaec18b..1659a200d23 100644 --- a/build-tools/mono-runtimes/mono-runtimes.targets +++ b/build-tools/mono-runtimes/mono-runtimes.targets @@ -348,10 +348,10 @@ <_BclTestContent Include="$(MonoSourceFullPath)\mcs\class\%(MonoTestAssembly.SourcePath)\Test\**\*.*" /> From a7f3c955699653629d574ceaa1b92483264122e6 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 2 Feb 2018 11:51:36 -0500 Subject: [PATCH 12/22] Fix compilation of monodroid_corlib_xunit-test.dll --- build-tools/mono-runtimes/ProfileAssemblies.projitems | 1 + 1 file changed, 1 insertion(+) diff --git a/build-tools/mono-runtimes/ProfileAssemblies.projitems b/build-tools/mono-runtimes/ProfileAssemblies.projitems index 334fd47520f..2cb5e0dcd48 100644 --- a/build-tools/mono-runtimes/ProfileAssemblies.projitems +++ b/build-tools/mono-runtimes/ProfileAssemblies.projitems @@ -176,6 +176,7 @@ + From aa9abcbe1ab2b2ab90a83266d6123d6419c6effa Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 2 Feb 2018 14:05:58 -0500 Subject: [PATCH 13/22] Exclude System.Runtime.CompilerServices.Unsafe from install --- build-tools/mono-runtimes/mono-runtimes.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets index 1659a200d23..61960c99b86 100644 --- a/build-tools/mono-runtimes/mono-runtimes.targets +++ b/build-tools/mono-runtimes/mono-runtimes.targets @@ -57,6 +57,7 @@ <_BclAssembly Include="@(MonoProfileAssembly)" /> <_BclExcludeDebugSymbols Include="System.Windows.dll" /> <_BclExcludeDebugSymbols Include="System.Xml.Serialization.dll" /> + <_BclExcludeAssembly Include="System.Runtime.CompilerServices.Unsafe.dll" /> <_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" /> <_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Filename).pdb')" /> <_BclTestAssemblyDestination Include="@(MonoTestRunner->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" /> @@ -80,7 +81,10 @@ /> - <_BclInstalledItem Include="@(_BclAssembly->'$(_BclFrameworkDir)%(Identity)')" /> + <_BclInstalledItem + Include="@(_BclAssembly->'$(_BclFrameworkDir)%(Identity)')" + Exclude="@(_BclExcludeAssembly->'$(_BclFrameworkDir)%(Identity)')" + /> <_BclInstalledItem Condition=" '$(_DebugFileExt)' == '.mdb' " Include="@(_BclAssembly->'$(_BclFrameworkDir)%(Identity).mdb')" From d5fbc29a5bf452c8037dbc6525823f28850a5711 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 2 Feb 2018 15:10:29 -0500 Subject: [PATCH 14/22] Fix compilation of monodroid_corlib_xunit-test.dll (second attempt) --- build-tools/mono-runtimes/ProfileAssemblies.projitems | 6 +++++- build-tools/mono-runtimes/mono-runtimes.targets | 11 +++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build-tools/mono-runtimes/ProfileAssemblies.projitems b/build-tools/mono-runtimes/ProfileAssemblies.projitems index 2cb5e0dcd48..957cbf6b368 100644 --- a/build-tools/mono-runtimes/ProfileAssemblies.projitems +++ b/build-tools/mono-runtimes/ProfileAssemblies.projitems @@ -176,7 +176,6 @@ - @@ -261,6 +260,11 @@ System.Xml.Linq + + + System.Runtime.CompilerServices.Unsafe + reference + diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets index 61960c99b86..401e16520fe 100644 --- a/build-tools/mono-runtimes/mono-runtimes.targets +++ b/build-tools/mono-runtimes/mono-runtimes.targets @@ -57,7 +57,6 @@ <_BclAssembly Include="@(MonoProfileAssembly)" /> <_BclExcludeDebugSymbols Include="System.Windows.dll" /> <_BclExcludeDebugSymbols Include="System.Xml.Serialization.dll" /> - <_BclExcludeAssembly Include="System.Runtime.CompilerServices.Unsafe.dll" /> <_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" /> <_BclTestAssemblyDestination Include="@(MonoTestAssembly->'$(XAInstallPrefix)\..\..\bcl-tests\%(Filename).pdb')" /> <_BclTestAssemblyDestination Include="@(MonoTestRunner->'$(XAInstallPrefix)\..\..\bcl-tests\%(Identity)')" /> @@ -81,10 +80,7 @@ /> - <_BclInstalledItem - Include="@(_BclAssembly->'$(_BclFrameworkDir)%(Identity)')" - Exclude="@(_BclExcludeAssembly->'$(_BclFrameworkDir)%(Identity)')" - /> + <_BclInstalledItem Include="@(_BclAssembly->'$(_BclFrameworkDir)%(Identity)')" /> <_BclInstalledItem Condition=" '$(_DebugFileExt)' == '.mdb' " Include="@(_BclAssembly->'$(_BclFrameworkDir)%(Identity).mdb')" @@ -341,8 +337,11 @@ /> + <_BclTestAssemblyReference Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == 'reference'" /> <_BclTestAssemblyXUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == 'xunit'" /> - <_BclTestAssemblyNUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' != 'xunit'" /> + <_BclTestAssemblyNUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == ''" /> + <_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" /> + <_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" /> <_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Identity)')" /> <_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Filename).pdb')" /> <_BclTestAssemblySource Include="@(_BclTestAssemblyNUnit->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Identity)')" /> From c303aa379ccf3b0378511e51d59ce3f361577e81 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Fri, 2 Feb 2018 19:03:28 -0500 Subject: [PATCH 15/22] Fix missing System.Runtime.CompilerServices.Unsafe.pdb --- build-tools/mono-runtimes/mono-runtimes.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/mono-runtimes/mono-runtimes.targets b/build-tools/mono-runtimes/mono-runtimes.targets index 401e16520fe..e40bd6f7f82 100644 --- a/build-tools/mono-runtimes/mono-runtimes.targets +++ b/build-tools/mono-runtimes/mono-runtimes.targets @@ -341,7 +341,7 @@ <_BclTestAssemblyXUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == 'xunit'" /> <_BclTestAssemblyNUnit Include="@(MonoTestAssembly)" Condition="'%(MonoTestAssembly.TestType)' == ''" /> <_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Identity)')" /> - <_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" /> + <_BclTestAssemblySource Include="@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')" Condition="Exists('@(_BclTestAssemblyReference->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\%(Filename).pdb')')" /> <_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Identity)')" /> <_BclTestAssemblySource Include="@(_BclTestAssemblyXUnit->'$(MonoSourceFullPath)\mcs\class\%(SourcePath)\%(Filename).pdb')" /> <_BclTestAssemblySource Include="@(_BclTestAssemblyNUnit->'$(MonoSourceFullPath)\mcs\class\lib\monodroid\tests\%(Identity)')" /> @@ -351,7 +351,7 @@ Date: Tue, 6 Feb 2018 17:24:19 -0500 Subject: [PATCH 16/22] Bump to mono:2017-12 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index e87f9d77e78..fa7740e0a17 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit e87f9d77e78f768935c477c1f41fb5a13977350f +Subproject commit fa7740e0a17513b670c33cb91f5d419c49207a21 From 42333b9aa6ad0eed2aa5133729f158615809c50e Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Wed, 7 Feb 2018 10:26:04 -0500 Subject: [PATCH 17/22] Bump to mono:2017-12 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index fa7740e0a17..142047819b9 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit fa7740e0a17513b670c33cb91f5d419c49207a21 +Subproject commit 142047819b99cb30a2f903e402c8c86c76ffbf2d From 4cef0cf2f9d0dee4fe191ccbe18a2bde20d94299 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Thu, 8 Feb 2018 11:46:22 -0500 Subject: [PATCH 18/22] Fix missing System.Runtime.CompilerServices.Unsafe.pdb --- .../Xamarin.Android.Bcl-Tests.targets | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets index 3bc40818051..1b2115baaaf 100644 --- a/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets +++ b/tests/BCL-Tests/Xamarin.Android.Bcl-Tests/Xamarin.Android.Bcl-Tests.targets @@ -28,8 +28,14 @@ + + <_DebugSymbol + Include="..\..\..\bin\$(Configuration)\bcl-tests\%(MonoTestAssembly.Filename).pdb" + Condition="Exists('..\..\..\bin\$(Configuration)\bcl-tests\%(MonoTestAssembly.Filename).pdb')" + /> + From 6c972452fba0f5a3d6a611b8d934eb704d53b79f Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Sat, 10 Feb 2018 16:19:01 -0500 Subject: [PATCH 19/22] Bump to mono:2017-12 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 142047819b9..38c4fa936f9 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 142047819b99cb30a2f903e402c8c86c76ffbf2d +Subproject commit 38c4fa936f93a556fce2ef2fd6c5c50ce8c886f8 From 23b0ec0d18e28c80a675df88c4328e1963268e11 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 12 Feb 2018 11:41:06 -0500 Subject: [PATCH 20/22] Bump to mono:2017-12 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 38c4fa936f9..1746c18f79f 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 38c4fa936f93a556fce2ef2fd6c5c50ce8c886f8 +Subproject commit 1746c18f79f5aa1f20c271580166cbf61fe3a14c From 08d7b69b49f38af4a029c2c3e02b4bf6fbb67a6f Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Mon, 12 Feb 2018 12:03:48 -0500 Subject: [PATCH 21/22] Merge branch 'master' of github.com:xamarin/xamarin-android into mono-2017-12 --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index cc1bb5f4e87..80b3c10483a 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit cc1bb5f4e8732af56c306921301db81b67a0b4d8 +Subproject commit 80b3c10483a22760224ab39d81a757e98a9f37a3 From 8744950aee1a8b7c5a0b0f319045a8fd262a20ad Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Tue, 13 Feb 2018 14:10:42 -0500 Subject: [PATCH 22/22] Bump to mono:2017-12 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 1746c18f79f..a0af42ab186 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 1746c18f79f5aa1f20c271580166cbf61fe3a14c +Subproject commit a0af42ab186cf997eb7abd8647b4fdc359bcde96