From 9c9c43949352dbab4589b24ef0b2cb1914395ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 1 Oct 2019 19:54:11 +0200 Subject: [PATCH] Bump mono to 2019-08@528103728fc2aedb7b6062e11255d39a0ed3f31c to add missing NS2.1 APIs See https://github.com/mono/mono/issues/17064. The 2019-08 version of the fix adds a new assembly with NS2.1 APIs that we stubbed out in 2019-06: System.Data.DataSetExtensions.dll --- builds/Makefile | 2 ++ mk/mono.mk | 2 +- msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Full-FrameworkList.xml.in | 1 + .../Xamarin.Mac.Tasks/Xamarin.Mac-Mobile-FrameworkList.xml.in | 1 + .../Xamarin.iOS.Tasks.Core/Xamarin.TVOS-FrameworkList.xml.in | 1 + .../Xamarin.iOS.Tasks.Core/Xamarin.WatchOS-FrameworkList.xml.in | 1 + msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS-FrameworkList.xml.in | 1 + tools/linker/MobileProfile.cs | 1 + 8 files changed, 9 insertions(+), 1 deletion(-) diff --git a/builds/Makefile b/builds/Makefile index 1592f5d330fa..24be9b1c65cc 100644 --- a/builds/Makefile +++ b/builds/Makefile @@ -150,6 +150,7 @@ IOS_ASSEMBLIES = \ System.Core \ System.Data \ System.Data.Services.Client \ + System.Data.DataSetExtensions \ System.IdentityModel \ System.IO.Compression \ System.IO.Compression.FileSystem \ @@ -190,6 +191,7 @@ MAC_ASSEMBLIES = \ System.ComponentModel.DataAnnotations \ System.Core \ System.Data.Services.Client \ + System.Data.DataSetExtensions \ System.Data \ System.IdentityModel \ System.IO.Compression.FileSystem \ diff --git a/mk/mono.mk b/mk/mono.mk index 8322e7fed677..8a90e825947a 100644 --- a/mk/mono.mk +++ b/mk/mono.mk @@ -1,4 +1,4 @@ -NEEDED_MONO_VERSION := d8441deead62b3af591c6daefb5013b09ef1ab8b +NEEDED_MONO_VERSION := 528103728fc2aedb7b6062e11255d39a0ed3f31c NEEDED_MONO_BRANCH := 2019-08 MONO_DIRECTORY := mono diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Full-FrameworkList.xml.in b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Full-FrameworkList.xml.in index 637235388683..17b1b2189a48 100644 --- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Full-FrameworkList.xml.in +++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Full-FrameworkList.xml.in @@ -22,6 +22,7 @@ + diff --git a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Mobile-FrameworkList.xml.in b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Mobile-FrameworkList.xml.in index 0a43030170dc..a874bd716713 100644 --- a/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Mobile-FrameworkList.xml.in +++ b/msbuild/Xamarin.Mac.Tasks/Xamarin.Mac-Mobile-FrameworkList.xml.in @@ -17,6 +17,7 @@ + diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS-FrameworkList.xml.in b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS-FrameworkList.xml.in index cfc47fe51c96..11d2f85801be 100644 --- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS-FrameworkList.xml.in +++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.TVOS-FrameworkList.xml.in @@ -19,6 +19,7 @@ + diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS-FrameworkList.xml.in b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS-FrameworkList.xml.in index 9869a5bb9c44..9f312e1cbeb2 100644 --- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS-FrameworkList.xml.in +++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.WatchOS-FrameworkList.xml.in @@ -15,6 +15,7 @@ + diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS-FrameworkList.xml.in b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS-FrameworkList.xml.in index a98ccd97de0e..aacc7ed8cd8a 100644 --- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS-FrameworkList.xml.in +++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS-FrameworkList.xml.in @@ -19,6 +19,7 @@ + diff --git a/tools/linker/MobileProfile.cs b/tools/linker/MobileProfile.cs index 4e4de790b1df..599c51eaaae5 100644 --- a/tools/linker/MobileProfile.cs +++ b/tools/linker/MobileProfile.cs @@ -13,6 +13,7 @@ public abstract class MobileProfile : BaseProfile { "System.Core", "System.Data", "System.Data.Services.Client", + "System.Data.DataSetExtensions", "System.IdentityModel", "System.IO.Compression.FileSystem", "System.IO.Compression",