Skip to content

[release/10.0] Merge branch 'release/10.0-rc1' into 'release/10.0' #36644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndriySvyryd merged 9 commits into from
Aug 25, 2025
Merged

[release/10.0] Merge branch 'release/10.0-rc1' into 'release/10.0' #36644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c46f51c
[release/10.0-rc1] Source code updates from dotnet/dotnet (#36589)
dotnet-maestro[bot] Aug 18, 2025
69f50fe
Temporarily disable the JSON data type on Azure SQL (#36596)
roji Aug 18, 2025
66786d1
Update dependencies from https://github.com/dotnet/dotnet build 27987…
dotnet-maestro[bot] Aug 19, 2025
851aa30
Fix whitespace in Microsoft.EntityFrameworkCore.Tasks.props (#36610)
AndriySvyryd Aug 20, 2025
5eedebf
Update dependencies from https://github.com/dotnet/dotnet build 28025…
dotnet-maestro[bot] Aug 21, 2025
310ec07
Update dependencies from https://github.com/dotnet/dotnet build 28041…
dotnet-maestro[bot] Aug 22, 2025
a5241ef
Update dependencies from https://github.com/dotnet/dotnet build 28041…
dotnet-maestro[bot] Aug 22, 2025
b6c5ca3
Update dependencies from https://github.com/dotnet/dotnet build 28054…
dotnet-maestro[bot] Aug 23, 2025
c701785
Merge branch 'release/10.0-rc1' into 'release/10.0'
AndriySvyryd Aug 25, 2025
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 eng/common/core-templates/steps/source-index-stage1-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
sourceIndexUploadPackageVersion: 2.0.0-20250818.1
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
binlogPath: artifacts/log/Debug/Build.binlog

Expand Down
3 changes: 2 additions & 1 deletion eng/common/sdk-task.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ Param(
[switch] $restore,
[switch] $prepareMachine,
[switch][Alias('nobl')]$excludeCIBinaryLog,
[switch]$noWarnAsError,
[switch] $help,
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
)

$ci = $true
$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
$warnAsError = $true
$warnAsError = if ($noWarnAsError) { $false } else { $true }

. $PSScriptRoot\tools.ps1

Expand Down
7 changes: 6 additions & 1 deletion eng/common/sdk-task.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ show_usage() {

echo "Advanced settings:"
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
echo " --noWarnAsError Do not warn as error
echo ""
echo "Command line arguments not listed above are passed thru to msbuild."
}
Expand Down Expand Up @@ -52,6 +53,7 @@ exclude_ci_binary_log=false
restore=false
help=false
properties=''
warnAsError=true

while (($# > 0)); do
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
Expand All @@ -73,6 +75,10 @@ while (($# > 0)); do
exclude_ci_binary_log=true
shift 1
;;
--noWarnAsError)
warnAsError=false
shift 1
;;
--help)
help=true
shift 1
Expand All @@ -85,7 +91,6 @@ while (($# > 0)); do
done

ci=true
warnAsError=true

if $help; then
show_usage
Expand Down
6 changes: 5 additions & 1 deletion src/EFCore.SqlServer/Infrastructure/Internal/SqlServerSingletonOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,11 @@ public virtual bool SupportsJsonType
=> EngineType switch
{
SqlServerEngineType.SqlServer => SqlServerCompatibilityLevel >= 170,
SqlServerEngineType.AzureSql => AzureSqlCompatibilityLevel >= 170,
// TODO: #36460
// At the time of writing, Azure SQL Database does not yet support OPENJSON over the JSON data type.
// This should get reenabled by the time we GA.
SqlServerEngineType.AzureSql => false,
// SqlServerEngineType.AzureSql => AzureSqlCompatibilityLevel >= 170,
SqlServerEngineType.AzureSynapse => false,
SqlServerEngineType.Unknown => false, // TODO: We shouldn't observe Unknown here, #36477
_ => throw new UnreachableException()
Expand Down
9 changes: 7 additions & 2 deletions test/EFCore.SqlServer.Tests/Storage/SqlServerTypeMappingSourceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1588,8 +1588,13 @@ public void Json_is_mapped_to_json_type_with_UseAzureSql_by_default()
{
var typeMappingSource = CreateTypeMappingSource(o => o.UseAzureSql());

Assert.Equal("json", typeMappingSource.GetMapping(typeof(JsonTypePlaceholder)).StoreType);
Assert.Equal("json", typeMappingSource.GetMapping(typeof(int[])).StoreType);
// TODO: #36460
// At the time of writing, Azure SQL Database does not yet support OPENJSON over the JSON data type.
// This should get reenabled by the time we GA.
Assert.Equal("nvarchar(max)", typeMappingSource.GetMapping(typeof(JsonTypePlaceholder)).StoreType);
Assert.Equal("nvarchar(max)", typeMappingSource.GetMapping(typeof(int[])).StoreType);
// Assert.Equal("json", typeMappingSource.GetMapping(typeof(JsonTypePlaceholder)).StoreType);
// Assert.Equal("json", typeMappingSource.GetMapping(typeof(int[])).StoreType);
}

[ConditionalFact]
Expand Down
Loading