Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .pipelines/cosmos-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ steps:
displayName: Setup .NET SDK v8.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: NuGetToolInstaller@1
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/dwsql-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
displayName: Setup .NET SDK v8.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
displayName: Setup .NET SDK v8.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down
2 changes: 1 addition & 1 deletion .pipelines/mssql-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
displayName: Setup .NET SDK v8.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down
2 changes: 1 addition & 1 deletion .pipelines/mysql-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
displayName: Setup .NET SDK v8.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down
2 changes: 1 addition & 1 deletion .pipelines/pg-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
displayName: Setup .NET SDK v8.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down
2 changes: 1 addition & 1 deletion .pipelines/templates/build-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ steps:
displayName: Setup .NET SDK v8.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: NuGetToolInstaller@1
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/templates/mssql-test-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ steps:
displayName: Setup .NET SDK v8.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down
2 changes: 1 addition & 1 deletion .pipelines/templates/static-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
displayName: Setup .NET SDK v8.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

# Analyze source and build output text files for credentials
- task: CredScan@3
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Version values referenced from https://hub.docker.com/_/microsoft-dotnet-aspnet

FROM mcr.microsoft.com/dotnet/sdk:8.0-cbl-mariner2.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:10.0-azurelinux3.0 AS build


WORKDIR /src
COPY [".", "./"]
RUN dotnet build "./src/Service/Azure.DataApiBuilder.Service.csproj" -c Docker -o /out -r linux-x64

FROM mcr.microsoft.com/dotnet/aspnet:8.0-cbl-mariner2.0 AS runtime
FROM mcr.microsoft.com/dotnet/aspnet:10.0-azurelinux3.0 AS runtime

COPY --from=build /out /App
# Add default dab-config.json to /App in the image
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
[TODO prereq-PR Usr/sogh/upgrade-net10-sqlclient6: This file was renamed from
Microsoft.Data.SqlClient.SNI.5.2.0.License.txt for the SqlClient 5.2.3 -> 6.0.2
bump. Please refresh contents from the upstream license URL for the new SNI
version 6.0.0 before merge. The body below is still the 5.2.0 text.]

MICROSOFT SOFTWARE LICENSE TERMS

MICROSOFT.DATA.SQLCLIENT.SNI LIBRARY
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.420",
"version": "10.0.301",
"rollForward": "latestFeature"
}
}
18 changes: 11 additions & 7 deletions scripts/create-manifest-file.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ if ($isReleaseBuild -eq 'true')
}

# Generating hash for DAB packages
$dotnetTargetFrameworks = "net8.0"
# TODO(prereq-PR Usr/sogh/upgrade-net10-sqlclient6): String-only swap of
# net8.0 -> net10.0. Release-engineering: please confirm the
# net10.0_{linux,win,osx}-x64 download URLs and SHA hashes referenced
# downstream still resolve after the .NET 10 publish cycle runs.
Comment on lines +24 to +27
$dotnetTargetFrameworks = "net10.0"
$RIDs = "win-x64", "linux-x64", "osx-x64"
[hashtable]$frameworkPlatformDownloadMetadata = @{}
[hashtable]$frameworkPlatformFileHashMetadata = @{}
Expand Down Expand Up @@ -62,16 +66,16 @@ $latestBlock = @'
"releaseDate": "${releaseDate}",
"files": {
"linux-x64":{
"url": "$($frameworkPlatformDownloadMetadata["net8.0_linux-x64"])",
"sha": "$($frameworkPlatformFileHashMetadata["net8.0_linux-x64"])"
"url": "$($frameworkPlatformDownloadMetadata["net10.0_linux-x64"])",
"sha": "$($frameworkPlatformFileHashMetadata["net10.0_linux-x64"])"
},
"win-x64":{
"url": "$($frameworkPlatformDownloadMetadata["net8.0_win-x64"])",
"sha": "$($frameworkPlatformFileHashMetadata["net8.0_win-x64"])"
"url": "$($frameworkPlatformDownloadMetadata["net10.0_win-x64"])",
"sha": "$($frameworkPlatformFileHashMetadata["net10.0_win-x64"])"
},
"osx-x64":{
"url": "$($frameworkPlatformDownloadMetadata["net8.0_osx-x64"])",
"sha": "$($frameworkPlatformFileHashMetadata["net8.0_osx-x64"])"
"url": "$($frameworkPlatformDownloadMetadata["net10.0_osx-x64"])",
"sha": "$($frameworkPlatformFileHashMetadata["net10.0_osx-x64"])"
},
"nuget": {
"url": "${download_url_nuget_cli}",
Expand Down
2 changes: 1 addition & 1 deletion scripts/notice-generation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Invoke-WebRequest $chiliCreamLicenseMetadataURL -UseBasicParsing |
Out-File $chiliCreamLicenseSavePath

# Define the path to the license file in your repository and Read the content of the license file
$sqlClientSNILicenseFilePath = "$BuildSourcesDir/external_licenses/Microsoft.Data.SqlClient.SNI.5.2.0.License.txt"
$sqlClientSNILicenseFilePath = "$BuildSourcesDir/external_licenses/Microsoft.Data.SqlClient.SNI.6.0.0.License.txt"
$sqlClientSNILicense = Get-Content -Path $sqlClientSNILicenseFilePath -Raw

# Replace erroneous copyright, using [System.IO.File] for better performance than Get-Content and Set-Content
Expand Down
6 changes: 3 additions & 3 deletions scripts/publish.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ param (
)

$BuildRoot = Split-Path $PSScriptRoot -Parent
$dotnetTargetFrameworks = "net8.0"
$dotnetTargetFrameworks = "net10.0"
$RIDs = "win-x64", "linux-x64", "osx-x64"

# Runs dotnet publish for each target framework and RID.
# Example results:
# \dotnetpublishout\publish\Release\net8.0\win-x64\dab
# \dotnetpublishout\publish\Release\net10.0\win-x64\dab
if ($Package)
{
foreach ($targetFramework in $dotnetTargetFrameworks)
Expand All @@ -30,7 +30,7 @@ if ($Package)

# Zips the published output for each target framework and RID.
# For example:
# \dotnetpublishout\publish\Release\net8.0\win-x64\dab_net8.0_win-x64-0.14.123-rc.zip
# \dotnetpublishout\publish\Release\net10.0\win-x64\dab_net10.0_win-x64-0.14.123-rc.zip
if ($CreateZip)
{
foreach ($targetFramework in $dotnetTargetFrameworks)
Expand Down
4 changes: 2 additions & 2 deletions src/Aspire.AppHost/AppHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}

var mssqlService = builder.AddProject<Projects.Azure_DataApiBuilder_Service>("mssql-service", "Development")
.WithArgs("-f", "net8.0")
.WithArgs("-f", "net10.0")
.WithEndpoint(endpointName: "https", (e) => e.Port = 1234)
.WithEndpoint(endpointName: "http", (e) => e.Port = 2345)
.WithEnvironment("db-type", "mssql")
Expand Down Expand Up @@ -65,7 +65,7 @@
}

var pgService = builder.AddProject<Projects.Azure_DataApiBuilder_Service>("pg-service", "Development")
.WithArgs("-f", "net8.0")
.WithArgs("-f", "net10.0")
.WithEndpoint(endpointName: "https", (e) => e.Port = 1234)
.WithEndpoint(endpointName: "http", (e) => e.Port = 2345)
.WithEnvironment("db-type", "postgresql")
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.AppHost/Aspire.AppHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<NoWarn>NU1603;NU1605</NoWarn>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion src/Auth/Azure.DataApiBuilder.Auth.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputPath>$(BaseOutputPath)\engine</OutputPath>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!-- Suppress transitive dependency version mismatch warnings from MCP SDK -->
Expand Down
2 changes: 1 addition & 1 deletion src/Cli.Tests/Cli.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
2 changes: 1 addition & 1 deletion src/Cli/Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<RootNamespace>Cli</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion src/Config/Azure.DataApiBuilder.Config.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputPath>$(BaseOutputPath)\engine</OutputPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Core/Azure.DataApiBuilder.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackageOutputPath>./nupkg</PackageOutputPath>
Expand Down
14 changes: 7 additions & 7 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.10" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.38.1" />
<PackageVersion Include="Microsoft.Azure.StackExchangeRedis" Version="3.3.1" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="10.0.0" />
<PackageVersion Include="ModelContextProtocol" Version="1.0.0" />
<PackageVersion Include="ModelContextProtocol.AspNetCore" Version="1.0.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
Expand All @@ -43,9 +43,9 @@
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
<!--When updating Microsoft.Data.SqlClient, update license URL in scripts/notice-generation.ps1-->
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.3" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.2" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
<PackageVersion Include="Microsoft.IdentityModel.OpenIdConnect" Version="8.1.2" />
Expand Down Expand Up @@ -81,7 +81,7 @@
<PackageVersion Include="Verify.DiffPlex" Version="2.3.0" />
<PackageVersion Include="ZiggyCreatures.FusionCache" Version="2.1.0" />
<PackageVersion Include="ZiggyCreatures.FusionCache.Serialization.SystemTextJson" Version="2.1.0" />
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="9.0.3" />
<PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="10.0.0" />
<PackageVersion Include="ZiggyCreatures.FusionCache.Backplane.StackExchangeRedis" Version="2.1.0" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Product/Azure.DataApiBuilder.Product.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputPath>$(BaseOutputPath)\engine</OutputPath>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputPath>$(BaseOutputPath)\engine</OutputPath>
Expand Down
10 changes: 8 additions & 2 deletions src/Service.Tests/Azure.DataApiBuilder.Service.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<Nullable>disable</Nullable>
<OutputPath>$(BaseOutputPath)\tests</OutputPath>
<NoWarn>NU1603</NoWarn>
<!-- ASPDEPR008: IWebHostBuilder/IWebHost are obsolete on net10. The
ConfigurationTests fixtures still consume them via Program.cs
test-only helpers. Migrating to IHost is behavior-affecting
refactor work tracked separately; suppressed here so the
.NET 10 + SqlClient 6.x prerequisite PR stays behavior-preserving.
TODO(prereq-PR Usr/sogh/upgrade-net10-sqlclient6): file a follow-up issue. -->
<NoWarn>NU1603;ASPDEPR008</NoWarn>
Comment on lines +13 to +14
</PropertyGroup>

<ItemGroup>
Expand Down
16 changes: 11 additions & 5 deletions src/Service/Azure.DataApiBuilder.Service.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Configurations>Debug;Release;Docker</Configurations>
<OutputPath>$(BaseOutputPath)\engine</OutputPath>
<RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<NoWarn>NU1603</NoWarn>
<!-- ASPDEPR008: WebHost is obsolete on net10. The test-only
CreateWebHostBuilder / CreateWebHostFromInMemoryUpdatableConfBuilder
helpers in Program.cs still use IWebHostBuilder because the existing
TestServer fixture takes IWebHostBuilder. Migrating to
WebApplicationBuilder/HostBuilder is behavior-affecting refactor
work tracked separately; suppressed here so the .NET 10 + SqlClient
6.x prerequisite PR stays behavior-preserving. TODO(prereq-PR
Usr/sogh/upgrade-net10-sqlclient6): file a follow-up issue. -->
<NoWarn>NU1603;ASPDEPR008</NoWarn>
Comment on lines +15 to +17
</PropertyGroup>

<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
Expand Down Expand Up @@ -64,8 +72,6 @@
<PackageReference Include="Microsoft.Azure.Cosmos" />
<PackageReference Include="Microsoft.Azure.StackExchangeRedis" />
<PackageReference Include="Microsoft.Data.SqlClient" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
<PackageReference Include="Microsoft.OData.Edm" />
<PackageReference Include="Microsoft.OData.Core" />
<PackageReference Include="Microsoft.OpenApi" />
Expand Down
Loading