From 52c3481e52007d278ec714c3e3aa630b9e6dda9c Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Wed, 12 Mar 2025 16:37:49 +0000 Subject: [PATCH 01/15] Merged PR 48209: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:9dd82232-9947-4c91-873c-a50d5007af96) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 9dd82232-9947-4c91-873c-a50d5007af96 - **Build**: [20250310.22](https://dev.azure.com/dnceng/internal/_build/results?buildId=2660109) - **Date Produced**: March 11, 2025 10:14:10 AM UTC - **Commit**: [99ba03659dbd004773e2e6aacb8d44eb227f85ed](https://dev.azure.com/dnceng/internal/_git/dotnet-runtime?_a=history&version=GC99ba03659dbd004773e2e6aacb8d44eb227f85ed) - **Branch**: refs/heads/internal/release/9.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Memory**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.Configuration**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.Configuration.Abstractions**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.Configuration.EnvironmentVariables**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.Configuration.Json**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.DependencyInjection**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.DependencyModel**: [from 9.0.3 to 9.0.4][2] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 9.0.3-servicing.25111.13 to 9.0.4-servicing.25160.22][2] - **Microsoft.Extensions.Logging**: [from 9.0.3 to 9.0.4][2] - **Microsoft.NETCore.App.Ref**: [from 9.0.3 to 9.0.4][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 9.0.3 to 9.0.4][2] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 9.0.3-servicing.25111.13 to 9.0.4-servicing.25160.22][2] - **System.Formats.Asn1**: [from 9.0.3 to 9.0.4][2] - **System.Text.Encodings.Web**: [from 9.0.3 to 9.0.4][2] - **System.Text.Json**: [from 9.0.3 to 9.0.4][2] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC831d23e56149cd59c40fc00c7feb7c5334bd19c4&targetVersion=GC99ba03659dbd004773e2e6aacb8d44eb227f85ed&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:9dd82232-9947-4c91-873c-a50d5007af96) --- NuGet.config | 16 ++--------- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 3 files changed, 47 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index f799bcce5e7..45881a04b44 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,13 +4,7 @@ - - - - - - - + @@ -27,13 +21,7 @@ - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51d5d03cb75..112fd53c5b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,69 +1,69 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + 99ba03659dbd004773e2e6aacb8d44eb227f85ed diff --git a/eng/Versions.props b/eng/Versions.props index 6ccc098575e..3470b00116b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,21 +17,21 @@ False - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3-servicing.25111.13 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3-servicing.25111.13 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4-servicing.25160.22 + 9.0.4 + 9.0.4 + 9.0.4 + 9.0.4-servicing.25160.22 + 9.0.4 + 9.0.4 + 9.0.4 9.0.0-beta.25111.5 From 75ef23ba6ae3eea2cb6946cb020dd46dfcdd8d0b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Mar 2025 04:18:37 +0000 Subject: [PATCH 02/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250312.16 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 From Version 8.0.14-servicing.25111.18 -> To Version 8.0.15-servicing.25162.16 --- NuGet.config | 8 ++------ eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 8 ++++---- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f310bb75dc..27620da33a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -21,9 +19,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf7e11ea666..564dac04e08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime dcf4a22cf8671c1abe880ebec4cfd906c99588bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -39,24 +39,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime dcf4a22cf8671c1abe880ebec4cfd906c99588bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1584e493603cfc4e9b36b77d6d4afe97de6363f9 + 6eee28c27213784c1f8a112df1c90113585c4111 diff --git a/eng/Versions.props b/eng/Versions.props index f9b672927a6..5dfd73422c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,13 +24,13 @@ 8.0.1 8.0.1 8.0.2 - 8.0.14-servicing.25111.18 + 8.0.15-servicing.25162.16 8.0.1 8.0.5 8.0.2 - 8.0.14 - 8.0.14 - 8.0.14-servicing.25111.18 + 8.0.15 + 8.0.15 + 8.0.15-servicing.25162.16 8.0.0-beta.25111.4 From a2ed5ad99e3010936e7a638514cb983223798cd9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Mar 2025 19:26:13 +0000 Subject: [PATCH 03/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250312.18 Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , 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.Formats.Asn1 , System.Text.Encodings.Web , System.Text.Json From Version 9.0.4 -> To Version 9.0.4 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45881a04b44..5060c03b75c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c88210dca94..0ef1517a42b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,47 +3,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 99ba03659dbd004773e2e6aacb8d44eb227f85ed + 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 diff --git a/eng/Versions.props b/eng/Versions.props index 9dcc4b6ba3b..44c6fb16fa2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ 9.0.4 9.0.4 9.0.4 - 9.0.4-servicing.25160.22 + 9.0.4-servicing.25162.18 9.0.4 9.0.4 9.0.4 - 9.0.4-servicing.25160.22 + 9.0.4-servicing.25162.18 9.0.4 9.0.4 9.0.4 From 7465b32aaf25b946812d0dcff7af5c793dba8d24 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 02:59:35 +0000 Subject: [PATCH 04/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250313.5 Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.EnvironmentVariables , 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.Formats.Asn1 , System.Text.Encodings.Web , System.Text.Json From Version 9.0.4 -> To Version 9.0.4 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5060c03b75c..e6046bdda5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ef1517a42b..1dc45f4c790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,47 +3,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c9b70db7b7bfcbc33e85bc40e215c3b138823e5 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 diff --git a/eng/Versions.props b/eng/Versions.props index 44c6fb16fa2..a9458f9340d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,11 +24,11 @@ 9.0.4 9.0.4 9.0.4 - 9.0.4-servicing.25162.18 + 9.0.4-servicing.25163.5 9.0.4 9.0.4 9.0.4 - 9.0.4-servicing.25162.18 + 9.0.4-servicing.25163.5 9.0.4 9.0.4 9.0.4 From becaf2e4137efe8df1aa232d7bd0acb6e640fc84 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Mar 2025 23:06:49 +0000 Subject: [PATCH 05/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250314.9 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 From Version 8.0.15-servicing.25162.16 -> To Version 8.0.15-servicing.25164.9 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 27620da33a3..d361865f016 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 230f95b76b9..4e7b0b3fef1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime dcf4a22cf8671c1abe880ebec4cfd906c99588bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -39,7 +39,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -47,16 +47,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6eee28c27213784c1f8a112df1c90113585c4111 + f64f43502df9ae0b087be92136fa2242091b3145 diff --git a/eng/Versions.props b/eng/Versions.props index cdfbc34f757..cac6f8c99a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,13 +24,13 @@ 8.0.1 8.0.1 8.0.2 - 8.0.15-servicing.25162.16 + 8.0.15-servicing.25164.9 8.0.1 8.0.5 8.0.2 8.0.15 8.0.15 - 8.0.15-servicing.25162.16 + 8.0.15-servicing.25164.9 8.0.0-beta.25120.1 From 9c05314bb5907e8c6fbdb1b1a7b784b7c686daf2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 15 Mar 2025 07:25:34 +0000 Subject: [PATCH 06/15] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20250314.13 Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , System.Formats.Asn1 From Version 8.0.15-servicing.25162.16 -> To Version 8.0.15-servicing.25164.13 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index d361865f016..3d215f31160 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 4e7b0b3fef1..b76f4bcfdf3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -29,9 +29,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime dcf4a22cf8671c1abe880ebec4cfd906c99588bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -39,7 +39,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -47,16 +47,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f64f43502df9ae0b087be92136fa2242091b3145 + 50c4cb9fc31c47f03eac865d7bc518af173b74b7 diff --git a/eng/Versions.props b/eng/Versions.props index cac6f8c99a4..cac169bbad6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,13 +24,13 @@ 8.0.1 8.0.1 8.0.2 - 8.0.15-servicing.25164.9 + 8.0.15-servicing.25164.13 8.0.1 8.0.5 8.0.2 8.0.15 8.0.15 - 8.0.15-servicing.25164.9 + 8.0.15-servicing.25164.13 8.0.0-beta.25120.1 From 5109f3b4e312fbc3d3b6af5d159f2412a4e0a8df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Apr 2025 06:12:56 +0000 Subject: [PATCH 07/15] Update dependencies from https://github.com/dotnet/arcade build 20250404.5 (#35912) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c048f65548..cfe4be5bc21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + 97cbc7361ff28b2948c8182720c166a744049f55 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + 97cbc7361ff28b2948c8182720c166a744049f55 - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + 97cbc7361ff28b2948c8182720c166a744049f55 diff --git a/eng/Versions.props b/eng/Versions.props index 9a62d591ec4..739c70b4829 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 9.0.3 - 9.0.0-beta.25164.2 + 9.0.0-beta.25204.5 17.8.3 diff --git a/global.json b/global.json index 101ff3fceb7..24cbe202424 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25164.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25204.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25204.5" } } From 32928fbc57d076dd09709935bcd44bb381f54e44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 15:05:08 +0000 Subject: [PATCH 08/15] Update dependencies from https://github.com/dotnet/arcade build 20250408.7 (#35930) [release/8.0] Update dependencies from dotnet/arcade --- NuGet.config | 4 ++++ eng/Version.Details.xml | 12 +++++------ eng/Versions.props | 2 +- eng/common/generate-sbom-prep.ps1 | 20 +++++++++++++------ eng/common/generate-sbom-prep.sh | 17 ++++++++++------ eng/common/templates-official/job/job.yml | 3 ++- .../steps/generate-sbom.yml | 2 +- eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 8 ++++---- 10 files changed, 47 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3d215f31160..ec8464124ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,8 @@ + + @@ -19,6 +21,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b76f4bcfdf3..3ec3bc94ab6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,17 +60,17 @@ - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + c7a36e53f91e41943746f97a8c183549364c5092 - + https://github.com/dotnet/arcade - 4ff4ce248e95ae74b0040de6a6c5939aa63120dc + c7a36e53f91e41943746f97a8c183549364c5092 diff --git a/eng/Versions.props b/eng/Versions.props index 9e13cf7888c..5ac3bf190b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ 8.0.15-servicing.25164.13 - 8.0.0-beta.25120.1 + 8.0.0-beta.25208.7 diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index 3e5c1c74a1c..a0c7d792a76 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -4,18 +4,26 @@ Param( . $PSScriptRoot\pipeline-logging-functions.ps1 +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" +$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' +$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName + +Write-Host "Artifact name before : $ArtifactName" +Write-Host "Artifact name after : $SafeArtifactName" + Write-Host "Creating dir $ManifestDirPath" + # create directory for sbom manifest to be placed -if (!(Test-Path -path $ManifestDirPath)) +if (!(Test-Path -path $SbomGenerationDir)) { - New-Item -ItemType Directory -path $ManifestDirPath - Write-Host "Successfully created directory $ManifestDirPath" + New-Item -ItemType Directory -path $SbomGenerationDir + Write-Host "Successfully created directory $SbomGenerationDir" } else{ Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." } Write-Host "Updating artifact name" -$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' -Write-Host "Artifact name $artifact_name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index d5c76dc827b..bbb4922151e 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -14,19 +14,24 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . $scriptroot/pipeline-logging-functions.sh +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" + manifest_dir=$1 -if [ ! -d "$manifest_dir" ] ; then - mkdir -p "$manifest_dir" - echo "Sbom directory created." $manifest_dir +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +sbom_generation_dir="$manifest_dir/$safe_artifact_name" + +if [ ! -d "$sbom_generation_dir" ] ; then + mkdir -p "$sbom_generation_dir" + echo "Sbom directory created." $sbom_generation_dir else Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." fi -artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" echo "Artifact name before : "$artifact_name -# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. -safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" echo "Artifact name after : "$safe_artifact_name export ARTIFACT_NAME=$safe_artifact_name echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 1f035fee73f..98ccbd7a9c1 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -38,6 +38,7 @@ parameters: enableSbom: true PackageVersion: 7.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom jobs: - job: ${{ parameters.name }} @@ -261,4 +262,4 @@ jobs: targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' - continueOnError: true \ No newline at end of file + continueOnError: true diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml index 1bf43bf807a..daf0957b68d 100644 --- a/eng/common/templates-official/steps/generate-sbom.yml +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -35,7 +35,7 @@ steps: PackageName: ${{ parameters.packageName }} BuildDropPath: ${{ parameters.buildDropPath }} PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }} + ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) ${{ if ne(parameters.IgnoreDirectories, '') }}: AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a00577ed17a..82b2798ba30 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -263,7 +263,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index b9b329ce37f..68db1543023 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -297,7 +297,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 91bd35ad978..d1843569289 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "8.0.113", + "version": "8.0.115", "allowPrerelease": true, "rollForward": "latestMajor" }, "tools": { - "dotnet": "8.0.113", + "dotnet": "8.0.115", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25208.7", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25208.7" } } From 19b2edd40e97c404dd8e04e8b20b722941d15920 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Apr 2025 18:10:44 +0000 Subject: [PATCH 09/15] Update dependencies from https://github.com/dotnet/arcade build 20250408.6 (#35931) [release/9.0] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfe4be5bc21..79bc9ac9840 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ - + https://github.com/dotnet/arcade - 97cbc7361ff28b2948c8182720c166a744049f55 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - 97cbc7361ff28b2948c8182720c166a744049f55 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 - + https://github.com/dotnet/arcade - 97cbc7361ff28b2948c8182720c166a744049f55 + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 diff --git a/eng/Versions.props b/eng/Versions.props index 739c70b4829..3529312b338 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 9.0.3 - 9.0.0-beta.25204.5 + 9.0.0-beta.25208.6 17.8.3 diff --git a/global.json b/global.json index 24cbe202424..70395de4fa1 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "9.0.104", + "version": "9.0.105", "allowPrerelease": true, "rollForward": "latestMajor" }, "tools": { - "dotnet": "9.0.104", + "dotnet": "9.0.105", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25204.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25204.5" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25208.6" } } From d0d53e51d0dc668fdd2a1854f13371f667fc7dfb Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Wed, 9 Apr 2025 17:16:31 -0700 Subject: [PATCH 10/15] Disable Cosmos tests on CI (#35933) --- azure-pipelines.yml | 25 ------------------- .../Query/AdHocJsonQueryCosmosTest.cs | 2 +- .../AdHocMiscellaneousQueryCosmosTest.cs | 2 +- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 382f139f1d0..78837f93284 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -170,36 +170,11 @@ extends: - _runCounter: $[counter(variables['Build.Reason'], 0)] # Rely on task Arcade injects, not auto-injected build step. - skipComponentGovernanceDetection: true - - ${{ if notin(variables['Build.Reason'], 'PullRequest', 'Schedule') }}: - - _CosmosConnectionUrl: 'true' steps: - - bash: | - echo "##vso[task.setvariable variable=_CosmosConnectionUrl]https://ef-nightly-test.documents.azure.com:443/" - displayName: Prepare to run Cosmos tests on ef-nightly-test - condition: and(eq(variables['_CosmosConnectionUrl'], 'true'), or(endsWith(variables['_runCounter'], '0'), endsWith(variables['_runCounter'], '2'), endsWith(variables['_runCounter'], '4'), endsWith(variables['_runCounter'], '6'), endsWith(variables['_runCounter'], '8'))) - - bash: | - echo "##vso[task.setvariable variable=_CosmosConnectionUrl]https://ef-pr-test.documents.azure.com:443/" - displayName: Prepare to run Cosmos tests on ef-pr-test - condition: and(eq(variables['_CosmosConnectionUrl'], 'true'), or(endsWith(variables['_runCounter'], '1'), endsWith(variables['_runCounter'], '3'), endsWith(variables['_runCounter'], '5'), endsWith(variables['_runCounter'], '7'), endsWith(variables['_runCounter'], '9'))) - template: /eng/common/templates-official/steps/enable-internal-sources.yml - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs) displayName: Build - - task: AzureCLI@2 - displayName: Run Cosmos tests - condition: notin(variables['Build.Reason'], 'PullRequest', 'Schedule') - inputs: - azureSubscription: EFCosmosTesting - scriptType: bash - scriptLocation: 'inlineScript' - inlineScript: | - ./test.sh --ci --configuration $(_BuildConfig) --projects $(Build.SourcesDirectory)/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj - env: - Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl) - Test__Cosmos__UseTokenCredential: true - Test__Cosmos__SubscriptionId: d709b837-4a74-4aec-addc-b6e4b9b23e7e - Test__Cosmos__ResourceGroup: efcosmosci - name: Build templateContext: outputs: - output: pipelineArtifact diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/AdHocJsonQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/AdHocJsonQueryCosmosTest.cs index 979ad3d8ba0..563d63b7c08 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/AdHocJsonQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/AdHocJsonQueryCosmosTest.cs @@ -159,7 +159,7 @@ protected override async Task Seed21006(Context21006 context) var wrapper = (CosmosClientWrapper)context.GetService(); var singletonWrapper = context.GetService(); - var entitiesContainer = singletonWrapper.Client.GetContainer(StoreName, containerId: "Entities"); + var entitiesContainer = singletonWrapper.Client.GetContainer(TestStore.Name, containerId: "Entities"); var missingTopLevel = $$""" diff --git a/test/EFCore.Cosmos.FunctionalTests/Query/AdHocMiscellaneousQueryCosmosTest.cs b/test/EFCore.Cosmos.FunctionalTests/Query/AdHocMiscellaneousQueryCosmosTest.cs index 9365b6dfc7e..fb9c9bc95f7 100644 --- a/test/EFCore.Cosmos.FunctionalTests/Query/AdHocMiscellaneousQueryCosmosTest.cs +++ b/test/EFCore.Cosmos.FunctionalTests/Query/AdHocMiscellaneousQueryCosmosTest.cs @@ -45,7 +45,7 @@ protected async Task Seed21006(JsonContext21006 context) { var wrapper = (CosmosClientWrapper)context.GetService(); var singletonWrapper = context.GetService(); - var entitiesContainer = singletonWrapper.Client.GetContainer(StoreName, containerId: "Entities"); + var entitiesContainer = singletonWrapper.Client.GetContainer(TestStore.Name, containerId: "Entities"); var missingTopLevel = $$""" From 8f67cf8489be6fbf949daa7081213a6fe5c634f0 Mon Sep 17 00:00:00 2001 From: Maurycy Markowski Date: Tue, 15 Apr 2025 10:10:06 -0700 Subject: [PATCH 11/15] [release/9.0] Bump version of Cosmos SDK from 3.45 to 3.48 to improve hybrid search experience out of the box (#35954) bumping cosmos sdk version to improve hybrid search experience out of the box - this is a dry run, will incorporate these changes to the proper 9.0 PR once/if we have green light for the bump Continuation of #35909 Description As part of adding full text search support we realized that some scenarios (specifically hybrid search and some instances of ContainsAll) don't work with the Cosmos SDK that is currently referenced by EFCore.Cosmos 9.x package. The issues can be solved by bumping SDK version to 3.48 Customer impact Customers trying full text search will experience errors for some scenarios - cryptic exception (Syntax error near '-' for hybrid, and invalid results for some ContainsAll queries). Workaround is to manually upgrade Cosmos SDK dependency. How found Internal testing by the partner team. Regression No Testing All current Cosmos tests pass. Performed smoke test to validate that breaking change added in the SDK (requiring explicit Newtonsoft.Json dependency) doesn't have impact on the customer app. Risk Low. This can only affect customers using EFCore.Cosmos, one breaking change introduced in the SDK is benign from the perspective of customers using EFCore to communicate with Cosmos (EFCore package absorbs the breaking change). --- Directory.Packages.props | 2 +- src/EFCore.Cosmos/EFCore.Cosmos.csproj | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 5975e2b9a33..662be990703 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -36,7 +36,7 @@ - + diff --git a/src/EFCore.Cosmos/EFCore.Cosmos.csproj b/src/EFCore.Cosmos/EFCore.Cosmos.csproj index fe1ba24c8a0..a3bd6fe8baf 100644 --- a/src/EFCore.Cosmos/EFCore.Cosmos.csproj +++ b/src/EFCore.Cosmos/EFCore.Cosmos.csproj @@ -50,6 +50,8 @@ + + From c728c1c3cea8d737d4ea960410bff67ddb4e1ecd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 28 Apr 2025 05:45:26 +0000 Subject: [PATCH 12/15] Update dependencies from https://github.com/dotnet/arcade build 20250425.6 (#36006) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/core-templates/job/source-build.yml | 2 ++ .../core-templates/job/source-index-stage1.yml | 4 ++-- eng/common/core-templates/steps/source-build.yml | 1 + global.json | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index e6046bdda5d..d1a8a417e43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -21,7 +20,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d25dda95e20..7c8d894592f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 diff --git a/eng/Versions.props b/eng/Versions.props index 098a1bd0102..e0f89a20148 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 9.0.4 - 9.0.0-beta.25208.6 + 9.0.0-beta.25225.6 17.8.3 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c4713c8b6ed..d47f09d58fd 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -26,6 +26,8 @@ parameters: # Specifies the build script to invoke to perform the build in the repo. The default # './build.sh' should work for typical Arcade repositories, but this is customizable for # difficult situations. + # buildArguments: '' + # Specifies additional build arguments to pass to the build script. # jobProperties: {} # A list of job properties to inject at the top level, for potential extensibility beyond # container and pool. diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 205fb5b3a39..8b833332b3e 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -1,7 +1,7 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240522.1 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1 + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2915d29bb7f..37133b55b75 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -79,6 +79,7 @@ steps: ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ + ${{ parameters.platform.buildArguments }} \ $officialBuildArgs \ $internalRuntimeDownloadArgs \ $internalRestoreArgs \ diff --git a/global.json b/global.json index 70395de4fa1..93d3c09d1de 100644 --- a/global.json +++ b/global.json @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25208.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25225.6" } } From 512a7f29d9abd3b1fc563e52557f415d3659e406 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 7 May 2025 14:47:42 -0700 Subject: [PATCH 13/15] Update branding to 8.0.17 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5ac3bf190b0..e0e31facadb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,6 +1,6 @@ - 8.0.16 + 8.0.17 servicing From 76faf7c1a86b2bcb8834314f7eb038f222f470ee Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 7 May 2025 14:47:52 -0700 Subject: [PATCH 14/15] Update branding to 9.0.6 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e0f89a20148..227990ca8f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,6 +1,6 @@ - 9.0.5 + 9.0.6 rtm From 44c091f550dece986511fe5806dc7f26cb6e7eaf Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Wed, 7 May 2025 16:04:35 -0700 Subject: [PATCH 15/15] Revert job.yml changes --- eng/common/templates-official/job/job.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index b9c0583ed8a..817555505aa 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -4,7 +4,6 @@ parameters: runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' - ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom jobs: - template: /eng/common/core-templates/job/job.yml