From 6b763ab8eac97f8985359c65c4b866ecce600af0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 18 Aug 2023 12:40:51 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/installer build 20230817.18 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.1.23417.5 -> To Version 8.0.100-rc.1.23417.18 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index add2149e846..3b1433d980b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 684771d03c2bb6deb58e20448c9be29191d2d445 + 38916ede075e157549f6f8922c8abe2aeeb8ba87 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 59e2aa286d2..dd09241f11d 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.23417.18 8.0.0-rc.1.23414.4 8.0.0-rc.1.23414.4 7.0.0-beta.22103.1 From 9ea76c79d39eb3739844ac8e762ea0fe900168ac Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 18 Aug 2023 13:59:45 -0500 Subject: [PATCH 02/10] Feeds for dotnet/runtime 7.0.11 --- NuGet.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5e5f9f5e6a7..0727d65d4cb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,9 +11,9 @@ - - - + + + From 77e480286d8b78840d3dcdb4093b2405b01044d2 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 18 Aug 2023 14:27:00 -0500 Subject: [PATCH 03/10] Feeds for dotnet/runtime 6.0.22 --- NuGet.config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NuGet.config b/NuGet.config index 0727d65d4cb..db7a1a5ea28 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,9 @@ + + + From 440bacdcaef1583df3797fb342c0f88607d3bc76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 22 Aug 2023 12:39:36 +0000 Subject: [PATCH 04/10] Update dependencies from https://github.com/dotnet/installer build 20230822.1 Microsoft.Dotnet.Sdk.Internal From Version 8.0.100-rc.1.23417.5 -> To Version 8.0.100-rc.1.23422.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b1433d980b..a56e2451e51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - 38916ede075e157549f6f8922c8abe2aeeb8ba87 + 85170c1c70401fabee8d4ed9345ff71df450eb8f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index dd09241f11d..72ee45aaa27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-rc.1.23417.18 + 8.0.100-rc.1.23422.1 8.0.0-rc.1.23414.4 8.0.0-rc.1.23414.4 7.0.0-beta.22103.1 From 1bbefa3a83ba09250f98a9f784b0cf80f9784c8f Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 22 Aug 2023 09:28:45 -0500 Subject: [PATCH 05/10] Bump to xamarin/java.interop/release/8.0.1xx-rc1@81c228d1 Changes: https://github.com/xamarin/java.interop/compare/5adb4d48...81c228d1 --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 5adb4d48727..81c228d1ff6 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 5adb4d487279d52dc10055f31bd1da9e1efab3ef +Subproject commit 81c228d1ff6a4c658a7119e25e58cba2656b0e40 From f56fb017bd51e167c78d6810db8eb20ed26f728a Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 22 Aug 2023 09:34:16 -0500 Subject: [PATCH 06/10] Bump to xamarin/xamarin-android-tools/release/8.0.1xx-rc1@2b8ac126 Changes: https://github.com/xamarin/xamarin-android-tools/compare/52f0866c...2b8ac126 --- external/xamarin-android-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 3043d432cf271d8f7e0a5c858d755f2ef1aca284 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 22 Aug 2023 11:09:37 -0500 Subject: [PATCH 07/10] Bump to xamarin/java.interop/release/8.0.1xx-rc1@426bd040 --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 81c228d1ff6..426bd040193 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 81c228d1ff6a4c658a7119e25e58cba2656b0e40 +Subproject commit 426bd040193d05a4f7e4bfbd453e2deae6bff83a From c9bfaa26cce81cb8598ee567e9e446e40efb3e2d Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 22 Aug 2023 11:25:30 -0500 Subject: [PATCH 08/10] Bump to xamarin/java.interop/release/8.0.1xx-rc1@1c715a50 --- external/Java.Interop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Java.Interop b/external/Java.Interop index 426bd040193..1c715a504b4 160000 --- a/external/Java.Interop +++ b/external/Java.Interop @@ -1 +1 @@ -Subproject commit 426bd040193d05a4f7e4bfbd453e2deae6bff83a +Subproject commit 1c715a504b47cccbda72d031f048e5b8fb5ab593 From 2a064808dc0867dc3e346b556fc28beb66779ac5 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 22 Aug 2023 13:20:59 -0500 Subject: [PATCH 09/10] Bump to xamarin/monodroid/release/8.0.1xx-rc1@release/8.0.1xx-rc1@6e57bd3e --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 80993205d75..37623a8713d 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:main@a524859192e6eca6cea45313e5f95b8d04a698bf +xamarin/monodroid:release/8.0.1xx-rc1@6e57bd3ec72330e20d59380717b09e56322d2ef8 mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d From 1cfffa92b5328fe5ed1cf96cd435e4b2573ad27c Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 22 Aug 2023 16:23:03 -0500 Subject: [PATCH 10/10] DisableTransitiveFrameworkReferenceDownloads in tests --- .../Tests/Xamarin.ProjectTools/Common/XamarinProject.cs | 1 + 1 file changed, 1 insertion(+) 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 " });