From 076e694fd9235936d2088a50c0a6b6bbde4d18ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Sep 2024 13:41:25 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/runtime build 20240830.10 Microsoft.NET.ILLink , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Ref From Version 8.0.8-servicing.24366.11 -> To Version 8.0.10-servicing.24430.10 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.8 -> To Version 8.0.9 (parent: Microsoft.NETCore.App.Ref --- NuGet.config | 8 ++------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f9c1880751..118bd0ded92 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,14 +4,10 @@ - - - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d54b12b58fe..6462a877325 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ https://github.com/dotnet/installer b638a84fbafecc0981b5fddc5cb96e48386a3597 - + https://github.com/dotnet/runtime - 2d5c0b720cf0c7244996512dabcb504acdbaa221 + ca415e95171f3fa58bd142c40f9a14fa30308671 - + https://github.com/dotnet/runtime - 2d5c0b720cf0c7244996512dabcb504acdbaa221 + ca415e95171f3fa58bd142c40f9a14fa30308671 - + https://github.com/dotnet/runtime - 2d5c0b720cf0c7244996512dabcb504acdbaa221 + ca415e95171f3fa58bd142c40f9a14fa30308671 - + https://github.com/dotnet/emsdk - 2674f580a4b1d27322914df8488498065e71a3f2 + d6672570f0fde2a4a3c7e65d60cec9f8406b039c https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index ad8ab52463f..b42378de76e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,12 +2,12 @@ 8.0.205-servicing.24212.27 - 8.0.8-servicing.24366.11 - 8.0.8 - 8.0.8 + 8.0.10-servicing.24430.10 + 8.0.10 + 8.0.10 7.0.0-beta.22103.1 9.0.0-beta.24408.2 - 8.0.8 + 8.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version) 7.0.100-rc.1.22410.7 0.11.4-alpha.23509.2 From b53d65651d53e7077dbaf5e70ed4ebae57734754 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Sep 2024 15:13:03 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/runtime build 20240916.9 Microsoft.NET.ILLink , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Ref From Version 8.0.10-servicing.24430.10 -> To Version 8.0.10-servicing.24466.9 --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 118bd0ded92..9c01083f4b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6462a877325..4e8fdfa0b9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ https://github.com/dotnet/installer b638a84fbafecc0981b5fddc5cb96e48386a3597 - + https://github.com/dotnet/runtime - ca415e95171f3fa58bd142c40f9a14fa30308671 + b5f53494d6541a1ef9b7d0e13214d5e5e5cec594 https://github.com/dotnet/runtime - ca415e95171f3fa58bd142c40f9a14fa30308671 + b5f53494d6541a1ef9b7d0e13214d5e5e5cec594 https://github.com/dotnet/runtime - ca415e95171f3fa58bd142c40f9a14fa30308671 + b5f53494d6541a1ef9b7d0e13214d5e5e5cec594 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index b42378de76e..908f627afde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ 8.0.205-servicing.24212.27 - 8.0.10-servicing.24430.10 + 8.0.10-servicing.24466.9 8.0.10 8.0.10 7.0.0-beta.22103.1 From 5e4aeab0bcf23a945caaaea708beb6cafa28eb7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Sep 2024 13:40:43 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/runtime build 20240924.5 Microsoft.NET.ILLink , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Ref From Version 8.0.10-servicing.24466.9 -> To Version 8.0.10-servicing.24474.5 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.9 -> To Version 8.0.10 (parent: Microsoft.NETCore.App.Ref --- NuGet.config | 9 +++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9c01083f4b8..48119cc6968 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,15 @@ - + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e8fdfa0b9e..41c90179c8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ https://github.com/dotnet/installer b638a84fbafecc0981b5fddc5cb96e48386a3597 - + https://github.com/dotnet/runtime - b5f53494d6541a1ef9b7d0e13214d5e5e5cec594 + eeb6f525300cd8312185decc2805a1651d312e23 https://github.com/dotnet/runtime - b5f53494d6541a1ef9b7d0e13214d5e5e5cec594 + eeb6f525300cd8312185decc2805a1651d312e23 https://github.com/dotnet/runtime - b5f53494d6541a1ef9b7d0e13214d5e5e5cec594 + eeb6f525300cd8312185decc2805a1651d312e23 - + https://github.com/dotnet/emsdk - d6672570f0fde2a4a3c7e65d60cec9f8406b039c + 91b783edc518e9ea0c0e883016b02261893389db https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index 908f627afde..6b02cc626b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,12 +2,12 @@ 8.0.205-servicing.24212.27 - 8.0.10-servicing.24466.9 + 8.0.10-servicing.24474.5 8.0.10 8.0.10 7.0.0-beta.22103.1 9.0.0-beta.24408.2 - 8.0.9 + 8.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version) 7.0.100-rc.1.22410.7 0.11.4-alpha.23509.2 From e1dfc1d907fd736c398dbf38fe6dc7e46e9c0fc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Oct 2024 13:05:40 +0000 Subject: [PATCH 4/7] Update dependencies from https://github.com/dotnet/runtime build 20241008.13 Microsoft.NET.ILLink , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Ref From Version 8.0.10-servicing.24474.5 -> To Version 8.0.11-servicing.24508.13 --- NuGet.config | 3 ++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 48119cc6968..85b7dad1231 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + @@ -12,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41c90179c8e..1c385b98c16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ https://github.com/dotnet/installer b638a84fbafecc0981b5fddc5cb96e48386a3597 - + https://github.com/dotnet/runtime - eeb6f525300cd8312185decc2805a1651d312e23 + ef07c4f26e56f6d140938c88ba64375dfefc285f - + https://github.com/dotnet/runtime - eeb6f525300cd8312185decc2805a1651d312e23 + ef07c4f26e56f6d140938c88ba64375dfefc285f - + https://github.com/dotnet/runtime - eeb6f525300cd8312185decc2805a1651d312e23 + ef07c4f26e56f6d140938c88ba64375dfefc285f https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 6b02cc626b4..ac4f88b14c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,9 +2,9 @@ 8.0.205-servicing.24212.27 - 8.0.10-servicing.24474.5 - 8.0.10 - 8.0.10 + 8.0.11-servicing.24508.13 + 8.0.11 + 8.0.11 7.0.0-beta.22103.1 9.0.0-beta.24408.2 8.0.10 From cfe516f8ffbdaf592131d10bcdcc9b8a82332a7d Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Mon, 14 Oct 2024 10:09:02 -0500 Subject: [PATCH 5/7] [tests] use floating 8.x packages Fixes: warning NU1903: Package 'System.Text.Json' 6.0.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-8g4q-xg66-9fp4 --- .../Tests/Xamarin.Android.Build.Tests/BuildTest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs index d850610be4b..8082c46e90e 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs @@ -38,10 +38,10 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo PackageReferences = { new Package { Id = "Xamarin.AndroidX.AppCompat", Version = "1.3.1.1" }, // Using * here, so we explicitly get newer packages - new Package { Id = "Microsoft.AspNetCore.Components.WebView", Version = "6.0.0-*" }, - new Package { Id = "Microsoft.Extensions.FileProviders.Embedded", Version = "6.0.0-*" }, - new Package { Id = "Microsoft.JSInterop", Version = "6.0.0-*" }, - new Package { Id = "System.Text.Json", Version = "6.0.0-*" }, + new Package { Id = "Microsoft.AspNetCore.Components.WebView", Version = "8.*-*" }, + new Package { Id = "Microsoft.Extensions.FileProviders.Embedded", Version = "8.*-*" }, + new Package { Id = "Microsoft.JSInterop", Version = "8.*-*" }, + new Package { Id = "System.Text.Json", Version = "8.*-*" }, }, Sources = { new BuildItem ("EmbeddedResource", "Foo.resx") { From 8252bd3e191f288e35a01ea307e747fe13d068bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Oct 2024 13:12:22 +0000 Subject: [PATCH 6/7] Update dependencies from https://github.com/dotnet/runtime build 20241017.6 Microsoft.NET.ILLink , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Ref From Version 8.0.11-servicing.24508.13 -> To Version 8.0.11-servicing.24517.6 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.10 -> To Version 8.0.11 (parent: Microsoft.NETCore.App.Ref --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 85b7dad1231..36ad52e1490 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,16 +4,10 @@ - - - - - - - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c385b98c16..7c05cfe2682 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,21 +4,21 @@ https://github.com/dotnet/installer b638a84fbafecc0981b5fddc5cb96e48386a3597 - + https://github.com/dotnet/runtime - ef07c4f26e56f6d140938c88ba64375dfefc285f + 82d4dbfc06a745b9404152b3281eb9559ca1f0d3 https://github.com/dotnet/runtime - ef07c4f26e56f6d140938c88ba64375dfefc285f + 82d4dbfc06a745b9404152b3281eb9559ca1f0d3 https://github.com/dotnet/runtime - ef07c4f26e56f6d140938c88ba64375dfefc285f + 82d4dbfc06a745b9404152b3281eb9559ca1f0d3 - + https://github.com/dotnet/emsdk - 91b783edc518e9ea0c0e883016b02261893389db + f6237140b33bf18c72dccfeda14be8d103c3b93e https://github.com/dotnet/cecil diff --git a/eng/Versions.props b/eng/Versions.props index ac4f88b14c9..269bbc1a98e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,12 +2,12 @@ 8.0.205-servicing.24212.27 - 8.0.11-servicing.24508.13 + 8.0.11-servicing.24517.6 8.0.11 8.0.11 7.0.0-beta.22103.1 9.0.0-beta.24408.2 - 8.0.10 + 8.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version) 7.0.100-rc.1.22410.7 0.11.4-alpha.23509.2 From e990720b20e7aab231f12784a3f74e90c0f7f1e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Nov 2024 14:05:50 +0000 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/runtime build 20241105.7 Microsoft.NET.ILLink , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Ref From Version 8.0.8-servicing.24366.11 -> To Version 8.0.12-servicing.24555.7 --- NuGet.config | 11 ++++++++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36ad52e1490..e502cac0a07 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,18 @@ + + + + + + + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c05cfe2682..df3f81537ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ https://github.com/dotnet/installer b638a84fbafecc0981b5fddc5cb96e48386a3597 - + https://github.com/dotnet/runtime - 82d4dbfc06a745b9404152b3281eb9559ca1f0d3 + c1ae962610643a3c17bcf9621017ac42ff7703f7 - + https://github.com/dotnet/runtime - 82d4dbfc06a745b9404152b3281eb9559ca1f0d3 + c1ae962610643a3c17bcf9621017ac42ff7703f7 - + https://github.com/dotnet/runtime - 82d4dbfc06a745b9404152b3281eb9559ca1f0d3 + c1ae962610643a3c17bcf9621017ac42ff7703f7 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 269bbc1a98e..0ff1cbab391 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,9 +2,9 @@ 8.0.205-servicing.24212.27 - 8.0.11-servicing.24517.6 - 8.0.11 - 8.0.11 + 8.0.12-servicing.24555.7 + 8.0.12 + 8.0.12 7.0.0-beta.22103.1 9.0.0-beta.24408.2 8.0.11