From 6719f63bc29cd3ae0bf4110bd039ee116c6a6d43 Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Tue, 25 Feb 2025 20:01:46 -0800 Subject: [PATCH 1/4] Target .NET 10. Signed-off-by: Bradley Grainger --- .ci/build-steps.yml | 26 +- .ci/conformance-test-steps.yml | 2 +- .ci/integration-tests-steps.yml | 4 +- .ci/mysqlconnector-tests-steps.yml | 6 +- .ci/test.ps1 | 2 +- .github/workflows/ci.yml | 2 +- appveyor.yml | 2 +- azure-pipelines.yml | 8 +- global.json | 2 +- .../packages.lock.json | 6 +- src/MySqlConnector/Logging/Log.cs | 8 +- src/MySqlConnector/MySqlConnector.csproj | 2 +- src/MySqlConnector/packages.lock.json | 116 +++++---- .../Conformance.Tests.csproj | 2 +- tests/Conformance.Tests/packages.lock.json | 12 +- .../IntegrationTests/IntegrationTests.csproj | 5 +- tests/IntegrationTests/packages.lock.json | 231 ++++++------------ ...Connector.DependencyInjection.Tests.csproj | 2 +- .../packages.lock.json | 2 +- .../MySqlConnector.NativeAot.Tests.csproj | 2 +- .../packages.lock.json | 28 +-- .../MySqlConnector.Tests.csproj | 2 +- tests/MySqlConnector.Tests/packages.lock.json | 12 +- .../SchemaCollectionGenerator.csproj | 2 +- .../packages.lock.json | 2 +- 25 files changed, 199 insertions(+), 289 deletions(-) diff --git a/.ci/build-steps.yml b/.ci/build-steps.yml index b3d6d0895..95e8d67a6 100644 --- a/.ci/build-steps.yml +++ b/.ci/build-steps.yml @@ -27,52 +27,52 @@ steps: displayName: 'Publish MySqlConnector.Tests' inputs: command: 'publish' - arguments: '-c Release -f net9.0 --no-build tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj' + arguments: '-c Release -f net10.0 --no-build tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj' publishWebProjects: false zipAfterPublish: false - task: PublishPipelineArtifact@1 inputs: - artifact: 'MySqlConnector.Tests-9.0-$(Agent.OS)' - targetPath: 'artifacts/publish/MySqlConnector.Tests/release_net9.0' + artifact: 'MySqlConnector.Tests-10.0-$(Agent.OS)' + targetPath: 'artifacts/publish/MySqlConnector.Tests/release_net10.0' publishLocation: 'pipeline' - task: DotNetCoreCLI@2 displayName: 'Publish Conformance.Tests' inputs: command: 'publish' - arguments: '-c Release -f net9.0 --no-build tests/Conformance.Tests/Conformance.Tests.csproj' + arguments: '-c Release -f net10.0 --no-build tests/Conformance.Tests/Conformance.Tests.csproj' publishWebProjects: false zipAfterPublish: false - task: PublishPipelineArtifact@1 inputs: - artifact: 'Conformance.Tests-9.0-$(Agent.OS)' - targetPath: 'artifacts/publish/Conformance.Tests/release_net9.0' + artifact: 'Conformance.Tests-10.0-$(Agent.OS)' + targetPath: 'artifacts/publish/Conformance.Tests/release_net10.0' publishLocation: 'pipeline' - task: DotNetCoreCLI@2 displayName: 'Publish MySqlConnector.DependencyInjection.Tests' inputs: command: 'publish' - arguments: '-c Release -f net9.0 --no-build tests/MySqlConnector.DependencyInjection.Tests/MySqlConnector.DependencyInjection.Tests.csproj' + arguments: '-c Release -f net10.0 --no-build tests/MySqlConnector.DependencyInjection.Tests/MySqlConnector.DependencyInjection.Tests.csproj' publishWebProjects: false zipAfterPublish: false - task: PublishPipelineArtifact@1 inputs: - artifact: 'MySqlConnector.DependencyInjection.Tests-9.0-$(Agent.OS)' - targetPath: 'artifacts/publish/MySqlConnector.DependencyInjection.Tests/release_net9.0' + artifact: 'MySqlConnector.DependencyInjection.Tests-10.0-$(Agent.OS)' + targetPath: 'artifacts/publish/MySqlConnector.DependencyInjection.Tests/release_net10.0' publishLocation: 'pipeline' - task: DotNetCoreCLI@2 - displayName: 'Publish IntegrationTests (9.0)' + displayName: 'Publish IntegrationTests (10.0)' inputs: command: 'publish' - arguments: '-c Release -f net9.0 --no-build tests/IntegrationTests/IntegrationTests.csproj' + arguments: '-c Release -f net10.0 --no-build tests/IntegrationTests/IntegrationTests.csproj' publishWebProjects: false zipAfterPublish: false - task: PublishPipelineArtifact@1 inputs: - artifact: 'IntegrationTests-net9.0-$(Agent.OS)' - targetPath: 'artifacts/publish/IntegrationTests/release_net9.0' + artifact: 'IntegrationTests-net10.0-$(Agent.OS)' + targetPath: 'artifacts/publish/IntegrationTests/release_net10.0' publishLocation: 'pipeline' - task: DotNetCoreCLI@2 diff --git a/.ci/conformance-test-steps.yml b/.ci/conformance-test-steps.yml index 87cdf035e..fd6d13992 100644 --- a/.ci/conformance-test-steps.yml +++ b/.ci/conformance-test-steps.yml @@ -11,7 +11,7 @@ steps: condition: always() inputs: buildType: 'current' - artifactName: 'Conformance.Tests-9.0-$(Agent.OS)' + artifactName: 'Conformance.Tests-10.0-$(Agent.OS)' targetPath: '$(Build.BinariesDirectory)/9.0' - task: DotNetCoreCLI@2 displayName: 'Conformance Tests' diff --git a/.ci/integration-tests-steps.yml b/.ci/integration-tests-steps.yml index db26b23ed..9b6dd8a0f 100644 --- a/.ci/integration-tests-steps.yml +++ b/.ci/integration-tests-steps.yml @@ -45,12 +45,12 @@ steps: image: ${{ parameters.image }} unsupportedFeatures: ${{ parameters.unsupportedFeatures }} connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}' - platform: 'net9.0' + platform: 'net10.0' description: 'No SSL' - template: 'integration-test-steps.yml' parameters: image: ${{ parameters.image }} unsupportedFeatures: ${{ parameters.unsupportedFeatures }} connectionString: server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=required;DefaultCommandTimeout=3600;certificate file=$(Build.Repository.LocalPath)/.ci/server/certs/ssl-client.pfx;${{ parameters.connectionStringExtra }} - platform: 'net9.0' + platform: 'net10.0' description: 'SSL' diff --git a/.ci/mysqlconnector-tests-steps.yml b/.ci/mysqlconnector-tests-steps.yml index 0ddc01fc9..b4d422ccc 100644 --- a/.ci/mysqlconnector-tests-steps.yml +++ b/.ci/mysqlconnector-tests-steps.yml @@ -7,7 +7,7 @@ steps: - task: DownloadPipelineArtifact@2 inputs: buildType: 'current' - artifactName: 'MySqlConnector.Tests-9.0-$(Agent.OS)' + artifactName: 'MySqlConnector.Tests-10.0-$(Agent.OS)' targetPath: $(System.DefaultWorkingDirectory) - task: DotNetCoreCLI@2 displayName: 'Run MySqlConnector.Tests' @@ -18,7 +18,7 @@ steps: - task: DownloadPipelineArtifact@2 inputs: buildType: 'current' - artifactName: 'MySqlConnector.DependencyInjection.Tests-9.0-$(Agent.OS)' + artifactName: 'MySqlConnector.DependencyInjection.Tests-10.0-$(Agent.OS)' targetPath: $(System.DefaultWorkingDirectory) - task: DotNetCoreCLI@2 displayName: 'Run MySqlConnector.DependencyInjection.Tests' @@ -30,4 +30,4 @@ steps: inputs: testResultsFormat: VSTest testResultsFiles: '**/*.trx' - testRunTitle: 'MySqlConnector.Tests-9.0-$(Agent.OS)' + testRunTitle: 'MySqlConnector.Tests-10.0-$(Agent.OS)' diff --git a/.ci/test.ps1 b/.ci/test.ps1 index 7d595e35e..40c3615f8 100644 --- a/.ci/test.ps1 +++ b/.ci/test.ps1 @@ -38,7 +38,7 @@ dotnet test -c Release -f net462 if ($LASTEXITCODE -ne 0){ exit $LASTEXITCODE; } -dotnet test -c Release -f net9.0 +dotnet test -c Release -f net10.0 if ($LASTEXITCODE -ne 0){ exit $LASTEXITCODE; } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 07726b0d0..5e686a37a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - tfm: [ 'net8.0', 'net9.0' ] + tfm: [ 'net8.0', 'net10.0' ] services: mysql: image: mysql:9.2 diff --git a/appveyor.yml b/appveyor.yml index ef905dcaa..e8dae43f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ install: - ps: Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "install-dotnet.ps1" - ps: .\install-dotnet.ps1 -Channel 6.0 -InstallDir "dotnetcli" - ps: .\install-dotnet.ps1 -Channel 8.0 -InstallDir "dotnetcli" - - ps: .\install-dotnet.ps1 -Channel 9.0 -InstallDir "dotnetcli" + - ps: .\install-dotnet.ps1 -Channel 10.0 -InstallDir "dotnetcli" build_script: - dotnet --info before_test: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fa4d3d285..dcfbb5370 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - DotNetCoreSdkVersion: '9.x' + DotNetCoreSdkVersion: '10.x' NUGET_PACKAGES: '$(Pipeline.Workspace)/.nuget/packages' jobs: @@ -107,18 +107,18 @@ jobs: displayName: 'Remove target frameworks' inputs: targetType: 'inline' - script: '((Get-Content .\tests\IntegrationTests\IntegrationTests.csproj -Raw) -replace(''.*'', ''net481;net9.0'')) | Set-Content .\tests\IntegrationTests\IntegrationTests.csproj' + script: '((Get-Content .\tests\IntegrationTests\IntegrationTests.csproj -Raw) -replace(''.*'', ''net481;net10.0'')) | Set-Content .\tests\IntegrationTests\IntegrationTests.csproj' - task: DotNetCoreCLI@2 displayName: 'Restore packages' inputs: command: 'restore' - task: DotNetCoreCLI@2 - displayName: 'Integration tests (net481/net9.0)' + displayName: 'Integration tests (net481/net10.0)' inputs: command: 'test' projects: 'tests/IntegrationTests/IntegrationTests.csproj' arguments: '-c Release --no-restore -p:TestTfmsInParallel=false' - testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net481/net9.0', 'No SSL') }} + testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net481/net10.0', 'No SSL') }} env: DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,Redirection,StreamingResults,Tls11,TlsFingerprintValidation,UnixDomainSocket' DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True;UseCompression=True' diff --git a/global.json b/global.json index cdbb589ed..1f410abcc 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100", + "version": "10.0.100-preview.1", "rollForward": "latestFeature" } } diff --git a/src/MySqlConnector.DependencyInjection/packages.lock.json b/src/MySqlConnector.DependencyInjection/packages.lock.json index 73ee05a17..765f6deab 100644 --- a/src/MySqlConnector.DependencyInjection/packages.lock.json +++ b/src/MySqlConnector.DependencyInjection/packages.lock.json @@ -148,9 +148,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.13, )", - "resolved": "8.0.13", - "contentHash": "R19ZTaRiQAK+xo9ZwaHbF/1vb1wwR1Wn5+sqp9v8+CDjbdS8R6qftKdw0VSXWKm7VAMi7P+NCU4zxDzhEWcAwQ==" + "requested": "[8.0.12, )", + "resolved": "8.0.12", + "contentHash": "FV4HnQ3JI15PHnJ5PGTbz+rYvrih42oLi/7UMIshNwCwUZhTq13UzrggtXk4ygrcMcN+4jsS6hhshx2p/Zd0ig==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/MySqlConnector/Logging/Log.cs b/src/MySqlConnector/Logging/Log.cs index e9b4f88bc..b5cbbed1b 100644 --- a/src/MySqlConnector/Logging/Log.cs +++ b/src/MySqlConnector/Logging/Log.cs @@ -166,10 +166,10 @@ internal static partial class Log #if NETCOREAPP3_0_OR_GREATER [LoggerMessage(EventIds.ConnectedTlsBasic, LogLevel.Debug, "Session {SessionId} connected TLS using {SslProtocol} and {NegotiatedCipherSuite}")] public static partial void ConnectedTlsBasic(ILogger logger, string sessionId, SslProtocols sslProtocol, TlsCipherSuite negotiatedCipherSuite); -#endif - +#else [LoggerMessage(EventIds.ConnectedTlsDetailed, LogLevel.Debug, "Session {SessionId} connected TLS using {SslProtocol}, {CipherAlgorithm}, {HashAlgorithm}, {KeyExchangeAlgorithm}, {KeyExchangeStrength}")] public static partial void ConnectedTlsDetailed(ILogger logger, string sessionId, SslProtocols sslProtocol, CipherAlgorithmType cipherAlgorithm, HashAlgorithmType hashAlgorithm, ExchangeAlgorithmType keyExchangeAlgorithm, int keyExchangeStrength); +#endif [LoggerMessage(EventIds.CouldNotInitializeTlsConnection, LogLevel.Error, "Session {SessionId} couldn't initialize TLS connection")] public static partial void CouldNotInitializeTlsConnection(ILogger logger, Exception exception, string sessionId); @@ -204,10 +204,10 @@ internal static partial class Log #if NETCOREAPP3_0_OR_GREATER [LoggerMessage(EventIds.ConnectedTlsBasicPreliminary, LogLevel.Debug, "Session {SessionId} provisionally connected TLS with error {SslPolicyErrors} using {SslProtocol} and {NegotiatedCipherSuite}")] public static partial void ConnectedTlsBasicPreliminary(ILogger logger, string sessionId, SslPolicyErrors sslPolicyErrors, SslProtocols sslProtocol, TlsCipherSuite negotiatedCipherSuite); -#endif - +#else [LoggerMessage(EventIds.ConnectedTlsDetailedPreliminary, LogLevel.Debug, "Session {SessionId} provisionally connected TLS with error {SslPolicyErrors} using {SslProtocol}, {CipherAlgorithm}, {HashAlgorithm}, {KeyExchangeAlgorithm}, {KeyExchangeStrength}")] public static partial void ConnectedTlsDetailedPreliminary(ILogger logger, string sessionId, SslPolicyErrors sslPolicyErrors, SslProtocols sslProtocol, CipherAlgorithmType cipherAlgorithm, HashAlgorithmType hashAlgorithm, ExchangeAlgorithmType keyExchangeAlgorithm, int keyExchangeStrength); +#endif [LoggerMessage(EventIds.CertificateErrorUnixSocket, LogLevel.Trace, "Session {SessionId} ignoring remote certificate error {SslPolicyErrors} due to Unix socket connection")] public static partial void CertificateErrorUnixSocket(ILogger logger, string sessionId, SslPolicyErrors sslPolicyErrors); diff --git a/src/MySqlConnector/MySqlConnector.csproj b/src/MySqlConnector/MySqlConnector.csproj index 023a6e28e..0baa1a010 100644 --- a/src/MySqlConnector/MySqlConnector.csproj +++ b/src/MySqlConnector/MySqlConnector.csproj @@ -1,7 +1,7 @@ - net462;net471;net48;netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0 + net462;net471;net48;netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0;net10.0 A truly async MySQL ADO.NET provider, supporting MySQL Server, MariaDB, Amazon Aurora, Azure Database for MySQL, Google Cloud SQL, and more. Copyright 2016–2024 Bradley Grainger Bradley Grainger diff --git a/src/MySqlConnector/packages.lock.json b/src/MySqlConnector/packages.lock.json index 3fc5d7c53..69ce45b7f 100644 --- a/src/MySqlConnector/packages.lock.json +++ b/src/MySqlConnector/packages.lock.json @@ -300,15 +300,6 @@ "System.Memory": "4.5.5" } }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.3, )", - "resolved": "1.0.3", - "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3" - } - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", @@ -366,11 +357,6 @@ "resolved": "8.0.0", "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "Microsoft.NETFramework.ReferenceAssemblies.net48": { - "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ==" - }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "8.0.0", @@ -561,9 +547,7 @@ "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", - "System.Buffers": "4.5.1", - "System.Diagnostics.DiagnosticSource": "8.0.1", - "System.Memory": "4.5.5" + "System.Diagnostics.DiagnosticSource": "8.0.1" } }, "Microsoft.SourceLink.GitHub": { @@ -597,7 +581,6 @@ "resolved": "8.0.1", "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==", "dependencies": { - "System.Memory": "4.5.5", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, @@ -616,30 +599,73 @@ "resolved": "1.2.0.556", "contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ==" }, - "System.Buffers": { + "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" + "resolved": "6.0.0", + "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "CentralTransitive", + "requested": "[8.0.2, )", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" + } + }, + "net10.0": { + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Direct", + "requested": "[8.0.2, )", + "resolved": "8.0.2", + "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", "dependencies": { - "System.Buffers": "4.5.1", - "System.Numerics.Vectors": "4.4.0", - "System.Runtime.CompilerServices.Unsafe": "4.5.3" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } }, - "System.Numerics.Vectors": { + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[10.0.0-preview.1.25080.5, )", + "resolved": "10.0.0-preview.1.25080.5", + "contentHash": "vQBoEgri9joy6o8c/MJl7kHdgLYPgm81AZtDIvs6wkd2E/x1p7EvwllOBVQ1ZVF5wRjjxtKu0tBwcjk8av2+1Q==" + }, + "Microsoft.SourceLink.GitHub": { + "type": "Direct", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==", + "dependencies": { + "Microsoft.Build.Tasks.Git": "8.0.0", + "Microsoft.SourceLink.Common": "8.0.0" + } + }, + "MinVer": { + "type": "Direct", + "requested": "[6.0.0, )", + "resolved": "6.0.0", + "contentHash": "+/SsmiySsXJlvQLCGBqaZKNVt3s/Y/HbAdwtop7Km2CnuZbaScoqkWJEBQ5Cy9ebkn6kCYKrHsXgwrFdTgcb3g==" + }, + "StyleCop.Analyzers": { + "type": "Direct", + "requested": "[1.2.0-beta.556, )", + "resolved": "1.2.0-beta.556", + "contentHash": "llRPgmA1fhC0I0QyFLEcjvtM2239QzKr/tcnbsjArLMJxJlu0AA5G7Fft0OI30pHF3MW63Gf4aSSsjc5m82J1Q==", + "dependencies": { + "StyleCop.Analyzers.Unstable": "1.2.0.556" + } + }, + "Microsoft.Build.Tasks.Git": { "type": "Transitive", - "resolved": "4.4.0", - "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ==" + "resolved": "8.0.0", + "contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ==" }, - "System.Runtime.CompilerServices.Unsafe": { + "Microsoft.SourceLink.Common": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "8.0.0", + "contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw==" + }, + "StyleCop.Analyzers.Unstable": { + "type": "Transitive", + "resolved": "1.2.0.556", + "contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ==" }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "CentralTransitive", @@ -688,10 +714,7 @@ "type": "Direct", "requested": "[8.0.1, )", "resolved": "8.0.1", - "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==" }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", @@ -708,11 +731,6 @@ "resolved": "1.2.0.556", "contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ==" }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "CentralTransitive", "requested": "[8.0.2, )", @@ -732,9 +750,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.13, )", - "resolved": "8.0.13", - "contentHash": "R19ZTaRiQAK+xo9ZwaHbF/1vb1wwR1Wn5+sqp9v8+CDjbdS8R6qftKdw0VSXWKm7VAMi7P+NCU4zxDzhEWcAwQ==" + "requested": "[8.0.12, )", + "resolved": "8.0.12", + "contentHash": "FV4HnQ3JI15PHnJ5PGTbz+rYvrih42oLi/7UMIshNwCwUZhTq13UzrggtXk4ygrcMcN+4jsS6hhshx2p/Zd0ig==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -795,9 +813,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[9.0.2, )", - "resolved": "9.0.2", - "contentHash": "+KFnCLVPicEq99ko0tq+ycTvNLXHw0tImmTZjPloB/DOFLPT56KLfk5aS7wbgXRPzYhXTTBYLGaABea5mke77w==" + "requested": "[9.0.1, )", + "resolved": "9.0.1", + "contentHash": "BKFAkdhUUJivAoKuSWcT23WH9E+AWQMJootzt9X+lnesOD2a2yNIe1ZQFtxB8H3ayskLBD5gYyIbj5GIfw7rZg==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/tests/Conformance.Tests/Conformance.Tests.csproj b/tests/Conformance.Tests/Conformance.Tests.csproj index e2a4ca928..289f2b5f1 100644 --- a/tests/Conformance.Tests/Conformance.Tests.csproj +++ b/tests/Conformance.Tests/Conformance.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 0.1.0 true true diff --git a/tests/Conformance.Tests/packages.lock.json b/tests/Conformance.Tests/packages.lock.json index 0bd8e590e..34c0ce579 100644 --- a/tests/Conformance.Tests/packages.lock.json +++ b/tests/Conformance.Tests/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "AdoNet.Specification.Tests": { "type": "Direct", "requested": "[2.0.0-beta.2, )", @@ -97,10 +97,7 @@ "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", "resolved": "17.12.0", - "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==", - "dependencies": { - "System.Reflection.Metadata": "1.6.0" - } + "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==" }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", @@ -121,11 +118,6 @@ "resolved": "1.2.0.556", "contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ==" }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "Validation": { "type": "Transitive", "resolved": "2.4.18", diff --git a/tests/IntegrationTests/IntegrationTests.csproj b/tests/IntegrationTests/IntegrationTests.csproj index bb388f662..7127ab248 100644 --- a/tests/IntegrationTests/IntegrationTests.csproj +++ b/tests/IntegrationTests/IntegrationTests.csproj @@ -1,12 +1,12 @@ - net462;net481;net6.0;net8.0;net9.0 + net462;net481;net6.0;net8.0;net10.0 false - net9.0 + net10.0 MYSQL_DATA $(NoWarn);MSB3246 @@ -41,7 +41,6 @@ - diff --git a/tests/IntegrationTests/packages.lock.json b/tests/IntegrationTests/packages.lock.json index ccd66edad..59173537f 100644 --- a/tests/IntegrationTests/packages.lock.json +++ b/tests/IntegrationTests/packages.lock.json @@ -83,22 +83,6 @@ "StyleCop.Analyzers.Unstable": "1.2.0.556" } }, - "System.Text.Json": { - "type": "Direct", - "requested": "[9.0.1, )", - "resolved": "9.0.1", - "contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "9.0.1", - "System.Buffers": "4.5.1", - "System.IO.Pipelines": "9.0.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "9.0.1", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, "xunit": { "type": "Direct", "requested": "[2.9.3, )", @@ -371,6 +355,22 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[9.0.1, )", + "resolved": "9.0.1", + "contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "9.0.1", + "System.Buffers": "4.5.1", + "System.IO.Pipelines": "9.0.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "9.0.1", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, "System.Threading.Tasks.Extensions": { "type": "CentralTransitive", "requested": "[4.5.4, )", @@ -463,22 +463,6 @@ "StyleCop.Analyzers.Unstable": "1.2.0.556" } }, - "System.Text.Json": { - "type": "Direct", - "requested": "[9.0.1, )", - "resolved": "9.0.1", - "contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "9.0.1", - "System.Buffers": "4.5.1", - "System.IO.Pipelines": "9.0.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "9.0.1", - "System.Threading.Tasks.Extensions": "4.5.4", - "System.ValueTuple": "4.5.0" - } - }, "xunit": { "type": "Direct", "requested": "[2.9.3, )", @@ -751,6 +735,22 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[9.0.1, )", + "resolved": "9.0.1", + "contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "9.0.1", + "System.Buffers": "4.5.1", + "System.IO.Pipelines": "9.0.1", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0", + "System.Text.Encodings.Web": "9.0.1", + "System.Threading.Tasks.Extensions": "4.5.4", + "System.ValueTuple": "4.5.0" + } + }, "System.Threading.Tasks.Extensions": { "type": "CentralTransitive", "requested": "[4.5.4, )", @@ -761,7 +761,7 @@ } } }, - "net6.0": { + "net10.0": { "Dapper.StrongName": { "type": "Direct", "requested": "[2.1.35, )", @@ -796,8 +796,7 @@ "Microsoft.Extensions.Configuration": "8.0.0", "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", "Microsoft.Extensions.Configuration.FileExtensions": "8.0.1", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "System.Text.Json": "8.0.5" + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0" } }, "Microsoft.NET.Test.Sdk": { @@ -835,21 +834,6 @@ "StyleCop.Analyzers.Unstable": "1.2.0.556" } }, - "System.Text.Json": { - "type": "Direct", - "requested": "[9.0.1, )", - "resolved": "9.0.1", - "contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==", - "dependencies": { - "Microsoft.Bcl.AsyncInterfaces": "9.0.1", - "System.Buffers": "4.5.1", - "System.IO.Pipelines": "9.0.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encodings.Web": "9.0.1", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, "xunit": { "type": "Direct", "requested": "[2.9.3, )", @@ -867,11 +851,6 @@ "resolved": "2.8.2", "contentHash": "vm1tbfXhFmjFMUmS4M0J0ASXz3/U5XvXBa6DOQUL3fEz4Vt6YPhv+ESCarx6M6D+9kJkJYZKCNvJMas1+nVfmQ==" }, - "Microsoft.Bcl.AsyncInterfaces": { - "type": "Transitive", - "resolved": "9.0.1", - "contentHash": "IVkmUqf+KzbuXKrxi2tyQlg11RArYk26t2eU5cHekff+7Ao09vH8vt8idC0BJSMnpiRV2OK66zM2EwJU6Tm5Cw==" - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -937,10 +916,7 @@ "Microsoft.Extensions.Primitives": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", @@ -950,10 +926,7 @@ "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", "resolved": "17.12.0", - "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==", - "dependencies": { - "System.Reflection.Metadata": "1.6.0" - } + "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==" }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", @@ -974,46 +947,6 @@ "resolved": "1.2.0.556", "contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ==" }, - "System.Buffers": { - "type": "Transitive", - "resolved": "4.5.1", - "contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg==" - }, - "System.IO.Pipelines": { - "type": "Transitive", - "resolved": "9.0.1", - "contentHash": "uXf5o8eV/gtzDQY4lGROLFMWQvcViKcF8o4Q6KpIOjloAQXrnscQSu6gTxYJMHuNJnh7szIF9AzkaEq+zDLoEg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Threading.Tasks.Extensions": "4.5.4" - } - }, - "System.Memory": { - "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" - }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, - "System.Runtime.CompilerServices.Unsafe": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "9.0.1", - "contentHash": "XkspqduP2t1e1x2vBUAD/xZ5ZDvmywuUwsmB93MvyQLospJfqtX0GsR/kU0vUL2h4kmvf777z3txV2W4NrQ9Qg==", - "dependencies": { - "System.Buffers": "4.5.1", - "System.Memory": "4.5.5", - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, "xunit.abstractions": { "type": "Transitive", "resolved": "2.0.3", @@ -1057,8 +990,7 @@ "mysqlconnector": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[8.0.2, )", - "System.Diagnostics.DiagnosticSource": "[8.0.1, )" + "Microsoft.Extensions.Logging.Abstractions": "[8.0.2, )" } }, "mysqlconnector.authentication.ed25519": { @@ -1079,27 +1011,11 @@ "resolved": "8.0.2", "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", - "System.Diagnostics.DiagnosticSource": "8.0.1" - } - }, - "System.Diagnostics.DiagnosticSource": { - "type": "CentralTransitive", - "requested": "[8.0.1, )", - "resolved": "8.0.1", - "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" } - }, - "System.Threading.Tasks.Extensions": { - "type": "CentralTransitive", - "requested": "[4.5.4, )", - "resolved": "4.5.4", - "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==" } }, - "net8.0": { + "net6.0": { "Dapper.StrongName": { "type": "Direct", "requested": "[2.1.35, )", @@ -1134,7 +1050,8 @@ "Microsoft.Extensions.Configuration": "8.0.0", "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", "Microsoft.Extensions.Configuration.FileExtensions": "8.0.1", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0" + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "System.Text.Json": "8.0.5" } }, "Microsoft.NET.Test.Sdk": { @@ -1172,16 +1089,6 @@ "StyleCop.Analyzers.Unstable": "1.2.0.556" } }, - "System.Text.Json": { - "type": "Direct", - "requested": "[9.0.1, )", - "resolved": "9.0.1", - "contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==", - "dependencies": { - "System.IO.Pipelines": "9.0.1", - "System.Text.Encodings.Web": "9.0.1" - } - }, "xunit": { "type": "Direct", "requested": "[2.9.3, )", @@ -1199,6 +1106,11 @@ "resolved": "2.8.2", "contentHash": "vm1tbfXhFmjFMUmS4M0J0ASXz3/U5XvXBa6DOQUL3fEz4Vt6YPhv+ESCarx6M6D+9kJkJYZKCNvJMas1+nVfmQ==" }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "9.0.1", + "contentHash": "IVkmUqf+KzbuXKrxi2tyQlg11RArYk26t2eU5cHekff+7Ao09vH8vt8idC0BJSMnpiRV2OK66zM2EwJU6Tm5Cw==" + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "8.0.0", @@ -1274,10 +1186,7 @@ "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", "resolved": "17.12.0", - "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==", - "dependencies": { - "System.Reflection.Metadata": "1.6.0" - } + "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==" }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", @@ -1303,11 +1212,6 @@ "resolved": "9.0.1", "contentHash": "uXf5o8eV/gtzDQY4lGROLFMWQvcViKcF8o4Q6KpIOjloAQXrnscQSu6gTxYJMHuNJnh7szIF9AzkaEq+zDLoEg==" }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "System.Text.Encodings.Web": { "type": "Transitive", "resolved": "9.0.1", @@ -1356,7 +1260,8 @@ "mysqlconnector": { "type": "Project", "dependencies": { - "Microsoft.Extensions.Logging.Abstractions": "[8.0.2, )" + "Microsoft.Extensions.Logging.Abstractions": "[8.0.2, )", + "System.Diagnostics.DiagnosticSource": "[8.0.1, )" } }, "mysqlconnector.authentication.ed25519": { @@ -1377,11 +1282,29 @@ "resolved": "8.0.2", "contentHash": "nroMDjS7hNBPtkZqVBbSiQaQjWRDxITI8Y7XnDs97rqG3EbzVTNLZQf7bIeUJcaHOV8bca47s1Uxq94+2oGdxA==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2", + "System.Diagnostics.DiagnosticSource": "8.0.1" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "CentralTransitive", + "requested": "[8.0.1, )", + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==" + }, + "System.Text.Json": { + "type": "CentralTransitive", + "requested": "[9.0.1, )", + "resolved": "9.0.1", + "contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "9.0.1", + "System.IO.Pipelines": "9.0.1", + "System.Text.Encodings.Web": "9.0.1" } } }, - "net9.0": { + "net8.0": { "Dapper.StrongName": { "type": "Direct", "requested": "[2.1.35, )", @@ -1454,12 +1377,6 @@ "StyleCop.Analyzers.Unstable": "1.2.0.556" } }, - "System.Text.Json": { - "type": "Direct", - "requested": "[9.0.1, )", - "resolved": "9.0.1", - "contentHash": "eqWHDZqYPv1PvuvoIIx5pF74plL3iEOZOl/0kQP+Y0TEbtgNnM2W6k8h8EPYs+LTJZsXuWa92n5W5sHTWvE3VA==" - }, "xunit": { "type": "Direct", "requested": "[2.9.3, )", @@ -1552,10 +1469,7 @@ "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", "resolved": "17.12.0", - "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==", - "dependencies": { - "System.Reflection.Metadata": "1.6.0" - } + "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==" }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", @@ -1576,11 +1490,6 @@ "resolved": "1.2.0.556", "contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ==" }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "xunit.abstractions": { "type": "Transitive", "resolved": "2.0.3", diff --git a/tests/MySqlConnector.DependencyInjection.Tests/MySqlConnector.DependencyInjection.Tests.csproj b/tests/MySqlConnector.DependencyInjection.Tests/MySqlConnector.DependencyInjection.Tests.csproj index ebeeef845..c14cde477 100644 --- a/tests/MySqlConnector.DependencyInjection.Tests/MySqlConnector.DependencyInjection.Tests.csproj +++ b/tests/MySqlConnector.DependencyInjection.Tests/MySqlConnector.DependencyInjection.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 true true ..\..\MySqlConnector.snk diff --git a/tests/MySqlConnector.DependencyInjection.Tests/packages.lock.json b/tests/MySqlConnector.DependencyInjection.Tests/packages.lock.json index 0d8fc35b6..89260d032 100644 --- a/tests/MySqlConnector.DependencyInjection.Tests/packages.lock.json +++ b/tests/MySqlConnector.DependencyInjection.Tests/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Microsoft.Extensions.DependencyInjection": { "type": "Direct", "requested": "[8.0.1, )", diff --git a/tests/MySqlConnector.NativeAot.Tests/MySqlConnector.NativeAot.Tests.csproj b/tests/MySqlConnector.NativeAot.Tests/MySqlConnector.NativeAot.Tests.csproj index 3797dedb8..f9d651b2b 100644 --- a/tests/MySqlConnector.NativeAot.Tests/MySqlConnector.NativeAot.Tests.csproj +++ b/tests/MySqlConnector.NativeAot.Tests/MySqlConnector.NativeAot.Tests.csproj @@ -2,7 +2,7 @@ Exe - net8.0;net9.0 + net8.0;net10.0 enable enable true diff --git a/tests/MySqlConnector.NativeAot.Tests/packages.lock.json b/tests/MySqlConnector.NativeAot.Tests/packages.lock.json index b75c400e8..db45bc473 100644 --- a/tests/MySqlConnector.NativeAot.Tests/packages.lock.json +++ b/tests/MySqlConnector.NativeAot.Tests/packages.lock.json @@ -1,18 +1,18 @@ { "version": 2, "dependencies": { - "net8.0": { + "net10.0": { "Microsoft.DotNet.ILCompiler": { "type": "Direct", - "requested": "[8.0.13, )", - "resolved": "8.0.13", - "contentHash": "CCIhseY9KUJDIYKt7qD1IRLQA6Hr/8Dky31KS6UrM2sFyaFUb2JLagT0Uy2BiSf1i1Qy3nPjRb0zc1JFogOi9w==" + "requested": "[10.0.0-preview.1.25080.5, )", + "resolved": "10.0.0-preview.1.25080.5", + "contentHash": "Yzl7RSJ+Vz7srQV2OCp9pZq/f8M6VUFpVNzRleeDqxmXVcNWLE6RDBu4rcRmIe4VCmNX6pxq8/nrR4sulUfPSw==" }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.13, )", - "resolved": "8.0.13", - "contentHash": "R19ZTaRiQAK+xo9ZwaHbF/1vb1wwR1Wn5+sqp9v8+CDjbdS8R6qftKdw0VSXWKm7VAMi7P+NCU4zxDzhEWcAwQ==" + "requested": "[10.0.0-preview.1.25080.5, )", + "resolved": "10.0.0-preview.1.25080.5", + "contentHash": "vQBoEgri9joy6o8c/MJl7kHdgLYPgm81AZtDIvs6wkd2E/x1p7EvwllOBVQ1ZVF5wRjjxtKu0tBwcjk8av2+1Q==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -83,18 +83,18 @@ } } }, - "net9.0": { + "net8.0": { "Microsoft.DotNet.ILCompiler": { "type": "Direct", - "requested": "[9.0.2, )", - "resolved": "9.0.2", - "contentHash": "eyIUUqqPy7brzmoV04zabOUm0puEAAjZd3O3vuzan9iTTh0oIPwts8fLxZFoEZCFi63ACFtHbNBs5Y7myB3ZDQ==" + "requested": "[8.0.12, )", + "resolved": "8.0.12", + "contentHash": "zhXnz2574mBc/ocGoG+qB0BgyoK9bH7f7Te1fNQJGbpwLLwZO5KKaTBmfM8N8THb3a2vQVFonbBzQ//d15TmQQ==" }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[9.0.2, )", - "resolved": "9.0.2", - "contentHash": "+KFnCLVPicEq99ko0tq+ycTvNLXHw0tImmTZjPloB/DOFLPT56KLfk5aS7wbgXRPzYhXTTBYLGaABea5mke77w==" + "requested": "[8.0.12, )", + "resolved": "8.0.12", + "contentHash": "FV4HnQ3JI15PHnJ5PGTbz+rYvrih42oLi/7UMIshNwCwUZhTq13UzrggtXk4ygrcMcN+4jsS6hhshx2p/Zd0ig==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj b/tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj index b375b14ae..770710f29 100644 --- a/tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj +++ b/tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj @@ -1,7 +1,7 @@ - net481;net9.0 + net481;net10.0 diff --git a/tests/MySqlConnector.Tests/packages.lock.json b/tests/MySqlConnector.Tests/packages.lock.json index 5cea0042c..63f84e59d 100644 --- a/tests/MySqlConnector.Tests/packages.lock.json +++ b/tests/MySqlConnector.Tests/packages.lock.json @@ -234,7 +234,7 @@ } } }, - "net9.0": { + "net10.0": { "Microsoft.NET.Test.Sdk": { "type": "Direct", "requested": "[17.12.0, )", @@ -305,10 +305,7 @@ "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", "resolved": "17.12.0", - "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==", - "dependencies": { - "System.Reflection.Metadata": "1.6.0" - } + "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==" }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", @@ -329,11 +326,6 @@ "resolved": "1.2.0.556", "contentHash": "zvn9Mqs/ox/83cpYPignI8hJEM2A93s2HkHs8HYMOAQW0PkampyoErAiIyKxgTLqbbad29HX/shv/6LGSjPJNQ==" }, - "System.Reflection.Metadata": { - "type": "Transitive", - "resolved": "1.6.0", - "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==" - }, "xunit.abstractions": { "type": "Transitive", "resolved": "2.0.3", diff --git a/tools/SchemaCollectionGenerator/SchemaCollectionGenerator.csproj b/tools/SchemaCollectionGenerator/SchemaCollectionGenerator.csproj index 85c1ed799..cfbfc836c 100644 --- a/tools/SchemaCollectionGenerator/SchemaCollectionGenerator.csproj +++ b/tools/SchemaCollectionGenerator/SchemaCollectionGenerator.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net10.0 enable enable true diff --git a/tools/SchemaCollectionGenerator/packages.lock.json b/tools/SchemaCollectionGenerator/packages.lock.json index c76e60b00..eef5da70b 100644 --- a/tools/SchemaCollectionGenerator/packages.lock.json +++ b/tools/SchemaCollectionGenerator/packages.lock.json @@ -1,7 +1,7 @@ { "version": 2, "dependencies": { - "net9.0": { + "net10.0": { "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[8.0.0, )", From 7164557cac00527f9abd350df0f4c87ad9850698 Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Tue, 18 Mar 2025 13:26:56 -0700 Subject: [PATCH 2/4] Build with .NET 10 Preview 2. --- .../packages.lock.json | 6 ++--- src/MySqlConnector/packages.lock.json | 18 +++++++------- .../packages.lock.json | 24 +++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/MySqlConnector.DependencyInjection/packages.lock.json b/src/MySqlConnector.DependencyInjection/packages.lock.json index 765f6deab..73ee05a17 100644 --- a/src/MySqlConnector.DependencyInjection/packages.lock.json +++ b/src/MySqlConnector.DependencyInjection/packages.lock.json @@ -148,9 +148,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.12, )", - "resolved": "8.0.12", - "contentHash": "FV4HnQ3JI15PHnJ5PGTbz+rYvrih42oLi/7UMIshNwCwUZhTq13UzrggtXk4ygrcMcN+4jsS6hhshx2p/Zd0ig==" + "requested": "[8.0.13, )", + "resolved": "8.0.13", + "contentHash": "R19ZTaRiQAK+xo9ZwaHbF/1vb1wwR1Wn5+sqp9v8+CDjbdS8R6qftKdw0VSXWKm7VAMi7P+NCU4zxDzhEWcAwQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/src/MySqlConnector/packages.lock.json b/src/MySqlConnector/packages.lock.json index 69ce45b7f..fba3cc108 100644 --- a/src/MySqlConnector/packages.lock.json +++ b/src/MySqlConnector/packages.lock.json @@ -623,9 +623,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[10.0.0-preview.1.25080.5, )", - "resolved": "10.0.0-preview.1.25080.5", - "contentHash": "vQBoEgri9joy6o8c/MJl7kHdgLYPgm81AZtDIvs6wkd2E/x1p7EvwllOBVQ1ZVF5wRjjxtKu0tBwcjk8av2+1Q==" + "requested": "[10.0.0-preview.2.25163.2, )", + "resolved": "10.0.0-preview.2.25163.2", + "contentHash": "Dy8UsVWQoxrxRNqyCxBKXKkW5AvsYaZgV4MGaAEMfM0/Fmut7Ok9uPSD7jPU05YezHyRzN/a24s2bOkhpuWWMA==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -750,9 +750,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.12, )", - "resolved": "8.0.12", - "contentHash": "FV4HnQ3JI15PHnJ5PGTbz+rYvrih42oLi/7UMIshNwCwUZhTq13UzrggtXk4ygrcMcN+4jsS6hhshx2p/Zd0ig==" + "requested": "[8.0.13, )", + "resolved": "8.0.13", + "contentHash": "R19ZTaRiQAK+xo9ZwaHbF/1vb1wwR1Wn5+sqp9v8+CDjbdS8R6qftKdw0VSXWKm7VAMi7P+NCU4zxDzhEWcAwQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -813,9 +813,9 @@ }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[9.0.1, )", - "resolved": "9.0.1", - "contentHash": "BKFAkdhUUJivAoKuSWcT23WH9E+AWQMJootzt9X+lnesOD2a2yNIe1ZQFtxB8H3ayskLBD5gYyIbj5GIfw7rZg==" + "requested": "[9.0.2, )", + "resolved": "9.0.2", + "contentHash": "+KFnCLVPicEq99ko0tq+ycTvNLXHw0tImmTZjPloB/DOFLPT56KLfk5aS7wbgXRPzYhXTTBYLGaABea5mke77w==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", diff --git a/tests/MySqlConnector.NativeAot.Tests/packages.lock.json b/tests/MySqlConnector.NativeAot.Tests/packages.lock.json index db45bc473..3c612c4f2 100644 --- a/tests/MySqlConnector.NativeAot.Tests/packages.lock.json +++ b/tests/MySqlConnector.NativeAot.Tests/packages.lock.json @@ -4,15 +4,15 @@ "net10.0": { "Microsoft.DotNet.ILCompiler": { "type": "Direct", - "requested": "[10.0.0-preview.1.25080.5, )", - "resolved": "10.0.0-preview.1.25080.5", - "contentHash": "Yzl7RSJ+Vz7srQV2OCp9pZq/f8M6VUFpVNzRleeDqxmXVcNWLE6RDBu4rcRmIe4VCmNX6pxq8/nrR4sulUfPSw==" + "requested": "[10.0.0-preview.2.25163.2, )", + "resolved": "10.0.0-preview.2.25163.2", + "contentHash": "+JRHbVrldTFQD60jdeo2GaYzKYf1or9b+HYFK7Uo6rvhWpgqoaaA68+Bi7/cUr67jmIMDj9P5IW4+BNeLxoopA==" }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[10.0.0-preview.1.25080.5, )", - "resolved": "10.0.0-preview.1.25080.5", - "contentHash": "vQBoEgri9joy6o8c/MJl7kHdgLYPgm81AZtDIvs6wkd2E/x1p7EvwllOBVQ1ZVF5wRjjxtKu0tBwcjk8av2+1Q==" + "requested": "[10.0.0-preview.2.25163.2, )", + "resolved": "10.0.0-preview.2.25163.2", + "contentHash": "Dy8UsVWQoxrxRNqyCxBKXKkW5AvsYaZgV4MGaAEMfM0/Fmut7Ok9uPSD7jPU05YezHyRzN/a24s2bOkhpuWWMA==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", @@ -86,15 +86,15 @@ "net8.0": { "Microsoft.DotNet.ILCompiler": { "type": "Direct", - "requested": "[8.0.12, )", - "resolved": "8.0.12", - "contentHash": "zhXnz2574mBc/ocGoG+qB0BgyoK9bH7f7Te1fNQJGbpwLLwZO5KKaTBmfM8N8THb3a2vQVFonbBzQ//d15TmQQ==" + "requested": "[8.0.13, )", + "resolved": "8.0.13", + "contentHash": "CCIhseY9KUJDIYKt7qD1IRLQA6Hr/8Dky31KS6UrM2sFyaFUb2JLagT0Uy2BiSf1i1Qy3nPjRb0zc1JFogOi9w==" }, "Microsoft.NET.ILLink.Tasks": { "type": "Direct", - "requested": "[8.0.12, )", - "resolved": "8.0.12", - "contentHash": "FV4HnQ3JI15PHnJ5PGTbz+rYvrih42oLi/7UMIshNwCwUZhTq13UzrggtXk4ygrcMcN+4jsS6hhshx2p/Zd0ig==" + "requested": "[8.0.13, )", + "resolved": "8.0.13", + "contentHash": "R19ZTaRiQAK+xo9ZwaHbF/1vb1wwR1Wn5+sqp9v8+CDjbdS8R6qftKdw0VSXWKm7VAMi7P+NCU4zxDzhEWcAwQ==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct", From ab02ad27af5f5d5d7f4cbe2209562cd4832fcfc3 Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Sat, 19 Apr 2025 11:24:53 -0700 Subject: [PATCH 3/4] Update SDK to .NET 10 Preview 3. --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index fda0cd1ea..8b236e749 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.2", + "version": "10.0.100-preview.3", "rollForward": "latestFeature" } } From 3b415b4e2d37f13a86cace30fb4dd9f2f573c0f4 Mon Sep 17 00:00:00 2001 From: Bradley Grainger Date: Sat, 17 May 2025 12:35:00 -0700 Subject: [PATCH 4/4] Update SDK to .NET 10 Preview 4. --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 8b236e749..eb5dc781d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-preview.3", + "version": "10.0.100-preview.4", "rollForward": "latestFeature" } }