Skip to content

Commit 0d14968

Browse files
AndriySvyrydAndriySvyryd
authored
Merge release/9.0 to release/9.0-staging (#36051)
2 parents 1c96bce + b7cc12f commit 0d14968

File tree

11 files changed

+67
-87
lines changed

11 files changed

+67
-87
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Templating" Version="$(MicrosoftDotNetBuildTasksTemplatingVersion)" />
3737

3838
<!-- Azure SDK for .NET dependencies -->
39-
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.45.2" />
39+
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.48.0" />
4040

4141
<!-- SQL Server dependencies -->
4242
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.6" />

‎azure-pipelines.yml‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -170,36 +170,11 @@ extends:
170170
- _runCounter: $[counter(variables['Build.Reason'], 0)]
171171
# Rely on task Arcade injects, not auto-injected build step.
172172
- skipComponentGovernanceDetection: true
173-
- ${{ if notin(variables['Build.Reason'], 'PullRequest', 'Schedule') }}:
174-
- _CosmosConnectionUrl: 'true'
175173
steps:
176-
- bash: |
177-
echo "##vso[task.setvariable variable=_CosmosConnectionUrl]https://ef-nightly-test.documents.azure.com:443/"
178-
displayName: Prepare to run Cosmos tests on ef-nightly-test
179-
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')))
180-
- bash: |
181-
echo "##vso[task.setvariable variable=_CosmosConnectionUrl]https://ef-pr-test.documents.azure.com:443/"
182-
displayName: Prepare to run Cosmos tests on ef-pr-test
183-
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')))
184174
- template: /eng/common/templates-official/steps/enable-internal-sources.yml
185175
- template: /eng/common/templates-official/steps/enable-internal-runtimes.yml
186176
- script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine $(_InternalRuntimeDownloadArgs)
187177
displayName: Build
188-
- task: AzureCLI@2
189-
displayName: Run Cosmos tests
190-
condition: notin(variables['Build.Reason'], 'PullRequest', 'Schedule')
191-
inputs:
192-
azureSubscription: EFCosmosTesting
193-
scriptType: bash
194-
scriptLocation: 'inlineScript'
195-
inlineScript: |
196-
./test.sh --ci --configuration $(_BuildConfig) --projects $(Build.SourcesDirectory)/test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj
197-
env:
198-
Test__Cosmos__DefaultConnection: $(_CosmosConnectionUrl)
199-
Test__Cosmos__UseTokenCredential: true
200-
Test__Cosmos__SubscriptionId: d709b837-4a74-4aec-addc-b6e4b9b23e7e
201-
Test__Cosmos__ResourceGroup: efcosmosci
202-
name: Build
203178
templateContext:
204179
outputs:
205180
- output: pipelineArtifact

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.3">
4+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.4">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
6+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.3">
8+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.4">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
10-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
10+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.3">
12+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
14-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
14+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.3">
16+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.4">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
18-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
18+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.3">
20+
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.4">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
22+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.3">
24+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.4">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
26+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.3">
28+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.4">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
30+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.3-servicing.25111.13">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.4-servicing.25163.5">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
34+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.3">
36+
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.4">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
38+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.3">
40+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.4">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
42+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.3-servicing.25111.13">
44+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.4-servicing.25163.5">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
46-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
46+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
4747
</Dependency>
4848
<!--
4949
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
5050
All Runtime.$rid packages should have the same version.
5151
-->
52-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.3">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.4">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
54+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Text.Json" Version="9.0.3">
56+
<Dependency Name="System.Text.Json" Version="9.0.4">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
58+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
5959
</Dependency>
60-
<Dependency Name="System.Text.Encodings.Web" Version="9.0.3">
60+
<Dependency Name="System.Text.Encodings.Web" Version="9.0.4">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
62+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
6363
</Dependency>
64-
<Dependency Name="System.Formats.Asn1" Version="9.0.3">
64+
<Dependency Name="System.Formats.Asn1" Version="9.0.4">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
66+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25164.2">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25225.6">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
72+
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25164.2">
74+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25225.6">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
76+
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25164.2">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25225.6">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>5ba9ca776c1d0bb72b2791591e54cf51fc52dfee</Sha>
80+
<Sha>bfbc858ba868b60fffaf7b2150f1d2165b01e786</Sha>
8181
</Dependency>
8282
</ToolsetDependencies>
8383
</Dependencies>

‎eng/Versions.props‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Label="Version settings">
3-
<VersionPrefix>9.0.5</VersionPrefix>
3+
<VersionPrefix>9.0.6</VersionPrefix>
44
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
55
<PreReleaseVersionIteration>
66
</PreReleaseVersionIteration>
@@ -17,24 +17,24 @@
1717
<UsingToolXliff>False</UsingToolXliff>
1818
</PropertyGroup>
1919
<PropertyGroup Label="Dependencies from dotnet/runtime">
20-
<MicrosoftExtensionsCachingMemoryVersion>9.0.3</MicrosoftExtensionsCachingMemoryVersion>
21-
<MicrosoftExtensionsConfigurationVersion>9.0.3</MicrosoftExtensionsConfigurationVersion>
22-
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.3</MicrosoftExtensionsConfigurationAbstractionsVersion>
23-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.3</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24-
<MicrosoftExtensionsConfigurationJsonVersion>9.0.3</MicrosoftExtensionsConfigurationJsonVersion>
25-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.3</MicrosoftExtensionsDependencyInjectionVersion>
26-
<MicrosoftExtensionsDependencyModelVersion>9.0.3</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.3-servicing.25111.13</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28-
<MicrosoftExtensionsLoggingVersion>9.0.3</MicrosoftExtensionsLoggingVersion>
29-
<MicrosoftNETCoreAppRefVersion>9.0.3</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.3</MicrosoftNETCoreAppRuntimewinx64Version>
31-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.3-servicing.25111.13</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32-
<SystemTextEncodingsWebVersion>9.0.3</SystemTextEncodingsWebVersion>
33-
<SystemTextJsonVersion>9.0.3</SystemTextJsonVersion>
34-
<SystemFormatsAsn1Version>9.0.3</SystemFormatsAsn1Version>
20+
<MicrosoftExtensionsCachingMemoryVersion>9.0.4</MicrosoftExtensionsCachingMemoryVersion>
21+
<MicrosoftExtensionsConfigurationVersion>9.0.4</MicrosoftExtensionsConfigurationVersion>
22+
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.4</MicrosoftExtensionsConfigurationAbstractionsVersion>
23+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.4</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24+
<MicrosoftExtensionsConfigurationJsonVersion>9.0.4</MicrosoftExtensionsConfigurationJsonVersion>
25+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.4</MicrosoftExtensionsDependencyInjectionVersion>
26+
<MicrosoftExtensionsDependencyModelVersion>9.0.4</MicrosoftExtensionsDependencyModelVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.4-servicing.25163.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28+
<MicrosoftExtensionsLoggingVersion>9.0.4</MicrosoftExtensionsLoggingVersion>
29+
<MicrosoftNETCoreAppRefVersion>9.0.4</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
31+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.4-servicing.25163.5</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32+
<SystemTextEncodingsWebVersion>9.0.4</SystemTextEncodingsWebVersion>
33+
<SystemTextJsonVersion>9.0.4</SystemTextJsonVersion>
34+
<SystemFormatsAsn1Version>9.0.4</SystemFormatsAsn1Version>
3535
</PropertyGroup>
3636
<PropertyGroup Label="Dependencies from dotnet/arcade">
37-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25164.2</MicrosoftDotNetBuildTasksTemplatingVersion>
37+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25225.6</MicrosoftDotNetBuildTasksTemplatingVersion>
3838
</PropertyGroup>
3939
<PropertyGroup Label="Other dependencies">
4040
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>

‎eng/common/core-templates/job/source-build.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ parameters:
2626
# Specifies the build script to invoke to perform the build in the repo. The default
2727
# './build.sh' should work for typical Arcade repositories, but this is customizable for
2828
# difficult situations.
29+
# buildArguments: ''
30+
# Specifies additional build arguments to pass to the build script.
2931
# jobProperties: {}
3032
# A list of job properties to inject at the top level, for potential extensibility beyond
3133
# container and pool.

‎eng/common/core-templates/job/source-index-stage1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
3+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
55
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []

‎eng/common/core-templates/steps/source-build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ steps:
7979
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8080
--configuration $buildConfig \
8181
--restore --build --pack $publishArgs -bl \
82+
${{ parameters.platform.buildArguments }} \
8283
$officialBuildArgs \
8384
$internalRuntimeDownloadArgs \
8485
$internalRestoreArgs \

‎global.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"sdk": {
3-
"version": "9.0.104",
3+
"version": "9.0.105",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor"
66
},
77
"tools": {
8-
"dotnet": "9.0.104",
8+
"dotnet": "9.0.105",
99
"runtimes": {
1010
"dotnet": [
1111
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
1212
]
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2",
17-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25164.2"
16+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6",
17+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25225.6"
1818
}
1919
}

‎src/EFCore.Cosmos/EFCore.Cosmos.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050

5151
<ItemGroup>
5252
<PackageReference Include="Microsoft.Azure.Cosmos" />
53+
<!-- Microsoft.Azure.Cosmos requires explicit reference to Newtonsoft.Json >= 10.0.2 -->
54+
<PackageReference Include="Newtonsoft.Json" />
5355
</ItemGroup>
5456

5557
<ItemGroup>

‎test/EFCore.Cosmos.FunctionalTests/Query/AdHocJsonQueryCosmosTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ protected override async Task Seed21006(Context21006 context)
159159

160160
var wrapper = (CosmosClientWrapper)context.GetService<ICosmosClientWrapper>();
161161
var singletonWrapper = context.GetService<ISingletonCosmosClientWrapper>();
162-
var entitiesContainer = singletonWrapper.Client.GetContainer(StoreName, containerId: "Entities");
162+
var entitiesContainer = singletonWrapper.Client.GetContainer(TestStore.Name, containerId: "Entities");
163163

164164
var missingTopLevel =
165165
$$"""

0 commit comments

Comments
 (0)