diff --git a/.external b/.external index 7c301a59843..37623a8713d 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:main@057b17fe491f51823eb814f0163bb92686e24991 +xamarin/monodroid:release/8.0.1xx-rc1@6e57bd3ec72330e20d59380717b09e56322d2ef8 mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d diff --git a/NuGet.config b/NuGet.config index 5e5f9f5e6a7..db7a1a5ea28 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,9 +11,12 @@ - - - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34e1b360af3..cf4372e6e78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 684771d03c2bb6deb58e20448c9be29191d2d445 + 85170c1c70401fabee8d4ed9345ff71df450eb8f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c39d74a2195..3ebdb16f131 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-rc.1.23417.5 + 8.0.100-rc.1.23422.1 8.0.0-rc.1.23414.4 8.0.0-rc.1.23419.3 7.0.0-beta.22103.1 diff --git a/external/Java.Interop b/external/Java.Interop index 5adb4d48727..1c715a504b4 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 5adb4d487279d52dc10055f31bd1da9e1efab3ef +Subproject commit 1c715a504b47cccbda72d031f048e5b8fb5ab593 diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 52f0866c7dd..2b8ac126a4c 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 52f0866c7dd3abfb830d1d0642c9468091b864d4 +Subproject commit 2b8ac126a4cd31abe76ccae53631672636db0c76 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs index 7ce6c520bfe..a3fe0d7a4c0 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs @@ -95,6 +95,7 @@ public XamarinProject (string debugConfigurationName = "Debug", string releaseCo $@" {Configuration} + true " });