From 5260199cf1b9fc8ec1d85adc94fa5b48c2bcdb85 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Tue, 27 Jul 2021 20:03:43 -0400 Subject: [PATCH] Bump to mono/linker/main@b888d67 Mono.Cecil 0.11.4 Context: https://github.com/xamarin/xamarin-android/pull/6131 Changes: Unknown; can't find commit which matches 0.11.2. xamarin/xamarin-android#6131 is currently failing to build due to a Mono.Cecil version mismatch: CSC : error CS1705: Assembly 'illink' with identity 'illink, Version=6.0.100.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35' uses 'Mono.Cecil, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e' which has a higher version than referenced assembly 'Mono.Cecil' with identity 'Mono.Cecil, Version=0.11.3.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e' We thus need to bump all use of Mono.Cecil 0.11.2 to 0.11.4. Unfortunately, at this point in time there's no way for xamarin/xamarin-android to explicitly control which Mono.Cecil NuGet package version is used by Java.Interop. Introduce a new `$(_XamarinAndroidCecilVersion)` MSBuild property which can be used to override the default Mono.Cecil package version of 0.11.4 (up from 0.11.2). The xamarin-android build can then set `$(_XamarinAndroidCecilVersion)` by using `Configuration.Override.props`. --- build-tools/scripts/cecil.projitems | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-tools/scripts/cecil.projitems b/build-tools/scripts/cecil.projitems index 5dbc0e08a..400d9ef10 100644 --- a/build-tools/scripts/cecil.projitems +++ b/build-tools/scripts/cecil.projitems @@ -1,7 +1,10 @@ + + <_XamarinAndroidCecilVersion Condition=" '$(_XamarinAndroidCecilVersion)' == '' ">0.11.4 + - +