Skip to content
Open
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
4 changes: 2 additions & 2 deletions .pipelines/cosmos-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ steps:
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from
# specifying the runtime version a project targets."
- task: UseDotNet@2
displayName: Setup .NET SDK v8.0.x
displayName: Setup .NET SDK v10.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x
installationPath: $(Agent.ToolsDirectory)/dotnet

- task: NuGetToolInstaller@1
Expand Down
8 changes: 4 additions & 4 deletions .pipelines/dwsql-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ jobs:
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from
# specifying the runtime version a project targets."
- task: UseDotNet@2
displayName: Setup .NET SDK v8.0.x
displayName: Setup .NET SDK v10.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down Expand Up @@ -176,10 +176,10 @@ jobs:
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from
# specifying the runtime version a project targets."
- task: UseDotNet@2
displayName: Setup .NET SDK v8.0.x
displayName: Setup .NET SDK v10.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down
4 changes: 2 additions & 2 deletions .pipelines/mssql-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ jobs:
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from
# specifying the runtime version a project targets."
- task: UseDotNet@2
displayName: Setup .NET SDK v8.0.x
displayName: Setup .NET SDK v10.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down
4 changes: 2 additions & 2 deletions .pipelines/mysql-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ jobs:
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from
# specifying the runtime version a project targets."
- task: UseDotNet@2
displayName: Setup .NET SDK v8.0.x
displayName: Setup .NET SDK v10.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down
4 changes: 2 additions & 2 deletions .pipelines/pg-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from
# specifying the runtime version a project targets."
- task: UseDotNet@2
displayName: Setup .NET SDK v8.0.x
displayName: Setup .NET SDK v10.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down
4 changes: 2 additions & 2 deletions .pipelines/templates/build-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ steps:
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from
# specifying the runtime version a project targets."
- task: UseDotNet@2
displayName: Setup .NET SDK v8.0.x
displayName: Setup .NET SDK v10.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/templates/mssql-test-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ steps:
# Per Microsoft Learn Docs, "Selecting the .NET SDK version is independent from
# specifying the runtime version a project targets."
- task: UseDotNet@2
displayName: Setup .NET SDK v8.0.x
displayName: Setup .NET SDK v10.0.x
inputs:
packageType: sdk
version: 8.0.x
version: 10.0.x

- task: NuGetToolInstaller@1

Expand Down
4 changes: 2 additions & 2 deletions .pipelines/templates/static-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
clean: true # if true, execute `execute git clean -ffdx && git reset --hard HEAD` before fetching

- task: UseDotNet@2
displayName: Setup .NET SDK v8.0.x
displayName: Setup .NET SDK v10.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
Comment thread
souvikghosh04 marked this conversation as resolved.


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
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"
}
}
17 changes: 10 additions & 7 deletions scripts/create-manifest-file.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ if ($isReleaseBuild -eq 'true')
}

# Generating hash for DAB packages
$dotnetTargetFrameworks = "net8.0"
# TODO: Release-engineering - confirm the net10.0_{linux,win,osx}-x64 download
Comment thread
souvikghosh04 marked this conversation as resolved.
# URLs and SHA hashes referenced downstream still resolve after the .NET 10
# publish cycle runs. (Add a tracking issue number/link here once created.)
$dotnetTargetFrameworks = "net10.0"
$RIDs = "win-x64", "linux-x64", "osx-x64"
[hashtable]$frameworkPlatformDownloadMetadata = @{}
[hashtable]$frameworkPlatformFileHashMetadata = @{}
Expand Down Expand Up @@ -62,16 +65,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.2.License.txt"
Comment thread
souvikghosh04 marked this conversation as resolved.
$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
5 changes: 4 additions & 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 All @@ -15,6 +15,9 @@
<PackageReference Include="Aspire.Hosting.AppHost" />
<PackageReference Include="Aspire.Hosting.SqlServer" />
<PackageReference Include="Aspire.Hosting.PostgreSQL" />
<!-- Force the transitive MessagePack (via Aspire.Hosting/KubernetesClient) up to a
patched version to resolve NU1903 (GHSA-hv8m-jj95-wg3x). -->
<PackageReference Include="MessagePack" />
</ItemGroup>

<ItemGroup>
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
3 changes: 2 additions & 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 All @@ -28,6 +28,7 @@
<PackageReference Include="Humanizer" />
<PackageReference Include="Npgsql" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
<PackageReference Include="Microsoft.Extensions.Primitives" />
</ItemGroup>

<ItemGroup>
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
2 changes: 1 addition & 1 deletion src/Core/Resolvers/Factories/MutationEngineFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public IMutationEngine GetMutationEngine(DatabaseType databaseType)
$"{nameof(databaseType)}:{databaseType} could not be found within the config",
HttpStatusCode.BadRequest,
DataApiBuilderException.SubStatusCodes.DataSourceNotFound);
};
}

return mutationEngine;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,26 +122,26 @@ public SqlUpdateStructure(
Predicates.Add(CreatePredicateForParam(new KeyValuePair<string, object?>(pkBackingColumn, param.Value)));
}
else // Unpack the input argument type as columns to update
if (param.Key == UpdateAndPatchMutationBuilder.INPUT_ARGUMENT_NAME)
{
IDictionary<string, object?> updateFields =
GQLMutArgumentToDictParams(context, UpdateAndPatchMutationBuilder.INPUT_ARGUMENT_NAME, mutationParams);

foreach (KeyValuePair<string, object?> field in updateFields)
if (param.Key == UpdateAndPatchMutationBuilder.INPUT_ARGUMENT_NAME)
{
string fieldBackingColumn = field.Key;
if (sqlMetadataProvider.TryGetBackingColumn(entityName, field.Key, out string? resolvedBackingColumn)
&& !string.IsNullOrWhiteSpace(resolvedBackingColumn))
{
fieldBackingColumn = resolvedBackingColumn;
}
IDictionary<string, object?> updateFields =
GQLMutArgumentToDictParams(context, UpdateAndPatchMutationBuilder.INPUT_ARGUMENT_NAME, mutationParams);

if (columns.Contains(fieldBackingColumn))
foreach (KeyValuePair<string, object?> field in updateFields)
{
UpdateOperations.Add(CreatePredicateForParam(new KeyValuePair<string, object?>(key: fieldBackingColumn, field.Value)));
string fieldBackingColumn = field.Key;
if (sqlMetadataProvider.TryGetBackingColumn(entityName, field.Key, out string? resolvedBackingColumn)
&& !string.IsNullOrWhiteSpace(resolvedBackingColumn))
{
fieldBackingColumn = resolvedBackingColumn;
}

if (columns.Contains(fieldBackingColumn))
{
UpdateOperations.Add(CreatePredicateForParam(new KeyValuePair<string, object?>(key: fieldBackingColumn, field.Value)));
}
}
}
}
}

if (UpdateOperations.Count == 0)
Expand Down
Loading
Loading