Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,6 @@ jobs:
\.md$
eng/pipelines/.*

- id: compute_version_suffix
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change supposed to go to release/13 / main?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, because this branch continues to produce stable versions, so without this a lot of tests will fail since the rest of the codebase is expecting stable versions (so things like tests, etc would fail)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It won't go into main of course. If you check this is the same we had in release/9.5

name: Compute version suffix for PRs
if: ${{ github.event_name == 'pull_request' }}
shell: pwsh
env:
# Use the pull request head SHA instead of GITHUB_SHA (which can be a merge commit)
PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
PR_NUMBER: ${{ github.event.number }}
run: |
Write-Host "Determining VERSION_SUFFIX_OVERRIDE (PR only step)..."
if ([string]::IsNullOrWhiteSpace($Env:PR_HEAD_SHA)) {
Write-Error "PR_HEAD_SHA not set; cannot compute version suffix."
exit 1
}
$SHORT_SHA = $Env:PR_HEAD_SHA.Substring(0,8)
$VERSION_SUFFIX = "/p:VersionSuffix=pr.$($Env:PR_NUMBER).g$SHORT_SHA"
Write-Host "Computed VERSION_SUFFIX_OVERRIDE=$VERSION_SUFFIX"
"VERSION_SUFFIX_OVERRIDE=$VERSION_SUFFIX" | Out-File -FilePath $Env:GITHUB_OUTPUT -Append -Encoding utf8

tests:
uses: ./.github/workflows/tests.yml
name: Tests
Expand Down
8 changes: 4 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" />
<PackageVersion Include="NATS.Net" Version="2.6.11" />
<PackageVersion Include="Npgsql.DependencyInjection" Version="9.0.4" />
<PackageVersion Include="OpenAI" Version="2.5.0" />
<PackageVersion Include="OpenAI" Version="2.6.0" />
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.90" /> <!-- Can't update to 9.x versions as those lift up LTS versions when targeting net8 -->
<PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.26.0" />
<PackageVersion Include="Polly.Core" Version="8.6.4" />
Expand Down Expand Up @@ -171,8 +171,8 @@
<ItemGroup>
<!-- dotnet/extensions dependencies ** Common between net8 and net9 ** -->
<PackageVersion Include="Microsoft.Extensions.AI" Version="$(MicrosoftExtensionsAIVersion)" />
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="$(MicrosoftExtensionsAIPreviewVersion)" />
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="$(MicrosoftExtensionsAIPreviewVersion)" />
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="$(MicrosoftExtensionsAIOpenAIVersion)" />
<PackageVersion Include="Microsoft.Extensions.AI.AzureAIInference" Version="$(MicrosoftExtensionsAIAzureAIInferenceVersion)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.AutoActivation" Version="$(MicrosoftExtensionsDependencyInjectionAutoActivationVersion)" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="$(MicrosoftExtensionsDiagnosticsTestingVersion)" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsHttpResilienceVersion)" />
Expand Down Expand Up @@ -245,7 +245,7 @@
<PackageVersion Update="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
<PackageVersion Update="System.Text.Json" Version="$(SystemTextJsonVersion)" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0' Or '$(ForceLatestDotnetVersions)' == 'true'">
<!-- EF -->
<PackageVersion Update="Microsoft.EntityFrameworkCore.Cosmos" Version="$(MicrosoftEntityFrameworkCoreCosmosPreviewVersion)" />
<PackageVersion Update="Microsoft.EntityFrameworkCore.Design" Version="$(MicrosoftEntityFrameworkCoreDesignPreviewVersion)" />
Expand Down
148 changes: 84 additions & 64 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,129 +33,149 @@
<Uri>https://github.com/microsoft/usvc-apiserver</Uri>
<Sha>518dd532b47521a52dff9d1c9ba4639229f39953</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection.AutoActivation" Version="9.10.0">
<Dependency Name="Microsoft.Extensions.DependencyInjection.AutoActivation" Version="10.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>f8f779a6ea004bb1f26649719ca77d63a9d9417c</Sha>
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Http.Resilience" Version="9.10.0">
<Dependency Name="Microsoft.Extensions.Http.Resilience" Version="10.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>f8f779a6ea004bb1f26649719ca77d63a9d9417c</Sha>
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.ServiceDiscovery" Version="9.5.0">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>6218df0ffff86df912bd2035854c80480476e803</Sha>
<Dependency Name="Microsoft.Extensions.ServiceDiscovery" Version="10.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="9.5.0">
<Uri>https://github.com/dotnet/extensions</Uri>
<Sha>6218df0ffff86df912bd2035854c80480476e803</Sha>
<Dependency Name="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="10.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.10.0">
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>f8f779a6ea004bb1f26649719ca77d63a9d9417c</Sha>
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.10.0">
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="10.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>f8f779a6ea004bb1f26649719ca77d63a9d9417c</Sha>
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Hosting" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Http" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Http" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Options" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Primitives" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.OpenApi" Version="9.0.10">
<Dependency Name="Microsoft.AspNetCore.OpenApi" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="9.0.10">
<Dependency Name="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Features" Version="9.0.10">
<Dependency Name="Microsoft.Extensions.Features" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authentication.Certificate" Version="9.0.10">
<Dependency Name="Microsoft.AspNetCore.Authentication.Certificate" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.10">
<Dependency Name="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.10">
<Dependency Name="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.10">
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Cosmos" Version="9.0.10">
<Dependency Name="Microsoft.EntityFrameworkCore.Cosmos" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>5452ff90a79084afd23df379388ae8bca24284f3</Sha>
<Sha>f55fe13550b5f821336abb63ef5ac454ce4de5fa</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.10">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>5452ff90a79084afd23df379388ae8bca24284f3</Sha>
<Sha>f55fe13550b5f821336abb63ef5ac454ce4de5fa</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10">
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>5452ff90a79084afd23df379388ae8bca24284f3</Sha>
<Sha>f55fe13550b5f821336abb63ef5ac454ce4de5fa</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
<Sha>5452ff90a79084afd23df379388ae8bca24284f3</Sha>
<Sha>f55fe13550b5f821336abb63ef5ac454ce4de5fa</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.SignalR.Client" Version="9.0.10">
<Dependency Name="Microsoft.AspNetCore.SignalR.Client" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
<Sha>5bae930797f60d2d04f3b1df6a33eaca85fc5f28</Sha>
<Sha>d3aba8fe1a0d0f5c145506f292b72ea9d28406fc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.10">
<Dependency Name="System.Formats.Asn1" Version="9.0.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e1f19886fe3354963a4a790c896b3f99689fd7a5</Sha>
<Sha>fa7cdded37981a97cec9a3e233c4a6af58a91c57</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.AI" Version="10.0.0">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.AI.OpenAI" Version="10.0.0-preview.1.25559.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.AI.AzureAIInference" Version="10.0.0-preview.1.25559.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>fbd393616ef5ce0f2f1521a7250e4311728ed93a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
Loading
Loading