diff --git a/Directory.Build.props b/Directory.Build.props index 742eea99ee7..7b4ecb0e3c5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -28,7 +28,7 @@ 2.0.0-alpha7 0.4.1 - 0.11.2 + 0.11.4 13.0.1 5.4.0 1.1.11 diff --git a/build-tools/scripts/Configuration.Java.Interop.Override.props b/build-tools/scripts/Configuration.Java.Interop.Override.props index 299041652cc..e99e4f7005a 100644 --- a/build-tools/scripts/Configuration.Java.Interop.Override.props +++ b/build-tools/scripts/Configuration.Java.Interop.Override.props @@ -1,6 +1,8 @@ + + <_XamarinAndroidCecilVersion>0.11.4 $(MSBuildThisFileDirectory)..\..\external\mono\external\cecil $(MSBuildThisFileDirectory)..\..\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\ $(MSBuildThisFileDirectory)..\..\bin\$(Configuration)-net6.0\ diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df040fbbd73..10ab418e3cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - cc10fae58ef8f2b74de9b069a52348ba04f0d8a8 + 3b433901a1bb025b3acb3ca2f73fc7c43ffd98b6 - + https://github.com/mono/linker - 6eae01980dc694107bdee0bc723d75a0dd601f0e + 0cb9250a903cfc90cbac602ed79c0cbc588d8d3f - + https://github.com/dotnet/runtime - d019e70d2b7c2f7cd1137fac084dbcdc3d2e05f5 + cf52b7e38d28b7e28358cee052effe0ed47efb2e diff --git a/eng/Versions.props b/eng/Versions.props index 1a3bd89e119..8eb044d75c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.100-rc.1.21376.3 - 6.0.100-preview.6.21370.1 + 6.0.100-rc.1.21379.2 + 6.0.100-preview.6.21378.1 5.0.0-beta.20181.7 6.0.0-beta.21212.6 - 6.0.0-rc.1.21374.7 + 6.0.0-rc.1.21378.2 diff --git a/external/Java.Interop b/external/Java.Interop index 4fb7c147f8c..dd1ef455ee4 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 4fb7c147f8c6eb9bf94d9bfb8305c7d2a7a9fb33 +Subproject commit dd1ef455ee4fbfa7e17f34c51cbe2ef24459e2e6