Skip to content

Commit e46c0ca

Browse files
committed
Use .NET 10 SDK.
Use MariaDB 11.8.3 to work around #1606.
1 parent 70aceff commit e46c0ca

File tree

4 files changed

+2
-10
lines changed

4 files changed

+2
-10
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ jobs:
197197
connectionStringExtra: ''
198198
unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,ParsecAuthentication,Redirection,Sha256Password,Tls11,UuidToBin,Vector'
199199
'MariaDB 11.8':
200-
image: 'mariadb:11.8'
200+
image: 'mariadb:11.8.3'
201201
connectionStringExtra: ''
202202
unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Redirection,Sha256Password,Tls11,UuidToBin,VectorType'
203203
steps:

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-rc.2",
3+
"version": "10.0.100",
44
"rollForward": "latestFeature"
55
}
66
}

src/MySqlConnector/MySqlConnector.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
1717
</PropertyGroup>
1818

19-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' ">
20-
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
21-
</PropertyGroup>
22-
2319
<ItemGroup>
2420
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
2521
</ItemGroup>

tests/IntegrationTests/IntegrationTests.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
<NoWarn>$(NoWarn);SA0001;SA1021;SA1133;xUnit1030</NoWarn>
2828
</PropertyGroup>
2929

30-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' or '$(TargetFramework)' == 'net481' ">
31-
<RestoreEnablePackagePruning>false</RestoreEnablePackagePruning>
32-
</PropertyGroup>
33-
3430
<ItemGroup>
3531
<!--testing packages-->
3632
<PackageReference Include="Microsoft.NET.Test.Sdk" />

0 commit comments

Comments
 (0)