Skip to content

Commit 4249002

Browse files
joperezrjoperezr
authored
Merge pull request #12896 from joperezr/MergeInternalChanges
Merge internal changes
2 parents 690bf93 + 445e51a commit 4249002

File tree

23 files changed

+318
-235
lines changed

23 files changed

+318
-235
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,6 @@ jobs:
4141
\.md$
4242
eng/pipelines/.*
4343
44-
- id: compute_version_suffix
45-
name: Compute version suffix for PRs
46-
if: ${{ github.event_name == 'pull_request' }}
47-
shell: pwsh
48-
env:
49-
# Use the pull request head SHA instead of GITHUB_SHA (which can be a merge commit)
50-
PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
51-
PR_NUMBER: ${{ github.event.number }}
52-
run: |
53-
Write-Host "Determining VERSION_SUFFIX_OVERRIDE (PR only step)..."
54-
if ([string]::IsNullOrWhiteSpace($Env:PR_HEAD_SHA)) {
55-
Write-Error "PR_HEAD_SHA not set; cannot compute version suffix."
56-
exit 1
57-
}
58-
$SHORT_SHA = $Env:PR_HEAD_SHA.Substring(0,8)
59-
$VERSION_SUFFIX = "/p:VersionSuffix=pr.$($Env:PR_NUMBER).g$SHORT_SHA"
60-
Write-Host "Computed VERSION_SUFFIX_OVERRIDE=$VERSION_SUFFIX"
61-
"VERSION_SUFFIX_OVERRIDE=$VERSION_SUFFIX" | Out-File -FilePath $Env:GITHUB_OUTPUT -Append -Encoding utf8
62-
6344
tests:
6445
uses: ./.github/workflows/tests.yml
6546
name: Tests

‎Directory.Packages.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" />
106106
<PackageVersion Include="NATS.Net" Version="2.6.11" />
107107
<PackageVersion Include="Npgsql.DependencyInjection" Version="9.0.4" />
108-
<PackageVersion Include="OpenAI" Version="2.5.0" />
108+
<PackageVersion Include="OpenAI" Version="2.6.0" />
109109
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.90" /> <!-- Can't update to 9.x versions as those lift up LTS versions when targeting net8 -->
110110
<PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.26.0" />
111111
<PackageVersion Include="Polly.Core" Version="8.6.4" />
@@ -171,8 +171,8 @@
171171
<ItemGroup>
172172
<!-- dotnet/extensions dependencies ** Common between net8 and net9 ** -->
173173
<PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
174-
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="$(MicrosoftExtensionsAIPreviewVersion)" />
175-
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="$(MicrosoftExtensionsAIPreviewVersion)" />
174+
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="$(MicrosoftExtensionsAIOpenAIVersion)" />
175+
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="$(MicrosoftExtensionsAIAzureAIInferenceVersion)" />
176176
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.AutoActivation" Version="$(MicrosoftExtensionsDependencyInjectionAutoActivationVersion)" />
177177
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="$(MicrosoftExtensionsDiagnosticsTestingVersion)" />
178178
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsHttpResilienceVersion)" />
@@ -245,7 +245,7 @@
245245
<PackageVersion Update="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
246246
<PackageVersion Update="System.Text.Json" Version="$(SystemTextJsonVersion)" />
247247
</ItemGroup>
248-
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
248+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0' Or '$(ForceLatestDotnetVersions)' == 'true'">
249249
<!-- EF -->
250250
<PackageVersion Update="Microsoft.EntityFrameworkCore.Cosmos" Version="$(MicrosoftEntityFrameworkCoreCosmosPreviewVersion)" />
251251
<PackageVersion Update="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignPreviewVersion)" />

‎eng/Version.Details.xml‎

Lines changed: 84 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -33,129 +33,149 @@
3333
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
3434
<Sha>518dd532b47521a52dff9d1c9ba4639229f39953</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.DependencyInjection.AutoActivation" Version="9.10.0">
36+
<Dependency Name="Microsoft.Extensions.DependencyInjection.AutoActivation" Version="10.0.0">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
38-
<Sha>f8f779a6ea004bb1f26649719ca77d63a9d9417c</Sha>
38+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.Extensions.Http.Resilience" Version="9.10.0">
40+
<Dependency Name="Microsoft.Extensions.Http.Resilience" Version="10.0.0">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
42-
<Sha>f8f779a6ea004bb1f26649719ca77d63a9d9417c</Sha>
42+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.Extensions.ServiceDiscovery" Version="9.5.0">
45-
<Uri>https://github.com/dotnet/extensions</Uri>
46-
<Sha>6218df0ffff86df912bd2035854c80480476e803</Sha>
44+
<Dependency Name="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0">
45+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
46+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.5.0">
49-
<Uri>https://github.com/dotnet/extensions</Uri>
50-
<Sha>6218df0ffff86df912bd2035854c80480476e803</Sha>
48+
<Dependency Name="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="10.0.0">
49+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
50+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.10.0">
52+
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.0">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
54-
<Sha>f8f779a6ea004bb1f26649719ca77d63a9d9417c</Sha>
54+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
5555
</Dependency>
56-
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.10.0">
56+
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.0">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
58-
<Sha>f8f779a6ea004bb1f26649719ca77d63a9d9417c</Sha>
58+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.10">
60+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.11">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
62+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.10">
64+
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.11">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
66+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
6767
</Dependency>
68-
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10">
68+
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.11">
6969
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
70-
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
70+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
7171
</Dependency>
72-
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10">
72+
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.11">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
74+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.10">
76+
<Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.11">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
78+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Extensions.Http" Version="9.0.10">
80+
<Dependency Name="Microsoft.Extensions.Http" Version="9.0.11">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
82+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
8383
</Dependency>
84-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10">
84+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.11">
8585
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
86-
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
86+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
8787
</Dependency>
88-
<Dependency Name="Microsoft.Extensions.Options" Version="9.0.10">
88+
<Dependency Name="Microsoft.Extensions.Options" Version="9.0.11">
8989
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
90-
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
90+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
9191
</Dependency>
92-
<Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.10">
92+
<Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.11">
9393
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
94-
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
94+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
9595
</Dependency>
96-
<Dependency Name="Microsoft.AspNetCore.OpenApi" Version="9.0.10">
96+
<Dependency Name="Microsoft.AspNetCore.OpenApi" Version="9.0.11">
9797
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
98-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
98+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
9999
</Dependency>
100-
<Dependency Name="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="9.0.10">
100+
<Dependency Name="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="9.0.11">
101101
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
102-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
102+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
103103
</Dependency>
104-
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.10">
104+
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.11">
105105
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
106-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
106+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
107107
</Dependency>
108-
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.10">
108+
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.11">
109109
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
110-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
110+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
111111
</Dependency>
112-
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.10">
112+
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.11">
113113
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
114-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
114+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
115115
</Dependency>
116-
<Dependency Name="Microsoft.Extensions.Features" Version="9.0.10">
116+
<Dependency Name="Microsoft.Extensions.Features" Version="9.0.11">
117117
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
118-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
118+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
119119
</Dependency>
120-
<Dependency Name="Microsoft.AspNetCore.Authentication.Certificate" Version="9.0.10">
120+
<Dependency Name="Microsoft.AspNetCore.Authentication.Certificate" Version="9.0.11">
121121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
122-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
122+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
123123
</Dependency>
124-
<Dependency Name="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.10">
124+
<Dependency Name="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.11">
125125
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
126-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
126+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.10">
128+
<Dependency Name="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.11">
129129
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
130-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
130+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.10">
132+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.11">
133133
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
134-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
134+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.EntityFrameworkCore.Cosmos" Version="9.0.10">
136+
<Dependency Name="Microsoft.EntityFrameworkCore.Cosmos" Version="9.0.11">
137137
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
138-
<Sha>5452ff90a79084afd23df379388ae8bca24284f3</Sha>
138+
<Sha>f55fe13550b5f821336abb63ef5ac454ce4de5fa</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10">
140+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.11">
141141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
142-
<Sha>5452ff90a79084afd23df379388ae8bca24284f3</Sha>
142+
<Sha>f55fe13550b5f821336abb63ef5ac454ce4de5fa</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
144+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="9.0.11">
145145
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
146-
<Sha>5452ff90a79084afd23df379388ae8bca24284f3</Sha>
146+
<Sha>f55fe13550b5f821336abb63ef5ac454ce4de5fa</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
148+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="9.0.11">
149149
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
150-
<Sha>5452ff90a79084afd23df379388ae8bca24284f3</Sha>
150+
<Sha>f55fe13550b5f821336abb63ef5ac454ce4de5fa</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10">
152+
<Dependency Name="Microsoft.AspNetCore.SignalR.Client" Version="9.0.11">
153153
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
154-
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
154+
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
155+
</Dependency>
156+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.11">
157+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
158+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
159+
</Dependency>
160+
<Dependency Name="System.Text.Json" Version="9.0.11">
161+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
162+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
155163
</Dependency>
156-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.10">
164+
<Dependency Name="System.Formats.Asn1" Version="9.0.11">
157165
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
158-
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
166+
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
167+
</Dependency>
168+
<Dependency Name="Microsoft.Extensions.AI" Version="10.0.0">
169+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
170+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
171+
</Dependency>
172+
<Dependency Name="Microsoft.Extensions.AI.OpenAI" Version="10.0.0-preview.1.25559.3">
173+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
174+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
175+
</Dependency>
176+
<Dependency Name="Microsoft.Extensions.AI.AzureAIInference" Version="10.0.0-preview.1.25559.3">
177+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
178+
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
159179
</Dependency>
160180
</ProductDependencies>
161181
<ToolsetDependencies>

0 commit comments

Comments
 (0)