From 08fc4bc07dd0d31240b4b18ecb0a4fd478aadae3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Aug 2024 13:00:56 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/dotnet/sdk build 20240821.9 Microsoft.NET.Sdk From Version 9.0.100-rc.1.24419.12 -> To Version 9.0.100-rc.1.24421.9 Dependency coherency updates Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil From Version 9.0.0-rc.1.24414.5 -> To Version 9.0.0-rc.1.24420.11 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a82549a722b..f15695cb023 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,24 +1,24 @@ - + https://github.com/dotnet/sdk - df308001e5fe3c7180182e603bcda0590beac331 + 1854762845800fc53d6395c35e24fc1f27e8ce35 - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + fe0cfd55339cc2a0d745f742a48d5e880c112ec2 - + https://github.com/dotnet/runtime - 0fbd81404d1f211572387498474063bc6f407f0f + fe0cfd55339cc2a0d745f742a48d5e880c112ec2 - + https://github.com/dotnet/emsdk - edf3e90fa25b1fc4f7f63ceb45ef70f49c6b121a + 459c92904b224d125a350a3f3e431fe90152a95e - + https://github.com/dotnet/cecil - b9d928a9d65ed39b9257846e1b8e853cea609c00 + ed276e79e30bffc3e6405afa8a9323ec7e67c700 diff --git a/eng/Versions.props b/eng/Versions.props index 1c51a523b77..6f543ec3bb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,16 +1,16 @@ - 9.0.100-rc.1.24419.12 + 9.0.100-rc.1.24421.9 $(MicrosoftNETSdkPackageVersion) - 9.0.0-rc.1.24414.5 - 9.0.0-rc.1.24414.5 + 9.0.0-rc.1.24420.11 + 9.0.0-rc.1.24420.11 7.0.0-beta.22103.1 9.0.0-beta.24408.2 - 9.0.0-rc.1.24402.2 + 9.0.0-rc.1.24416.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion) 7.0.100-rc.1.22410.7 - 0.11.5-alpha.24379.1 + 0.11.5-alpha.24413.1 $(MicrosoftNETCoreAppRefPackageVersion) From 6266c4be6cd98165b0dbcf70455d08e7644d9009 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 21 Aug 2024 08:38:01 -0500 Subject: [PATCH 2/9] Feeds for dotnet/runtime 8.0.9 Context: https://github.com/dotnet/android/blob/45af0b5ffe0b4c59d2282a514abedec39f8de39f/NuGet.config#L7-L10 --- NuGet.config | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a49e32ba4a..186862698f5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,9 +14,9 @@ - - - + + + From 9b66978276f93efcafffa4df93708bfb00390b9a Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 21 Aug 2024 08:55:05 -0500 Subject: [PATCH 3/9] Feeds for dotnet/runtime 6.0.34 Context: https://github.com/dotnet/runtime/commits/release/6.0 --- external/Java.Interop.override.props | 3 +++ external/monodroid.override.props | 3 +++ external/xamarin-android-tools.override.props | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props index 5242a70af3f..16d79d7a22a 100644 --- a/external/Java.Interop.override.props +++ b/external/Java.Interop.override.props @@ -3,6 +3,9 @@ $(MSBuildThisFileDirectory)xamarin-android-tools True + + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json + diff --git a/external/monodroid.override.props b/external/monodroid.override.props index 8cbac6945cf..dd1a2e12d27 100644 --- a/external/monodroid.override.props +++ b/external/monodroid.override.props @@ -2,6 +2,9 @@ $(MSBuildThisFileDirectory)xamarin-android-tools + + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json + diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props index f11b5fdc4b9..0e79a45cf7a 100644 --- a/external/xamarin-android-tools.override.props +++ b/external/xamarin-android-tools.override.props @@ -1,4 +1,9 @@ + + + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json + + From bc9ba1f162cd7d67b449a6faa4917e98e2aaf6fb Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 21 Aug 2024 09:23:23 -0500 Subject: [PATCH 4/9] More feeds for dotnet/runtime 8.0.9 --- external/Java.Interop.override.props | 1 + external/monodroid.override.props | 1 + external/xamarin-android-tools.override.props | 1 + 3 files changed, 3 insertions(+) diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props index 16d79d7a22a..ebd818123f9 100644 --- a/external/Java.Interop.override.props +++ b/external/Java.Interop.override.props @@ -4,6 +4,7 @@ $(MSBuildThisFileDirectory)xamarin-android-tools True + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json; https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json diff --git a/external/monodroid.override.props b/external/monodroid.override.props index dd1a2e12d27..878bcb2c821 100644 --- a/external/monodroid.override.props +++ b/external/monodroid.override.props @@ -3,6 +3,7 @@ $(MSBuildThisFileDirectory)xamarin-android-tools + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json; https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props index 0e79a45cf7a..404a46d3f36 100644 --- a/external/xamarin-android-tools.override.props +++ b/external/xamarin-android-tools.override.props @@ -3,6 +3,7 @@ + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json; https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json From 7f7f50959c5f47948ee4ebe60f310cb27b7337b7 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 21 Aug 2024 09:56:15 -0500 Subject: [PATCH 5/9] Bump to mono/debugger-libs/main@d5664344 Changes: https://github.com/mono/debugger-libs/compare/84c5c67f...d5664344 --- external/debugger-libs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/debugger-libs b/external/debugger-libs index 84c5c67f3eb..d56643445cf 160000 --- a/external/debugger-libs +++ b/external/debugger-libs @@ -1 +1 @@ -Subproject commit 84c5c67f3eb96749012491088d7970a57459e805 +Subproject commit d56643445cfc6ed312cfc100be915be401396132 From a68daf2cf14c6452d04f1ec676946c9fd853c40e Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 21 Aug 2024 09:56:58 -0500 Subject: [PATCH 6/9] Create debugger-libs.override.props Context: https://github.com/mono/debugger-libs/pull/412 --- external/debugger-libs.override.props | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 external/debugger-libs.override.props diff --git a/external/debugger-libs.override.props b/external/debugger-libs.override.props new file mode 100644 index 00000000000..1bcf5416cbf --- /dev/null +++ b/external/debugger-libs.override.props @@ -0,0 +1,8 @@ + + + + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json + + + From 6ae92523f36ff6894e596a80c74f54e9f7d92cf8 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 21 Aug 2024 10:09:32 -0500 Subject: [PATCH 7/9] Feeds for dotnet/aspnetcore 6.0.34 --- external/debugger-libs.override.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/debugger-libs.override.props b/external/debugger-libs.override.props index 1bcf5416cbf..9b92d04dfff 100644 --- a/external/debugger-libs.override.props +++ b/external/debugger-libs.override.props @@ -2,7 +2,8 @@ https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json; - https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-b59c22b0/nuget/v3/index.json; From 9d2ff13fb77fcd596f6067caa7db4c986f7c1762 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 21 Aug 2024 10:59:32 -0500 Subject: [PATCH 8/9] Revert "Feeds for dotnet/aspnetcore 6.0.34" This reverts commit 6ae92523f36ff6894e596a80c74f54e9f7d92cf8. --- external/debugger-libs.override.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/external/debugger-libs.override.props b/external/debugger-libs.override.props index 9b92d04dfff..1bcf5416cbf 100644 --- a/external/debugger-libs.override.props +++ b/external/debugger-libs.override.props @@ -2,8 +2,7 @@ https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json; - https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json; - https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-b59c22b0/nuget/v3/index.json; + https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json From f0b3b40d73711ae6908fc138b61c759333181266 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 21 Aug 2024 11:00:04 -0500 Subject: [PATCH 9/9] Set $(DisableTransitiveFrameworkReferenceDownloads) --- external/debugger-libs.override.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/external/debugger-libs.override.props b/external/debugger-libs.override.props index 1bcf5416cbf..1c4d77d0ac7 100644 --- a/external/debugger-libs.override.props +++ b/external/debugger-libs.override.props @@ -4,5 +4,7 @@ https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ed13b351/nuget/v3/index.json; https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-064a36d9/nuget/v3/index.json + + true