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/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/eng/Version.Details.xml b/eng/Version.Details.xml
index 3c048f65548..7c8d894592f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,83 +1,83 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 831d23e56149cd59c40fc00c7feb7c5334bd19c4
+ f57e6dc747158ab7ade4e62a75a6750d16b771e8
-
+
https://github.com/dotnet/arcade
- 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee
+ bfbc858ba868b60fffaf7b2150f1d2165b01e786
-
+
https://github.com/dotnet/arcade
- 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee
+ bfbc858ba868b60fffaf7b2150f1d2165b01e786
-
+
https://github.com/dotnet/arcade
- 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee
+ bfbc858ba868b60fffaf7b2150f1d2165b01e786
diff --git a/eng/Versions.props b/eng/Versions.props
index 9a62d591ec4..227990ca8f2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,6 +1,6 @@
- 9.0.5
+ 9.0.6
rtm
@@ -17,24 +17,24 @@
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.25163.5
+ 9.0.4
+ 9.0.4
+ 9.0.4
+ 9.0.4-servicing.25163.5
+ 9.0.4
+ 9.0.4
+ 9.0.4
- 9.0.0-beta.25164.2
+ 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 101ff3fceb7..93d3c09d1de 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.25164.2",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25164.2"
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25225.6"
}
}
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 @@
+
+
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 =
$$"""