From b3b11c6372e4738488d477cf532260bd49652c2a Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 15 Aug 2024 17:08:42 +0000 Subject: [PATCH 01/14] Merged PR 41363: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:922981e1-18b6-46aa-2468-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 922981e1-18b6-46aa-2468-08dbd53ba9ce - **Build**: 20240813.10 - **Date Produced**: August 14, 2024 1:49:44 AM UTC - **Commit**: 778f78e8d112bd476109a4e3613eeb8edbfd380d - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.9-servicing.24413.7 to 8.0.9-servicing.24413.10][6] - **Microsoft.NETCore.App.Ref**: [from 8.0.9 to 8.0.9][6] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.9 to 8.0.9][6] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.9-servicing.24413.7 to 8.0.9-servicing.24413.10][6] [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC41657dc0011935cec29391daaa6371ca531bb355&targetVersion=GC778f78e8d112bd476109a4e3613eeb8edbfd380d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 77f95a770bd..ead3ec4dab0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,12 @@ + - @@ -24,12 +24,12 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a243a361997..e1116a4b44c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 778f78e8d112bd476109a4e3613eeb8edbfd380d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -41,18 +41,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 778f78e8d112bd476109a4e3613eeb8edbfd380d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 778f78e8d112bd476109a4e3613eeb8edbfd380d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 778f78e8d112bd476109a4e3613eeb8edbfd380d diff --git a/eng/Versions.props b/eng/Versions.props index 6efb74f8169..7f6c7e1997b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ 8.0.0 8.0.0 8.0.1 - 8.0.8-servicing.24366.12 + 8.0.9-servicing.24413.10 8.0.0 8.0.4 - 8.0.8 - 8.0.8 - 8.0.8-servicing.24366.12 + 8.0.9 + 8.0.9 + 8.0.9-servicing.24413.10 8.0.0-beta.24360.5 From c740d3529b04a61639ea47307ad9924d739c73dd Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 16 Aug 2024 15:35:54 +0000 Subject: [PATCH 02/14] Merged PR 41780: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:922981e1-18b6-46aa-2468-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 922981e1-18b6-46aa-2468-08dbd53ba9ce - **Build**: 20240815.9 - **Date Produced**: August 16, 2024 2:25:38 AM UTC - **Commit**: 3c8202d88deea14a87c7665190286d2a67e464c0 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.9-servicing.24413.10 to 8.0.9-servicing.24415.9][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.9 to 8.0.9][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.9 to 8.0.9][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.9-servicing.24413.10 to 8.0.9-servicing.24415.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC778f78e8d112bd476109a4e3613eeb8edbfd380d&targetVersion=GC3c8202d88deea14a87c7665190286d2a67e464c0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ead3ec4dab0..e03502ead0b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e1116a4b44c..22e5f7ad86a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 778f78e8d112bd476109a4e3613eeb8edbfd380d + 3c8202d88deea14a87c7665190286d2a67e464c0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -43,16 +43,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 778f78e8d112bd476109a4e3613eeb8edbfd380d + 3c8202d88deea14a87c7665190286d2a67e464c0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 778f78e8d112bd476109a4e3613eeb8edbfd380d + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 778f78e8d112bd476109a4e3613eeb8edbfd380d + 3c8202d88deea14a87c7665190286d2a67e464c0 diff --git a/eng/Versions.props b/eng/Versions.props index 7f6c7e1997b..a2948cc157e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ 8.0.0 8.0.0 8.0.1 - 8.0.9-servicing.24413.10 + 8.0.9-servicing.24415.9 8.0.0 8.0.4 8.0.9 8.0.9 - 8.0.9-servicing.24413.10 + 8.0.9-servicing.24415.9 8.0.0-beta.24360.5 From f3db25b92f17ac8e1f5d5f25a875aeb5a69a35b6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sun, 1 Sep 2024 21:07:41 +0000 Subject: [PATCH 03/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240831.6 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json From Version 8.0.1 -> To Version 8.0.2 --- NuGet.config | 14 ++------------ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index e03502ead0b..ef7e576d925 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,7 @@ - - - - - - + @@ -24,12 +19,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47a34238f84..fc6df88a3d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -25,34 +25,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 4426046ba949f23a579ce98afeef6b7b6b75c292 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 4426046ba949f23a579ce98afeef6b7b6b75c292 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 4426046ba949f23a579ce98afeef6b7b6b75c292 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 4426046ba949f23a579ce98afeef6b7b6b75c292 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 4426046ba949f23a579ce98afeef6b7b6b75c292 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 4426046ba949f23a579ce98afeef6b7b6b75c292 diff --git a/eng/Versions.props b/eng/Versions.props index c9e2e460fee..2e82ed01bac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,13 +23,13 @@ 8.0.0 8.0.0 8.0.0 - 8.0.1 - 8.0.9-servicing.24415.9 + 8.0.2 + 8.0.10-servicing.24431.6 8.0.0 - 8.0.4 - 8.0.9 - 8.0.9 - 8.0.9-servicing.24415.9 + 8.0.5 + 8.0.10 + 8.0.10 + 8.0.10-servicing.24431.6 8.0.0-beta.24426.2 From 91bcf1b30575e52c329e0471a2fb0abee3ebb730 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Sep 2024 22:52:56 +0000 Subject: [PATCH 04/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240909.6 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json From Version 8.0.2 -> To Version 8.0.2 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef7e576d925..64585978e59 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc6df88a3d9..a2f126cc026 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,11 +27,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4426046ba949f23a579ce98afeef6b7b6b75c292 + c2891d32a0408ce62771120dd7c03bc3dde1fca7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4426046ba949f23a579ce98afeef6b7b6b75c292 + c2891d32a0408ce62771120dd7c03bc3dde1fca7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -39,20 +39,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4426046ba949f23a579ce98afeef6b7b6b75c292 + c2891d32a0408ce62771120dd7c03bc3dde1fca7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4426046ba949f23a579ce98afeef6b7b6b75c292 + c2891d32a0408ce62771120dd7c03bc3dde1fca7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4426046ba949f23a579ce98afeef6b7b6b75c292 + c2891d32a0408ce62771120dd7c03bc3dde1fca7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4426046ba949f23a579ce98afeef6b7b6b75c292 + c2891d32a0408ce62771120dd7c03bc3dde1fca7 diff --git a/eng/Versions.props b/eng/Versions.props index 2e82ed01bac..bfd6132b272 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ 8.0.0 8.0.0 8.0.2 - 8.0.10-servicing.24431.6 + 8.0.10-servicing.24459.6 8.0.0 8.0.5 8.0.10 8.0.10 - 8.0.10-servicing.24431.6 + 8.0.10-servicing.24459.6 8.0.0-beta.24426.2 From be439f99113f24bceb51afe3daa23e96f119cec0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Sep 2024 06:01:25 +0000 Subject: [PATCH 05/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240909.10 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json From Version 8.0.2 -> To Version 8.0.2 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 64585978e59..bd3d5f78e0e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2f126cc026..75d76d38ce9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -27,11 +27,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c2891d32a0408ce62771120dd7c03bc3dde1fca7 + 7dc1560dfb4ff946388512ef439fcb44f294b32a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c2891d32a0408ce62771120dd7c03bc3dde1fca7 + 7dc1560dfb4ff946388512ef439fcb44f294b32a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -39,20 +39,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c2891d32a0408ce62771120dd7c03bc3dde1fca7 + 7dc1560dfb4ff946388512ef439fcb44f294b32a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c2891d32a0408ce62771120dd7c03bc3dde1fca7 + 7dc1560dfb4ff946388512ef439fcb44f294b32a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c2891d32a0408ce62771120dd7c03bc3dde1fca7 + 7dc1560dfb4ff946388512ef439fcb44f294b32a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c2891d32a0408ce62771120dd7c03bc3dde1fca7 + 7dc1560dfb4ff946388512ef439fcb44f294b32a diff --git a/eng/Versions.props b/eng/Versions.props index bfd6132b272..30e30d8775d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ 8.0.0 8.0.0 8.0.2 - 8.0.10-servicing.24459.6 + 8.0.10-servicing.24459.10 8.0.0 8.0.5 8.0.10 8.0.10 - 8.0.10-servicing.24459.6 + 8.0.10-servicing.24459.10 8.0.0-beta.24426.2 From d82da91ea359bd57cfe67db4db1453120cd42b92 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 17:43:01 +0000 Subject: [PATCH 06/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240911.12 Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Logging , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Text.Json From Version 8.0.0 -> To Version 8.0.1 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 12 ++++++------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd3d5f78e0e..1d1337dfe4f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75d76d38ce9..7c4083802df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -13,46 +13,46 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 diff --git a/eng/Versions.props b/eng/Versions.props index 30e30d8775d..edd9587d213 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,19 +17,19 @@ False - 8.0.0 + 8.0.1 8.0.0 8.0.0 8.0.0 - 8.0.0 - 8.0.0 + 8.0.1 + 8.0.1 8.0.2 - 8.0.10-servicing.24459.10 - 8.0.0 + 8.0.10-servicing.24461.12 + 8.0.1 8.0.5 8.0.10 8.0.10 - 8.0.10-servicing.24459.10 + 8.0.10-servicing.24461.12 8.0.0-beta.24426.2 From 4315fa43c9573671f8f5be21497d59f9c99cd829 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 17 Sep 2024 23:35:35 +0000 Subject: [PATCH 07/14] Merged PR 42959: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:922981e1-18b6-46aa-2468-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 922981e1-18b6-46aa-2468-08dbd53ba9ce - **Build**: 20240916.10 - **Date Produced**: September 17, 2024 10:28:54 PM UTC - **Commit**: 81cabf2857a01351e5ab578947c7403a5b128ad1 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Memory**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Configuration.Json**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.DependencyInjection**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.DependencyModel**: [from 8.0.2 to 8.0.2][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10][1] - **Microsoft.Extensions.Logging**: [from 8.0.1 to 8.0.1][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10][1] - **System.Text.Json**: [from 8.0.5 to 8.0.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCa8108c906081c3c0198f250fb210c1dd275b2f01&targetVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1d1337dfe4f..44fe13eda10 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c4083802df..98b29b6e167 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,7 +3,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -15,7 +15,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -23,36 +23,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 diff --git a/eng/Versions.props b/eng/Versions.props index edd9587d213..8198b752055 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ 8.0.1 8.0.1 8.0.2 - 8.0.10-servicing.24461.12 + 8.0.10-servicing.24466.10 8.0.1 8.0.5 8.0.10 8.0.10 - 8.0.10-servicing.24461.12 + 8.0.10-servicing.24466.10 8.0.0-beta.24426.2 From 7e2267f0c3bf293129a5859dd6a7e18cb7d091d6 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 24 Sep 2024 23:59:07 +0000 Subject: [PATCH 08/14] Merged PR 43127: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:922981e1-18b6-46aa-2468-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 922981e1-18b6-46aa-2468-08dbd53ba9ce - **Build**: 20240924.6 - **Date Produced**: September 24, 2024 10:32:43 PM UTC - **Commit**: dcf4a22cf8671c1abe880ebec4cfd906c99588bf - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Memory**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Configuration.Json**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.DependencyInjection**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.DependencyModel**: [from 8.0.2 to 8.0.2][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.6][1] - **Microsoft.Extensions.Logging**: [from 8.0.1 to 8.0.1][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.6][1] - **System.Text.Json**: [from 8.0.5 to 8.0.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC81cabf2857a01351e5ab578947c7403a5b128ad1&targetVersion=GCdcf4a22cf8671c1abe880ebec4cfd906c99588bf&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:922981e1-18b6-46aa-2468-08dbd53ba9ce) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 44fe13eda10..d2b9f4a10ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98b29b6e167..8f9150c403f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,7 +3,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -15,7 +15,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -23,36 +23,36 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf diff --git a/eng/Versions.props b/eng/Versions.props index 8198b752055..5b630aeb040 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,12 +24,12 @@ 8.0.1 8.0.1 8.0.2 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.6 8.0.1 8.0.5 8.0.10 8.0.10 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.6 8.0.0-beta.24426.2 From 165ca69d5e9e40068bdec144edc5327081de91e4 Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Mon, 7 Oct 2024 17:43:06 -0700 Subject: [PATCH 09/14] Merge release/8.0 --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + src/EFCore.Cosmos/EFCore.Cosmos.csproj | 2 ++ src/EFCore.SqlServer/EFCore.SqlServer.csproj | 3 ++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f9150c403f..f846577f8cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -37,6 +37,10 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime dcf4a22cf8671c1abe880ebec4cfd906c99588bf + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2aade6beb02ea367fd97c4070a4198802fe61c03 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime dcf4a22cf8671c1abe880ebec4cfd906c99588bf diff --git a/eng/Versions.props b/eng/Versions.props index 813193c1a40..9ac878daedc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,6 +27,7 @@ 8.0.10-servicing.24474.6 8.0.1 8.0.5 + 8.0.1 8.0.10 8.0.10 8.0.10-servicing.24474.6 diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj index 7a20bf69d21..d4fb7ac9c87 100644 --- a/src/EFCore.Cosmos/EFCore.Cosmos.csproj +++ b/src/EFCore.Cosmos/EFCore.Cosmos.csproj @@ -46,6 +46,8 @@ + + diff --git a/src/EFCore.SqlServer/EFCore.SqlServer.csproj b/src/EFCore.SqlServer/EFCore.SqlServer.csproj index 339e8774d57..17979be03a4 100644 --- a/src/EFCore.SqlServer/EFCore.SqlServer.csproj +++ b/src/EFCore.SqlServer/EFCore.SqlServer.csproj @@ -48,7 +48,8 @@ - + + From d7947063a49292c75578cfc2d3cb50b8495636d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 19:09:14 +0000 Subject: [PATCH 10/14] Update dependencies from https://github.com/dotnet/arcade build 20241008.1 (#34880) [release/8.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/tools.ps1 | 2 +- global.json | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d73508d663c..5dd1b9d48b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,17 +60,17 @@ - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e5b13e054339e41d422212a0ecaf24fec20cb5a1 diff --git a/eng/Versions.props b/eng/Versions.props index fb33afe6af1..20132efb93b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ 8.0.8-servicing.24366.12 - 8.0.0-beta.24426.2 + 8.0.0-beta.24508.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index eb188cfda41..a2dedaa5297 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -892,7 +892,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index 528c6ba8045..ad0cc5b67aa 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "8.0.108", + "version": "8.0.110", "allowPrerelease": true, "rollForward": "latestMajor" }, "tools": { - "dotnet": "8.0.108", + "dotnet": "8.0.110", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24426.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24426.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1" } } From 34d9394a408a1ecd584b7cf2f45700d9d9ea063b Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Fri, 11 Oct 2024 13:23:57 -0700 Subject: [PATCH 11/14] [release/8.0] Update Microsoft.Extensions.HostFactoryResolver.Sources version (#34884) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 20132efb93b..0aecadee4b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,7 +24,7 @@ 8.0.0 8.0.0 8.0.1 - 8.0.8-servicing.24366.12 + 8.0.11-servicing.24508.13 8.0.0 8.0.4 8.0.1 From 893bf3ed9c5a84e9b6e667eb09fab08a4b430e4b Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Sat, 12 Oct 2024 21:06:15 -0700 Subject: [PATCH 12/14] Don't execute empty batches (#34882) Fixes #33337 --- .../Migrations/SqlServerMigrationsSqlGenerator.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs b/src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs index f4192293658..90f980cf632 100644 --- a/src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs +++ b/src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs @@ -1453,8 +1453,11 @@ protected override void Generate(SqlOperation operation, IModel? model, Migratio void AppendBatch(string batch) { - builder.Append(batch); - EndStatement(builder, operation.SuppressTransaction); + if (!string.IsNullOrWhiteSpace(batch)) + { + builder.Append(batch); + EndStatement(builder, operation.SuppressTransaction); + } } } From e442d416916892882b293b8adc4ea5f1d7b07beb Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Mon, 14 Oct 2024 09:24:53 -0700 Subject: [PATCH 13/14] [release/8.0] Avoid infinite recursion on identifying shadow FKs (#34891) Fixes #34875 --- .../ForeignKeyPropertyDiscoveryConvention.cs | 5 +- .../ModelBuilding101ManyToManyTestBase.cs | 55 +++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs b/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs index 410beadaf54..85afff011c8 100644 --- a/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs +++ b/src/EFCore/Metadata/Conventions/ForeignKeyPropertyDiscoveryConvention.cs @@ -50,6 +50,9 @@ public class ForeignKeyPropertyDiscoveryConvention : IPropertyFieldChangedConvention, IModelFinalizingConvention { + private static readonly bool UseOldBehavior34875 = + AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue34875", out var enabled34875) && enabled34875; + /// /// Creates a new instance of . /// @@ -142,7 +145,7 @@ private IConventionForeignKeyBuilder ProcessForeignKey( && fkProperty.ClrType.IsNullableType() == foreignKey.IsRequired && fkProperty.GetContainingForeignKeys().All(otherFk => otherFk.IsRequired == foreignKey.IsRequired)) { - var newType = fkProperty.ClrType.MakeNullable(!foreignKey.IsRequired); + var newType = fkProperty.ClrType.MakeNullable(!foreignKey.IsRequired && (!fkProperty.IsKey() || UseOldBehavior34875)); if (fkProperty.ClrType != newType) { fkProperty.DeclaringType.Builder.Property( diff --git a/test/EFCore.Specification.Tests/ModelBuilding101ManyToManyTestBase.cs b/test/EFCore.Specification.Tests/ModelBuilding101ManyToManyTestBase.cs index f8bf1220ba2..c5f9b86fb40 100644 --- a/test/EFCore.Specification.Tests/ModelBuilding101ManyToManyTestBase.cs +++ b/test/EFCore.Specification.Tests/ModelBuilding101ManyToManyTestBase.cs @@ -737,6 +737,61 @@ protected override void OnModelCreating(ModelBuilder modelBuilder) } } + [ConditionalFact] + public virtual void ManyToManyWithPayloadAndNavsToJoinClassShadowFKsTest() + => Model101Test(); + + protected class ManyToManyWithPayloadAndNavsToJoinClassShadowFKs + { + public class Post + { + public int Id { get; set; } + public List Tag { get; } = []; + public List PostTags { get; } = []; + } + + public class Tag + { + public int Id { get; set; } + public List Post { get; } = []; + public List PostTags { get; } = []; + } + + public class PostTag + { + } + + public class Context0 : Context101 + { + public DbSet Post + => Set(); + + public DbSet Tag + => Set(); + + protected override void OnModelCreating(ModelBuilder modelBuilder) + => modelBuilder.Entity() + .HasMany(e => e.Tag) + .WithMany(e => e.Post) + .UsingEntity( + l => l.HasOne().WithMany(t => t.PostTags), + r => r.HasOne().WithMany(p => p.PostTags), + j => { }); + } + + public class Context1 : Context0 + { + protected override void OnModelCreating(ModelBuilder modelBuilder) + => modelBuilder.Entity() + .HasMany(e => e.Tag) + .WithMany(e => e.Post) + .UsingEntity( + l => l.HasOne().WithMany(t => t.PostTags).HasForeignKey("TagId"), + r => r.HasOne().WithMany(p => p.PostTags).HasForeignKey("PostId"), + j => { }); + } + } + [ConditionalFact] public virtual void ManyToManyWithNoCascadeDeleteTest() => Model101Test(); From dc1984e0f8b89321a7109a0d5de87015c44c9467 Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Mon, 14 Oct 2024 10:18:21 -0700 Subject: [PATCH 14/14] Update MicrosoftNETCoreBrowserDebugHostTransportVersion to 8.0.11-servicing.24508.13 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 27bb468849d..5326c9b847b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ 8.0.1 8.0.10 8.0.10 - 8.0.10-servicing.24474.6 + 8.0.11-servicing.24508.13 8.0.0-beta.24508.1