From 1967612e1d2dc6a54a09505375c7640d2b0edaa3 Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Thu, 6 Apr 2017 11:36:15 -0700 Subject: [PATCH 01/20] [dependencies] Bump mono to 2017-04 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 71cc0a16c9c..92503db7956 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 71cc0a16c9cf3cb75810dab28e6fd05fa194ba13 +Subproject commit 92503db79568d1ef66a5445cb889ccbb8c8bd343 From 0f92d2539bea87ec607cde01ba003231c376759b Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Thu, 6 Apr 2017 11:37:14 -0700 Subject: [PATCH 02/20] [dependencies] Bump the linker to the tip of master. --- external/linker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/linker b/external/linker index dfea33750a2..c6516103e01 160000 --- a/external/linker +++ b/external/linker @@ -1 +1 @@ -Subproject commit dfea33750a23387a3deb909954b8e25b0b4e20a3 +Subproject commit c6516103e01383697b7eeda21e1d11b9d9609bed From d08dc82a8b184de6eec9848bb6daeefe00fdca8c Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Thu, 6 Apr 2017 11:52:29 -0700 Subject: [PATCH 03/20] [dependencies] Bump Java.Interop to pick newer cecil --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 5eeb287b890..3e5c484fe72 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 5eeb287b890805488949658d2df07bbd2a492687 +Subproject commit 3e5c484fe72f9d681206312d33a15f0f93e7dde7 From 4a59cfa538bd1ac63d8bb7eec021fb65686f8085 Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Thu, 6 Apr 2017 11:54:26 -0700 Subject: [PATCH 04/20] Update the mono submodule branch --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index e7be856691f..49b161473b8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [submodule "external/mono"] path = external/mono url = https://github.com/mono/mono.git - branch = 2017-02 + branch = 2017-04 [submodule "external/mxe"] path = external/mxe url = https://github.com/xamarin/mxe.git From 7af6375b8fdf0c03d66210db84bbc28d4ec0f70d Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Thu, 6 Apr 2017 11:57:56 -0700 Subject: [PATCH 05/20] [dependencies] Bump desktop dep. --- build-tools/dependencies/dependencies.projitems | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-tools/dependencies/dependencies.projitems b/build-tools/dependencies/dependencies.projitems index 0f1f99a2fbc..a77eaa3b346 100644 --- a/build-tools/dependencies/dependencies.projitems +++ b/build-tools/dependencies/dependencies.projitems @@ -1,7 +1,7 @@ - <_DarwinMonoFramework>MonoFramework-MDK-4.9.3.6.macos10.xamarin.universal.pkg + <_DarwinMonoFramework>MonoFramework-MDK-5.2.0.20.macos10.xamarin.universal.pkg <_AptGetInstall>apt-get -f -u install @@ -57,10 +57,10 @@ $(_AptGetInstall) vim-common - 4.9.3 - 5.1.99 + 5.2.0 + 5.2.99 $(MSBuildThisFileDirectory)..\scripts\mono-version - https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-02/c5/c52c4bd713e19339a5859e73a99dbb4cc21c6d3f/$(_DarwinMonoFramework) + https://bosstoragemirror.blob.core.windows.net/wrench/mono-2017-04/92/92503db79568d1ef66a5445cb889ccbb8c8bd343/$(_DarwinMonoFramework) installer -pkg "$(AndroidToolchainCacheDirectory)\$(_DarwinMonoFramework)" -target / From 180bc05336b2f70cfb7d81ab9c4b0f79b2c18d72 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Fri, 7 Apr 2017 13:44:50 +0200 Subject: [PATCH 06/20] Bump linker --- external/linker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/linker b/external/linker index c6516103e01..c7450ca2669 160000 --- a/external/linker +++ b/external/linker @@ -1 +1 @@ -Subproject commit c6516103e01383697b7eeda21e1d11b9d9609bed +Subproject commit c7450ca2669becddffdea7dcdcc06692e57989e1 From e2f8f2093f15d56f174a64e393a3e311d20bca93 Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Fri, 7 Apr 2017 13:44:21 +0200 Subject: [PATCH 07/20] Add new linker files --- .../Xamarin.Android.Build.Tasks.csproj | 6 ++++++ 1 file changed, 6 insertions(+) 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 03b9b82d881..a06b4f6e15a 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj @@ -343,6 +343,12 @@ Linker\Mono.Linker.Steps\MarkStep.cs + + Linker\Mono.Linker\LoadException.cs + + + Linker\Mono.Linker\MarkException.cs + From abbc33d91ff1ab9b4c6b1a3b79791685d8f9f6ba Mon Sep 17 00:00:00 2001 From: Rodrigo Kumpera Date: Tue, 11 Apr 2017 15:07:00 -0700 Subject: [PATCH 08/20] Update csproj to use the files that are now on the mono tree. --- src/Mono.Posix/Mono.Posix.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Mono.Posix/Mono.Posix.csproj b/src/Mono.Posix/Mono.Posix.csproj index 14f1a3f53fb..09c4407b2ec 100644 --- a/src/Mono.Posix/Mono.Posix.csproj +++ b/src/Mono.Posix/Mono.Posix.csproj @@ -68,9 +68,6 @@ - - - Android.Runtime\CPUArchitecture.cs @@ -128,6 +125,9 @@ Mono.Unix.Native\NativeConvert.cs + + Mono.Unix.Android\AndroidUtils.cs + Mono.Unix.Native\NativeConvert.generated.cs From 0915d5097095018e193ab9331ef4bdd923f1bea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 14 Apr 2017 01:56:17 +0200 Subject: [PATCH 09/20] Bump mono to latest 2017-04 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 92503db7956..9051fff9d88 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 92503db79568d1ef66a5445cb889ccbb8c8bd343 +Subproject commit 9051fff9d88da29435b4b0faa1815f404564a941 From d6893bc590d611da402e48d86a74b18c1e8a1a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 14 Apr 2017 01:56:57 +0200 Subject: [PATCH 10/20] Build netstandard.dll and System.Drawing.Primitives.dll facades The old project for System.Drawing.Primitives was removed in favor of building the assembly with the existing logic in Mono. --- Xamarin.Android.sln | 13 ++- .../System.Drawing.Primitives.csproj | 79 ------------------- .../System.Drawing.Primitives.mdproj | 29 +++++++ .../System.Drawing.Primitives.targets | 27 +++++++ src/netstandard/netstandard.mdproj | 29 +++++++ src/netstandard/netstandard.targets | 27 +++++++ 6 files changed, 124 insertions(+), 80 deletions(-) delete mode 100644 src/System.Drawing.Primitives/System.Drawing.Primitives.csproj create mode 100644 src/System.Drawing.Primitives/System.Drawing.Primitives.mdproj create mode 100644 src/System.Drawing.Primitives/System.Drawing.Primitives.targets create mode 100644 src/netstandard/netstandard.mdproj create mode 100644 src/netstandard/netstandard.targets diff --git a/Xamarin.Android.sln b/Xamarin.Android.sln index 703d3c282a0..01220fe8f55 100644 --- a/Xamarin.Android.sln +++ b/Xamarin.Android.sln @@ -83,7 +83,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenTK", "src\OpenTK-1.0\Op EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libZipSharp", "external\LibZipSharp\libZipSharp.csproj", "{E248B2CA-303B-4645-ADDC-9D4459D550FD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives", "src\System.Drawing.Primitives\System.Drawing.Primitives.csproj", "{C9FF2E4D-D927-479E-838B-647C16763F64}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives", "src\System.Drawing.Primitives\System.Drawing.Primitives.mdproj", "{C9FF2E4D-D927-479E-838B-647C16763F64}" EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "libzip-windows", "build-tools\libzip-windows\libzip-windows.mdproj", "{0DE278D6-000F-4001-BB98-187C0AF58A61}" EndProject @@ -109,6 +109,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xamarin.Android.Build.Tests EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "create-vsix", "build-tools\create-vsix\create-vsix.csproj", "{94756FEB-1F64-411D-A18E-81B5158F776A}" EndProject +Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "netstandard", "src\netstandard\netstandard.mdproj", "{93614CB8-4564-43B9-93B0-4AF4B3B16AAE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|AnyCPU = Debug|AnyCPU @@ -499,6 +501,14 @@ Global {94756FEB-1F64-411D-A18E-81B5158F776A}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU {94756FEB-1F64-411D-A18E-81B5158F776A}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU {94756FEB-1F64-411D-A18E-81B5158F776A}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU + {93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.Debug|AnyCPU.ActiveCfg = Debug|Any CPU + {93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.Debug|AnyCPU.Build.0 = Debug|Any CPU + {93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.Release|AnyCPU.ActiveCfg = Release|Any CPU + {93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.Release|AnyCPU.Build.0 = Release|Any CPU + {93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationDebug|AnyCPU.ActiveCfg = Debug|Any CPU + {93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationDebug|AnyCPU.Build.0 = Debug|Any CPU + {93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationRelease|AnyCPU.ActiveCfg = Debug|Any CPU + {93614CB8-4564-43B9-93B0-4AF4B3B16AAE}.XAIntegrationRelease|AnyCPU.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {8FF78EB6-6FC8-46A7-8A15-EBBA9045C5FA} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62} @@ -551,6 +561,7 @@ Global {A87352E6-CE7F-4346-B6B1-586AE931C0A7} = {864062D3-A415-4A6F-9324-5820237BA058} {BD1D66BF-5AC7-4926-8EBE-B2198A112EB0} = {CAB438D8-B0F5-4AF0-BEBD-9E2ADBD7B483} {94756FEB-1F64-411D-A18E-81B5158F776A} = {E351F97D-EA4F-4E7F-AAA0-8EBB1F2A4A62} + {93614CB8-4564-43B9-93B0-4AF4B3B16AAE} = {04E3E11E-B47D-4599-8AFC-50515A95E715} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 diff --git a/src/System.Drawing.Primitives/System.Drawing.Primitives.csproj b/src/System.Drawing.Primitives/System.Drawing.Primitives.csproj deleted file mode 100644 index 724f452cf61..00000000000 --- a/src/System.Drawing.Primitives/System.Drawing.Primitives.csproj +++ /dev/null @@ -1,79 +0,0 @@ - - - - Debug - AnyCPU - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {C9FF2E4D-D927-479E-838B-647C16763F64} - Library - System.Drawing - System.Drawing.Primitives - true - false - Resources - Assets - false - - - - - $(MonoSourceFullPath)\mcs\class\mono.pub - - - true - full - false - ..\..\bin\$(Configuration)\lib\xbuild-frameworks\MonoAndroid\v1.0\Facades - DEBUG; - prompt - 4 - false - - - true - ..\..\bin\$(Configuration)\lib\xbuild-frameworks\MonoAndroid\v1.0\Facades - prompt - 4 - false - - - - $(OutputPath)..\mscorlib.dll - False - - - $(OutputPath)..\System.dll - False - - - $(OutputPath)..\System.Core.dll - False - - - $(OutputPath)..\System.Xml.dll - False - - - $(OutputPath)..\Java.Interop.dll - False - - - - - - - - - - {66CF299A-CE95-4131-BCD8-DB66E30C4BF7} - Mono.Android - False - - - {3F1F2F50-AF1A-4A5A-BEDB-193372F068D7} - Xamarin.Android.Build.Tasks - False - False - - - \ No newline at end of file diff --git a/src/System.Drawing.Primitives/System.Drawing.Primitives.mdproj b/src/System.Drawing.Primitives/System.Drawing.Primitives.mdproj new file mode 100644 index 00000000000..f231340f7cc --- /dev/null +++ b/src/System.Drawing.Primitives/System.Drawing.Primitives.mdproj @@ -0,0 +1,29 @@ + + + Debug + AnyCPU + GenericProject + {C9FF2E4D-D927-479E-838B-647C16763F64} + ..\..\bin\$(Configuration)\lib\xbuild-frameworks\MonoAndroid\v1.0\Facades + + + + + + + + + + ResolveReferences; + _BuildSystemDrawingPrimitivesFacade + + + + + + {66CF299A-CE95-4131-BCD8-DB66E30C4BF7} + Mono.Android + False + + + diff --git a/src/System.Drawing.Primitives/System.Drawing.Primitives.targets b/src/System.Drawing.Primitives/System.Drawing.Primitives.targets new file mode 100644 index 00000000000..9fac5dfce85 --- /dev/null +++ b/src/System.Drawing.Primitives/System.Drawing.Primitives.targets @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + diff --git a/src/netstandard/netstandard.mdproj b/src/netstandard/netstandard.mdproj new file mode 100644 index 00000000000..bb156e6d507 --- /dev/null +++ b/src/netstandard/netstandard.mdproj @@ -0,0 +1,29 @@ + + + Debug + AnyCPU + GenericProject + {93614CB8-4564-43B9-93B0-4AF4B3B16AAE} + ..\..\bin\$(Configuration)\lib\xbuild-frameworks\MonoAndroid\v1.0\Facades + + + + + + + + + + ResolveReferences; + _BuildNetstandardFacade + + + + + + {66CF299A-CE95-4131-BCD8-DB66E30C4BF7} + Mono.Android + False + + + diff --git a/src/netstandard/netstandard.targets b/src/netstandard/netstandard.targets new file mode 100644 index 00000000000..8dfd7eb2cf6 --- /dev/null +++ b/src/netstandard/netstandard.targets @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + From 3223cc27ebfaac0206dc8ab5f6880b8c9b8a3c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 14 Apr 2017 13:38:51 +0200 Subject: [PATCH 11/20] Remove file that I forgot to remove in last commit --- .../Properties/AssemblyInfo.cs | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 src/System.Drawing.Primitives/Properties/AssemblyInfo.cs diff --git a/src/System.Drawing.Primitives/Properties/AssemblyInfo.cs b/src/System.Drawing.Primitives/Properties/AssemblyInfo.cs deleted file mode 100644 index 9dbf5a4bee4..00000000000 --- a/src/System.Drawing.Primitives/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Assembly forwards -[assembly: TypeForwardedTo (typeof (System.Drawing.Point))] -[assembly: TypeForwardedTo (typeof (System.Drawing.PointF))] -[assembly: TypeForwardedTo (typeof (System.Drawing.Rectangle))] -[assembly: TypeForwardedTo (typeof (System.Drawing.RectangleF))] -[assembly: TypeForwardedTo (typeof (System.Drawing.Size))] -[assembly: TypeForwardedTo (typeof (System.Drawing.SizeF))] From 96c4a60b0a553b1c6ebba9c3214881a3b619f4cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Sat, 22 Apr 2017 17:43:12 +0200 Subject: [PATCH 12/20] Bump mono to latest 2017-04 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 9051fff9d88..645d38b4e26 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 9051fff9d88da29435b4b0faa1815f404564a941 +Subproject commit 645d38b4e2680beea0457577f173f389499bb479 From a38874fc590af3b3b4408f30967b854af058a88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 4 May 2017 04:33:20 +0200 Subject: [PATCH 13/20] Bump mono to latest 2017-04 --- external/mono | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/mono b/external/mono index 645d38b4e26..5e50a6f00ac 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit 645d38b4e2680beea0457577f173f389499bb479 +Subproject commit 5e50a6f00aceb548d732590c7e7a965faa034685 From cc53ba65515ce0c00dd8169c2138e36ae1df02e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 4 May 2017 04:37:47 +0200 Subject: [PATCH 14/20] Update framework assemblies list as some where moved to facades https://github.com/mono/mono/commit/6ca5ec442b494bed8cfb44258c1c73c091ba3122 https://github.com/mono/mono/commit/c38e4d9220b16488e6f8f9e1f05aed4a8af16e62 --- build-tools/mono-runtimes/ProfileAssemblies.projitems | 6 +++--- .../Linker/Mobile.Tuner/MobileProfile.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-tools/mono-runtimes/ProfileAssemblies.projitems b/build-tools/mono-runtimes/ProfileAssemblies.projitems index db880b73b71..18310ed6963 100644 --- a/build-tools/mono-runtimes/ProfileAssemblies.projitems +++ b/build-tools/mono-runtimes/ProfileAssemblies.projitems @@ -64,6 +64,7 @@ + @@ -77,6 +78,7 @@ + @@ -131,6 +133,7 @@ +