Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to mono:2017-12 #3421

Merged
merged 23 commits into from
Feb 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ XCODE_URL=http://xamarin-storage/bot-provisioning/Xcode_9.2.xip
XCODE_DEVELOPER_ROOT=/Applications/Xcode92.app/Contents/Developer

# Minimum Mono version
MIN_MONO_VERSION=5.8.0.0
MAX_MONO_VERSION=5.8.99
MIN_MONO_URL=https://bosstoragemirror.azureedge.net/wrench/mono-2017-10/8a/8a2a0628624e9a7456b0ec1831dd68998750df62/MonoFramework-MDK-5.8.0.0.macos10.xamarin.universal.pkg
MIN_MONO_VERSION=5.10.0.0
MAX_MONO_VERSION=5.10.99
MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2017-12/13/MonoFramework-MDK-5.10.0.15.macos10.xamarin.universal.pkg

# Minimum Visual Studio version
MIN_VISUAL_STUDIO_URL=https://bosstoragemirror.blob.core.windows.net/wrench/monodevelop-lion-dogfood-vNext/8f/8f1c13cb983138ee63bd53e09908ea5e737988cd/VisualStudioForMac-Preview-7.0.0.2728.dmg
Expand Down
2 changes: 1 addition & 1 deletion external/mono
Submodule mono updated 1888 files
2 changes: 1 addition & 1 deletion mk/xamarin.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ifdef ENABLE_XAMARIN
NEEDED_MACCORE_VERSION := 62c4393c94ed274acbc1edce259a3c22a461f922
NEEDED_MACCORE_VERSION := 31850ff49c9a1e3b3a51aecb4e2fc02fb944327e
NEEDED_MACCORE_BRANCH := master

MACCORE_DIRECTORY := maccore
Expand Down
2 changes: 1 addition & 1 deletion tests/common/mac/ProjectTestHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public static Version FindMonoVersion ()
{
string output = RunAndAssert ("/Library/Frameworks/Mono.framework/Commands/mono", new StringBuilder ("--version"), "FindMonoVersion");

Regex versionRegex = new Regex("compiler version \\d.\\d.\\d", RegexOptions.IgnoreCase);
Regex versionRegex = new Regex("compiler version \\d+.\\d+.\\d+(.\\d+)?", RegexOptions.IgnoreCase);
return new Version (versionRegex.Match (output).Value.Split (' ')[2]);
}

Expand Down
2 changes: 1 addition & 1 deletion tests/xharness/BCLTestInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public BCLTestInfo (Harness harness, string testName)

protected void Process (string test_sources, IEnumerable<string> test_files, string condition, StringBuilder [] sb, int split_count)
{
test_files = test_files.Where ((v) => !string.IsNullOrEmpty (v));
test_files = test_files.Where ((v) => !string.IsNullOrEmpty (v) && !v.StartsWith ("#", StringComparison.Ordinal));

// Split the directories of the test files into 'split_count' number of chunks
var files_path = Path.GetDirectoryName (test_sources).Replace ("/", "\\");
Expand Down
78 changes: 76 additions & 2 deletions tools/install-source/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,85 @@ Mono.Cecil.dll: $(MONO_CECIL_DLL)
$(Q) cp $<* $(dir $@)

IOS_ASSEMBLIES = \
$(wildcard $(MONO_PATH)/mcs/class/lib/monotouch/*.pdb) \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.CJK.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.MidEast.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.Other.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.Rare.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.West.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/I18N.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Microsoft.CSharp.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Mono.CSharp.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Mono.Data.Sqlite.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Mono.Data.Tds.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Mono.Security.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/Mono.Simd.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.ComponentModel.Composition.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.ComponentModel.DataAnnotations.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Core.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Data.Services.Client.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Data.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.IO.Compression.FileSystem.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.IO.Compression.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.IdentityModel.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Json.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Net.Http.WinHttpHandler.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Net.Http.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Net.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Numerics.Vectors.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Numerics.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Reflection.Context.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Runtime.Serialization.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Security.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.ServiceModel.Internals.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.ServiceModel.Web.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.ServiceModel.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Transactions.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Web.Services.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Xml.Linq.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.Xml.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/System.pdb \
$(MONO_PATH)/mcs/class/lib/monotouch/mscorlib.pdb \
$(IOS_DESTDIR)$(MONOTOUCH_PREFIX)/lib/64bits/Xamarin.iOS.dll.mdb

MAC_ASSEMBLIES = \
$(wildcard $(MONO_PATH)/mcs/class/lib/xammac/*.pdb) \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.CJK.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.MidEast.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.Other.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.Rare.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.West.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/I18N.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Microsoft.CSharp.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Mono.CSharp.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Mono.CompilerServices.SymbolWriter.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Mono.Data.Sqlite.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Mono.Data.Tds.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/Mono.Security.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.ComponentModel.Composition.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.ComponentModel.DataAnnotations.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Core.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Data.Services.Client.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Data.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.IO.Compression.FileSystem.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.IO.Compression.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.IdentityModel.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Json.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Net.Http.WinHttpHandler.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Net.Http.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Net.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Numerics.Vectors.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Numerics.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Reflection.Context.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Runtime.Serialization.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Security.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.ServiceModel.Internals.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.ServiceModel.Web.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.ServiceModel.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Transactions.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Web.Services.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Xml.Linq.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.Xml.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/System.pdb \
$(MONO_PATH)/mcs/class/lib/xammac/mscorlib.pdb \
$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5/Xamarin.Mac.dll.mdb

IOS_MDB_FILES = \
Expand Down
4 changes: 2 additions & 2 deletions tools/linker/MobileResolveMainAssemblyStep.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ protected override void Process ()
Context.Resolver.CacheAssembly (assembly);
Context.SafeReadSymbols (assembly);

Annotations.Push (assembly);
Context.Tracer.Push (assembly);

var is_product_assembly = Mono.Tuner.Profile.IsProductAssembly (assembly);
foreach (var t in assembly.MainModule.Types) {
Expand All @@ -53,7 +53,7 @@ protected override void Process ()
// should bring everything else that's required
}

Annotations.Pop ();
Context.Tracer.Pop ();
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions tools/linker/MobileSweepStep.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ protected void SweepMainModule (ModuleDefinition main)
// or they can point to nothing which will break later (e.g. when re-loading for stripping IL)
// reference: https://bugzilla.xamarin.com/show_bug.cgi?id=36577
if (main.HasExportedTypes)
SweepCollection (main.ExportedTypes);
SweepCollectionNonAttributable (main.ExportedTypes);
// only when linking should we remove module references, if we (re)save the assembly then
// the entrypoints (for p/invokes) will be required later
// reference: https://bugzilla.xamarin.com/show_bug.cgi?id=35372
if (main.HasModuleReferences && (CurrentAction == AssemblyAction.Link))
SweepCollection (main.ModuleReferences);
SweepCollectionNonAttributable (main.ModuleReferences);
}
}
}
64 changes: 33 additions & 31 deletions tools/mmp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,37 +20,39 @@ LINKER_DIR=$(LINKER_TOOLS_PATH)/linker
TUNER_DIR=$(LINKER_TOOLS_PATH)/tuner

linker_sources = \
$(LINKER_DIR)/Mono.Linker/Pipeline.cs \
$(LINKER_DIR)/Mono.Linker/AssemblyResolver.cs \
$(LINKER_DIR)/Mono.Linker/TypePreserve.cs \
$(LINKER_DIR)/Mono.Linker/Annotations.cs \
$(LINKER_DIR)/Mono.Linker/LinkContext.cs \
$(LINKER_DIR)/Mono.Linker/ILogger.cs \
$(LINKER_DIR)/Mono.Linker/ConsoleLogger.cs \
$(LINKER_DIR)/Mono.Linker/LoadException.cs \
$(LINKER_DIR)/Mono.Linker/MarkException.cs \
$(LINKER_DIR)/Mono.Linker/AssemblyAction.cs \
$(LINKER_DIR)/Mono.Linker/I18nAssemblies.cs \
$(LINKER_DIR)/Mono.Linker/MethodAction.cs \
$(LINKER_DIR)/Mono.Linker/XApiReader.cs \
$(LINKER_DIR)/Mono.Linker/IXApiVisitor.cs \
$(LINKER_DIR)/Mono.Linker/MethodReferenceExtensions.cs \
$(LINKER_DIR)/Mono.Linker/TypeReferenceExtensions.cs \
$(LINKER_DIR)/Mono.Linker.Steps/BaseStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/LoadReferencesStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/LoadI18nAssemblies.cs \
$(LINKER_DIR)/Mono.Linker.Steps/ResolveFromXmlStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/SweepStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/RegenerateGuidStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/ResolveFromXApiStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/ResolveFromAssemblyStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/ResolveStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/CleanStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/MarkStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/BlacklistStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/OutputStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/TypeMapStep.cs \
$(LINKER_DIR)/Mono.Linker.Steps/IStep.cs
$(LINKER_DIR)/Linker/Pipeline.cs \
$(LINKER_DIR)/Linker/AssemblyResolver.cs \
$(LINKER_DIR)/Linker/TypePreserve.cs \
$(LINKER_DIR)/Linker/Annotations.cs \
$(LINKER_DIR)/Linker/LinkContext.cs \
$(LINKER_DIR)/Linker/ILogger.cs \
$(LINKER_DIR)/Linker/ConsoleLogger.cs \
$(LINKER_DIR)/Linker/LoadException.cs \
$(LINKER_DIR)/Linker/MarkException.cs \
$(LINKER_DIR)/Linker/AssemblyAction.cs \
$(LINKER_DIR)/Linker/I18nAssemblies.cs \
$(LINKER_DIR)/Linker/MethodAction.cs \
$(LINKER_DIR)/Linker/XApiReader.cs \
$(LINKER_DIR)/Linker/IXApiVisitor.cs \
$(LINKER_DIR)/Linker/MethodReferenceExtensions.cs \
$(LINKER_DIR)/Linker/MarkingHelpers.cs \
$(LINKER_DIR)/Linker/Tracer.cs \
$(LINKER_DIR)/Linker/TypeReferenceExtensions.cs \
$(LINKER_DIR)/Linker.Steps/BaseStep.cs \
$(LINKER_DIR)/Linker.Steps/LoadReferencesStep.cs \
$(LINKER_DIR)/Linker.Steps/LoadI18nAssemblies.cs \
$(LINKER_DIR)/Linker.Steps/ResolveFromXmlStep.cs \
$(LINKER_DIR)/Linker.Steps/SweepStep.cs \
$(LINKER_DIR)/Linker.Steps/RegenerateGuidStep.cs \
$(LINKER_DIR)/Linker.Steps/ResolveFromXApiStep.cs \
$(LINKER_DIR)/Linker.Steps/ResolveFromAssemblyStep.cs \
$(LINKER_DIR)/Linker.Steps/ResolveStep.cs \
$(LINKER_DIR)/Linker.Steps/CleanStep.cs \
$(LINKER_DIR)/Linker.Steps/MarkStep.cs \
$(LINKER_DIR)/Linker.Steps/BlacklistStep.cs \
$(LINKER_DIR)/Linker.Steps/OutputStep.cs \
$(LINKER_DIR)/Linker.Steps/TypeMapStep.cs \
$(LINKER_DIR)/Linker.Steps/IStep.cs

tuner_sources = \
$(linker_sources) \
Expand Down
62 changes: 32 additions & 30 deletions tools/mtouch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,38 @@ LINKER_RESOURCES = \
$(LINKER_DIR)/Descriptors/mscorlib.xml

LINKER_SOURCES = \
$(MONOLINKER)/Mono.Linker/Annotations.cs \
$(MONOLINKER)/Mono.Linker/AssemblyAction.cs \
$(MONOLINKER)/Mono.Linker/AssemblyResolver.cs \
$(MONOLINKER)/Mono.Linker/I18nAssemblies.cs \
$(MONOLINKER)/Mono.Linker/IXApiVisitor.cs \
$(MONOLINKER)/Mono.Linker/ILogger.cs \
$(MONOLINKER)/Mono.Linker/ConsoleLogger.cs \
$(MONOLINKER)/Mono.Linker/LinkContext.cs \
$(MONOLINKER)/Mono.Linker/LoadException.cs \
$(MONOLINKER)/Mono.Linker/MarkException.cs \
$(MONOLINKER)/Mono.Linker/MethodAction.cs \
$(MONOLINKER)/Mono.Linker/Pipeline.cs \
$(MONOLINKER)/Mono.Linker/MethodReferenceExtensions.cs \
$(MONOLINKER)/Mono.Linker/TypeReferenceExtensions.cs \
$(MONOLINKER)/Mono.Linker/TypePreserve.cs \
$(MONOLINKER)/Mono.Linker/XApiReader.cs \
$(MONOLINKER)/Mono.Linker.Steps/BaseStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/BlacklistStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/CleanStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/IStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/LoadI18nAssemblies.cs \
$(MONOLINKER)/Mono.Linker.Steps/LoadReferencesStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/MarkStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/OutputStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/ResolveFromAssemblyStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/ResolveFromXApiStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/ResolveFromXmlStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/ResolveStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/SweepStep.cs \
$(MONOLINKER)/Mono.Linker.Steps/TypeMapStep.cs \
$(MONOLINKER)/Linker/Annotations.cs \
$(MONOLINKER)/Linker/AssemblyAction.cs \
$(MONOLINKER)/Linker/AssemblyResolver.cs \
$(MONOLINKER)/Linker/I18nAssemblies.cs \
$(MONOLINKER)/Linker/IXApiVisitor.cs \
$(MONOLINKER)/Linker/ILogger.cs \
$(MONOLINKER)/Linker/ConsoleLogger.cs \
$(MONOLINKER)/Linker/LinkContext.cs \
$(MONOLINKER)/Linker/LoadException.cs \
$(MONOLINKER)/Linker/MarkException.cs \
$(MONOLINKER)/Linker/MethodAction.cs \
$(MONOLINKER)/Linker/Pipeline.cs \
$(MONOLINKER)/Linker/MethodReferenceExtensions.cs \
$(MONOLINKER)/Linker/TypeReferenceExtensions.cs \
$(MONOLINKER)/Linker/TypePreserve.cs \
$(MONOLINKER)/Linker/XApiReader.cs \
$(MONOLINKER)/Linker/Tracer.cs \
$(MONOLINKER)/Linker/MarkingHelpers.cs \
$(MONOLINKER)/Linker.Steps/BaseStep.cs \
$(MONOLINKER)/Linker.Steps/BlacklistStep.cs \
$(MONOLINKER)/Linker.Steps/CleanStep.cs \
$(MONOLINKER)/Linker.Steps/IStep.cs \
$(MONOLINKER)/Linker.Steps/LoadI18nAssemblies.cs \
$(MONOLINKER)/Linker.Steps/LoadReferencesStep.cs \
$(MONOLINKER)/Linker.Steps/MarkStep.cs \
$(MONOLINKER)/Linker.Steps/OutputStep.cs \
$(MONOLINKER)/Linker.Steps/ResolveFromAssemblyStep.cs \
$(MONOLINKER)/Linker.Steps/ResolveFromXApiStep.cs \
$(MONOLINKER)/Linker.Steps/ResolveFromXmlStep.cs \
$(MONOLINKER)/Linker.Steps/ResolveStep.cs \
$(MONOLINKER)/Linker.Steps/SweepStep.cs \
$(MONOLINKER)/Linker.Steps/TypeMapStep.cs \
$(MONO_TUNER)/Mono.Tuner/ApplyPreserveAttributeBase.cs \
$(MONO_TUNER)/Mono.Tuner/CecilRocks.cs \
$(MONO_TUNER)/Mono.Tuner/CustomizeActions.cs \
Expand Down