Skip to content

Commit d2a31d1

Browse files
dotnet-maestro[bot]jonpryor
dotnet-maestro[bot]
and
jonpryor
authored
Changes: dotnet/installer@cc10fae...3b43390 Changes: dotnet/linker@6eae019...0cb9250 Changes: dotnet/runtime@d019e70...cf52b7e Updates: * Microsoft.Dotnet.Sdk.Internal: from 6.0.100-rc.1.21376.3 to 6.0.100-rc.1.21379.2 * Microsoft.NET.ILLink.Tasks: from 6.0.100-preview.6.21370.1 to 6.0.100-preview.6.21378.1 * Microsoft.NETCore.App.Ref: from 6.0.0-rc.1.21374.7 to 6.0.0-rc.1.21378.2 Bump to Mono.Cecil 0.11.4. Hopefully fixes a [build break][0]: 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' Bump `$(MonoCecilVersion)` to compensate? Note: an actual fix very likely requires a Java.Interop bump, as Java.Interop references Cecil 0.11.3 (same as the error message) while `$(MonoCecilVersion)` is 0.11.2 (not present in the error). [0]: #6131 (review) Context: #6131 (review) Context: fcb9ea3 Changes: http://github.com/xamarin/Java.Interop/compare/4fb7c147f8c6eb9bf94d9bfb8305c7d2a7a9fb33...dd1ef455ee4fbfa7e17f34c51cbe2ef24459e2e6 * dotnet/java-interop@dd1ef45: Bump to dotnet/linker@b888d67 Mono.Cecil 0.11.4 (#861) Commit fcb9ea3 didn't fix the build breakage. Bump to dotnet/java-interop@dd1ef45 and set `$(_XamarinAndroidCecilVersion)`, which will override the Mono.Cecil NuGet package version within the Java.Interop build. This will hopefully ensure/allow everything to now use Cecil 0.11.4. TODO: This Quick-And-Dirty approach hardcodes `$(_XamarinAndroidCecilVersion)`=0.11.4, meaning we now have two different properties for the same thing: Directory.Build.props: <MonoCecilVersion>0.11.4</MonoCecilVersion> build-tools/scripts/Configuration.Java.Interop.Override.props: <_XamarinAndroidCecilVersion>0.11.4</_XamarinAndroidCecilVersion> This is "undesirable". Is there a way to update `xaprepare` so that we can generate `external/Java.Interop/Configuration.Override.props` so that `$(_XamarinAndroidCecilVersion)`=`$(MonoCecilVersion)`? (Assuming that this approach even works…) Co-authored-by: Jonathan Pryor <jonpryor@vt.edu>
1 parent 8140991 commit d2a31d1

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<PropertyGroup>
2929
<LibZipSharpVersion>2.0.0-alpha7</LibZipSharpVersion>
3030
<MicroBuildCoreVersion>0.4.1</MicroBuildCoreVersion>
31-
<MonoCecilVersion>0.11.2</MonoCecilVersion>
31+
<MonoCecilVersion>0.11.4</MonoCecilVersion>
3232
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
3333
<NuGetApiPackageVersion>5.4.0</NuGetApiPackageVersion>
3434
<LZ4PackageVersion>1.1.11</LZ4PackageVersion>

‎build-tools/scripts/Configuration.Java.Interop.Override.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4+
<!-- TODO: can we somehow grab the $(MonoCecilVersion) value in Directory.Build.props? -->
5+
<_XamarinAndroidCecilVersion>0.11.4</_XamarinAndroidCecilVersion>
46
<CecilSourceDirectory>$(MSBuildThisFileDirectory)..\..\external\mono\external\cecil</CecilSourceDirectory>
57
<UtilityOutputFullPath>$(MSBuildThisFileDirectory)..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\</UtilityOutputFullPath>
68
<UtilityOutputFullPathCoreApps>$(MSBuildThisFileDirectory)..\..\bin\$(Configuration)-net6.0\</UtilityOutputFullPathCoreApps>

‎eng/Version.Details.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.1.21376.3">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-rc.1.21379.2">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>cc10fae58ef8f2b74de9b069a52348ba04f0d8a8</Sha>
5+
<Sha>3b433901a1bb025b3acb3ca2f73fc7c43ffd98b6</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21370.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21378.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/mono/linker</Uri>
9-
<Sha>6eae01980dc694107bdee0bc723d75a0dd601f0e</Sha>
9+
<Sha>0cb9250a903cfc90cbac602ed79c0cbc588d8d3f</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21374.7" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-rc.1.21378.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>d019e70d2b7c2f7cd1137fac084dbcdc3d2e05f5</Sha>
13+
<Sha>cf52b7e38d28b7e28358cee052effe0ed47efb2e</Sha>
1414
</Dependency>
1515
</ProductDependencies>
1616
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21376.3</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21370.1</MicrosoftNETILLinkTasksPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-rc.1.21379.2</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21378.1</MicrosoftNETILLinkTasksPackageVersion>
66
<MicrosoftDotNetApiCompatPackageVersion>5.0.0-beta.20181.7</MicrosoftDotNetApiCompatPackageVersion>
77
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
8-
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.1.21374.7</MicrosoftNETCoreAppRefPackageVersion>
8+
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.1.21378.2</MicrosoftNETCoreAppRefPackageVersion>
99
</PropertyGroup>
1010
<PropertyGroup>
1111
<!-- Trim all characters after first `-` or `+` is encountered. -->

‎external/Java.Interop‎

0 commit comments

Comments
 (0)