dotnet · akoeplinger · Apr 25, 2019 · Feb 6, 2019 · Mar 8, 2019 · Mar 8, 2019
diff --git a/.gitmodules b/.gitmodules
@@ -8,7 +8,7 @@
 [submodule "external/mono"]
     path = external/mono
     url = ../../mono/mono.git
-    branch = 2018-10
+    branch = 2019-02
 [submodule "external/opentk"]
     path = external/opentk
     url = ../../mono/opentk.git

diff --git a/Make.config b/Make.config
@@ -49,13 +49,13 @@ XCODE94_URL=http://xamarin-storage/bot-provisioning/xcodes/Xcode_9.4.xip
 XCODE94_DEVELOPER_ROOT=/Applications/Xcode94.app/Contents/Developer
 
 # Minimum Mono version for building XI/XM
-MIN_MONO_VERSION=5.20.0.220
-MAX_MONO_VERSION=5.20.99
-MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-10/199/d390bb6901fd29051a065323ace54a8920f24f39/MonoFramework-MDK-5.20.0.220.macos10.xamarin.universal.pkg
+MIN_MONO_VERSION=6.0.0.176
+MAX_MONO_VERSION=6.0.99
+MIN_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2019-02/161/d75c142a4646af45f680cd90cafe05843d1d5945/MonoFramework-MDK-6.0.0.176.macos10.xamarin.universal.pkg
 
 # Minimum Mono version for Xamarin.Mac apps using the system mono
-MIN_XM_MONO_VERSION=5.18.0.185
-MIN_XM_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2018-08/149/ea740d2bc8d58d9c0ee44ef0ba15ccddeafbe227/MonoFramework-MDK-5.18.0.185.macos10.xamarin.universal.pkg
+MIN_XM_MONO_VERSION=6.0.0.176
+MIN_XM_MONO_URL=https://xamjenkinsartifact.azureedge.net/build-package-osx-mono/2019-02/161/d75c142a4646af45f680cd90cafe05843d1d5945/MonoFramework-MDK-6.0.0.176.macos10.xamarin.universal.pkg
 
 # Minimum Visual Studio version
 MIN_VISUAL_STUDIO_URL=https://bosstoragemirror.azureedge.net/vsmac/7a/7aff2dc1f28d711d11d63d79b2a4c49cda217189/VisualStudioForMac-Preview-7.7.0.1470.dmg
@@ -186,11 +186,11 @@ DEVICE_BIN_PATH=$(XCODE_DEVELOPER_ROOT)/Toolchains/XcodeDefault.xctoolchain/usr/
 DEVICE_CC=$(IOS_CC)
 DEVICE_CXX=$(IOS_CXX)
 
-IOS_CSC=$(SYSTEM_CSC) -nostdlib -noconfig -r:$(MONOTOUCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_MONO_PATH)/System.Core.dll -r:$(MONOTOUCH_MONO_PATH)/System.Xml.dll -r:$(MONOTOUCH_MONO_PATH)/mscorlib.dll -r:$(MONOTOUCH_MONO_PATH)/System.Net.Http.dll -deterministic
+IOS_CSC=$(SYSTEM_CSC) -nostdlib -noconfig -r:$(MONOTOUCH_MONO_PATH)/System.dll -r:$(MONOTOUCH_MONO_PATH)/System.Core.dll -r:$(MONOTOUCH_MONO_PATH)/System.Xml.dll -r:$(MONOTOUCH_MONO_PATH)/mscorlib.dll -r:$(MONOTOUCH_MONO_PATH)/System.Net.Http.dll -r:$(MONOTOUCH_MONO_PATH)/Facades/System.Drawing.Common.dll -deterministic
 IOS_MCS=$(SYSTEM_MCS) -nostdlib -r:mscorlib.dll -lib:$(MONOTOUCH_MONO_PATH)
 
-TV_CSC=$(SYSTEM_CSC) -nostdlib -noconfig -r:$(MONOTOUCH_TV_MONO_PATH)/System.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Core.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Xml.dll -r:$(MONOTOUCH_TV_MONO_PATH)/mscorlib.dll -deterministic
-WATCH_CSC=$(SYSTEM_CSC) -nostdlib -noconfig -r:$(WATCH_BCL_DIR)/System.dll -r:$(WATCH_BCL_DIR)/System.Core.dll -r:$(WATCH_BCL_DIR)/System.Xml.dll -r:$(WATCH_BCL_DIR)/mscorlib.dll -deterministic
+TV_CSC=$(SYSTEM_CSC) -nostdlib -noconfig -r:$(MONOTOUCH_TV_MONO_PATH)/System.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Core.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Xml.dll -r:$(MONOTOUCH_TV_MONO_PATH)/mscorlib.dll -r:$(MONOTOUCH_TV_MONO_PATH)/System.Net.Http.dll -r:$(MONOTOUCH_TV_MONO_PATH)/Facades/System.Drawing.Common.dll -deterministic
+WATCH_CSC=$(SYSTEM_CSC) -nostdlib -noconfig -r:$(WATCH_BCL_DIR)/System.dll -r:$(WATCH_BCL_DIR)/System.Core.dll -r:$(WATCH_BCL_DIR)/System.Xml.dll -r:$(WATCH_BCL_DIR)/mscorlib.dll -r:$(WATCH_BCL_DIR)/System.Net.Http.dll -r:$(WATCH_BCL_DIR)/Facades/System.Drawing.Common.dll -deterministic
 
 DEVICE_OBJC_CFLAGS=$(OBJC_CFLAGS) $(BITCODE_CFLAGS)
 
@@ -285,10 +285,10 @@ MAC_FRAMEWORK_VERSIONED_DIR = $(MAC_FRAMEWORK_DIR)/Versions/$(MAC_PACKAGE_VERSIO
 MAC_FRAMEWORK_CURRENT_DIR = $(MAC_FRAMEWORK_DIR)/Versions/$(MAC_INSTALL_VERSION)
 
 MOBILE_BCL_DIR = $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/Xamarin.Mac
-MAC_mobile_CSC = $(SYSTEM_CSC) -nostdlib -noconfig -r:$(MOBILE_BCL_DIR)/System.dll -r:$(MOBILE_BCL_DIR)/System.Core.dll -r:$(MOBILE_BCL_DIR)/System.Xml.dll -r:$(MOBILE_BCL_DIR)/mscorlib.dll -r:$(MOBILE_BCL_DIR)/System.Net.Http.dll -deterministic
+MAC_mobile_CSC = $(SYSTEM_CSC) -nostdlib -noconfig -r:$(MOBILE_BCL_DIR)/System.dll -r:$(MOBILE_BCL_DIR)/System.Core.dll -r:$(MOBILE_BCL_DIR)/System.Xml.dll -r:$(MOBILE_BCL_DIR)/mscorlib.dll -r:$(MOBILE_BCL_DIR)/System.Net.Http.dll -r:$(MOBILE_BCL_DIR)/Facades/System.Drawing.Common.dll -deterministic
 
 FULL_BCL_DIR = $(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/lib/mono/4.5
-MAC_full_CSC = $(SYSTEM_CSC) -nostdlib -noconfig -r:$(FULL_BCL_DIR)/System.dll -r:$(FULL_BCL_DIR)/System.Core.dll -r:$(FULL_BCL_DIR)/System.Xml.dll -r:$(FULL_BCL_DIR)/mscorlib.dll -r:$(FULL_BCL_DIR)/System.Net.Http.dll -deterministic
+MAC_full_CSC = $(SYSTEM_CSC) -nostdlib -noconfig -r:$(FULL_BCL_DIR)/System.dll -r:$(FULL_BCL_DIR)/System.Core.dll -r:$(FULL_BCL_DIR)/System.Xml.dll -r:$(FULL_BCL_DIR)/mscorlib.dll -r:$(FULL_BCL_DIR)/System.Net.Http.dll -r:$(FULL_BCL_DIR)/Facades/System.Drawing.Common.dll -deterministic
 
 MAC_PACKAGE_FILENAME=$(MAC_PACKAGE_NAME_LOWER)-$(MAC_PACKAGE_VERSION).pkg
 MAC_PACKAGE_DMG_FILENAME=$(MAC_PACKAGE_NAME_LOWER)-$(MAC_PACKAGE_VERSION).dmg

diff --git a/Xamarin.Mac.sln b/Xamarin.Mac.sln
@@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.Mdb", "external\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "external\mono\external\cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Linker", "external\mono\external\linker\linker\Mono.Linker.csproj", "{DD28E2B1-057B-4B4D-A04D-B2EBD9E76E46}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Linker", "external\mono\external\linker\src\linker\Mono.Linker.csproj", "{DD28E2B1-057B-4B4D-A04D-B2EBD9E76E46}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libxammac", "runtime\libxammac.csproj", "{8A5B637C-E4FF-4145-B887-9347020100F4}"
 EndProject

diff --git a/builds/Makefile b/builds/Makefile
@@ -535,7 +535,7 @@ IOS_ASSEMBLIES = I18N.CJK I18N.MidEast I18N.Other I18N.Rare I18N.West I18N Mono.
 	System.Numerics.Vectors System.Reflection.Context \
 	System.Security \
 	System.Windows System.Xml.Serialization System.Net \
-	Microsoft.CSharp Mono.CSharp
+	Microsoft.CSharp Mono.CSharp System.Net.Http
 
 IOS_REPL_ASSEMBLIES = mscorlib System System.Core System.Xml Mono.CSharp
 

diff --git a/docs/website/optimizations.md b/docs/website/optimizations.md
@@ -717,3 +717,23 @@ unless the interpreter is used.
 
 The default behavior can be overridden by passing
 `--optimize=[+|-]seal-and-devirtualize` to `mtouch`.
+
+## Static constructors for BeforeFieldInit removal
+
+This optimization requires the linker to be enabled and is applied globally
+on all code inside the application.
+
+This optimization allows the linker not to mark every `.cctor` when a type
+is preserved, e.g. whenever the class/static constructor `.cctor` is only
+used for field initialization and those fields are not marked themselves 
+then it is possible to remove the `.cctor`.
+
+This optimization is enabled, by default, on both Xamarin.iOS and 
+Xamarin.Mac. However it represent a change from older versions of the linker. 
+It is possible that some existing code depend on this side effect (i.e. 
+those `.cctor` not being removed). In such case the optimization can be 
+disabled  until the correct linker annotations (e.g. 
+`[Preserve (Conditional=true)]`) are added.
+
+The default behavior can be overridden by passing
+`--optimize=[+|-]cctor-beforefieldinit` to `mtouch` or `mmp`.
diff --git a/external/guiunit b/external/guiunit
diff --git a/external/mono b/external/mono
diff --git a/fsharp/Makefile b/fsharp/Makefile
@@ -184,7 +184,7 @@ $(FSHARP_DIRECTORIES):
 ### Sign the assemblies. This is done in a temporary directory so that we don't have to re-sign on every install.
 build/%.dll: $(BIN_DIR)/%.dll | build/monotouch build/xamarinmacmobile build/xamarinmacfull build/xamarinwatchos build/xamarintvos
 	$(Q) $(CP) $< $@
-	$(Q_SN) MONO_CFG_DIR="$(TOP)" sn -q -R "$@" "$(PRODUCT_KEY_PATH)"
+	$(Q_SN) MONO_CFG_DIR="$(TOP)" $(SYSTEM_SN) -q -R "$@" "$(PRODUCT_KEY_PATH)"
 
 build.stamp: export TargetFrameworkFallbackSearchPaths=$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild-frameworks
 build.stamp: export MSBuildExtensionsPathFallbackPathsOverride=$(IOS_DESTDIR)/Library/Frameworks/Mono.framework/External/xbuild

diff --git a/mono/config b/mono/config
@@ -0,0 +1,3 @@
+<configuration>
+	<dllmap dll="System.Native" target="$mono_libdir/libmono-native-compat.dylib" os="!windows" />
+</configuration>
diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Full-FrameworkList.xml.in b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Full-FrameworkList.xml.in
@@ -78,6 +78,7 @@
   <File AssemblyName="System.Diagnostics.TraceEvent" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
   <File AssemblyName="System.Diagnostics.TraceSource" Version="4.0.0.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
   <File AssemblyName="System.Diagnostics.Tracing" Version="4.2.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
+  <File AssemblyName="System.Drawing.Common" Version="4.0.0.0" PublicKeyToken="cc7b13ffcd2ddd51" ProcessorArchitecture="MSIL" />
   <File AssemblyName="System.Drawing.Primitives" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
   <File AssemblyName="System.Dynamic.Runtime" Version="4.0.10.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />
   <File AssemblyName="System.Globalization.Calendars" Version="4.0.1.0" PublicKeyToken="b03f5f7f11d50a3a" ProcessorArchitecture="MSIL" />

diff --git a/opentk/Makefile.include b/opentk/Makefile.include
@@ -36,7 +36,7 @@ $(MAC_BUILD_DIR)/full-32/OpenTK.dll: $(MAC_OPENTK_SOURCES) $(MAC_BUILD_DIR)/full
 	$(call Q_PROF_CSC,mac/$(VARIANT)) $(MAC_full_CSC) \
 		-nologo -out:$@ -target:library -debug:full -define:OPENTK_DLL -unsafe -nowarn:3021,612,618,1635 \
 		$(MAC_BOOTSTRAP_DEFINES),COREBUILD \
-		-r:System.Drawing.dll $(XAMMAC) \
+		$(XAMMAC) \
 		-publicsign -keyfile:$(PRODUCT_KEY_PATH) \
 		$(MAC_OPENTK_FULL_SOURCES)
 

diff --git a/opentk/opentk.csproj b/opentk/opentk.csproj
@@ -107,23 +107,8 @@
     <Compile Include="..\src\OpenGL\WindowState.cs">
       <Link>OpenGL\WindowState.cs</Link>
     </Compile>
-    <Compile Include="..\external\mono\mcs\class\System.Drawing\System.Drawing\Color.cs">
-      <Link>System.Drawing\Color.cs</Link>
-    </Compile>
-    <Compile Include="..\external\mono\mcs\class\System.Drawing\System.Drawing\ColorConverter.cs">
-      <Link>System.Drawing\ColorConverter.cs</Link>
-    </Compile>
-    <Compile Include="..\external\mono\mcs\class\System.Drawing\System.Drawing\KnownColor.cs">
-      <Link>System.Drawing\KnownColor.cs</Link>
-    </Compile>
-    <Compile Include="..\external\mono\mcs\class\System.Drawing\System.Drawing\KnownColors.cs">
-      <Link>System.Drawing\KnownColors.cs</Link>
-    </Compile>
-    <Compile Include="..\external\mono\mcs\class\System.Drawing\System.Drawing\SystemColors.cs">
-      <Link>System.Drawing\SystemColors.cs</Link>
-    </Compile>
-    <Compile Include="..\external\mono\mcs\build\common\Locale.cs">
-      <Link>System.Drawing\Locale.cs</Link>
+    <Compile Include="..\src\System.Drawing\ColorKnownColorTypeForwarders.cs">
+      <Link>System.Drawing\ColorKnownColorTypeForwarders.cs</Link>
     </Compile>
   </ItemGroup>
   <ItemGroup>

diff --git a/runtime/launcher.m b/runtime/launcher.m
@@ -605,7 +605,7 @@ int xamarin_main (int argc, char **argv, enum XamarinLaunchMode launch_mode)
 	@autoreleasepool {
 		int env_argc = 0;
 		char **env_argv = get_mono_env_options (&env_argc);
-		int new_argc = env_argc + 2 /* --debug executable */ + argc ;
+		int new_argc = env_argc + 3 /* --use-map-jit --debug executable */ + argc ;
 		if (xamarin_mac_hybrid_aot)
 			new_argc += 1;
 		if (xamarin_mac_modern)
@@ -615,6 +615,8 @@ int xamarin_main (int argc, char **argv, enum XamarinLaunchMode launch_mode)
 		const char **ptr = (const char **) new_argv;
 		// binary
 		*ptr++ = argv [0];
+		*ptr++ = "--use-map-jit";
+
 		// inject MONO_ENV_OPTIONS
 		for (int i = 0; i < env_argc; i++)
 			*ptr++ = env_argv [i];