Skip to content

Commit 732bca5

Browse files
okramarenkookramarenko
authored
Add .NET 10 support (#15)
1 parent 81fb477 commit 732bca5

238 files changed

Lines changed: 2758 additions & 1311 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/SideBySide/config-ssl.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Data": {
33
"ConnectionString": "server=SINGLESTORE_HOST;user id=SQL_USER_NAME;password=SQL_USER_PASSWORD;port=3306;database=singlestoretest;sslmode=Required;certificate file=../../../../.ci/server/certs/ssl-client.pfx;",
4-
"UnsupportedFeatures": "CachingSha2Password,Ed25519,QueryAttributes,Tls11,Tls13,UuidToBin,UnixDomainSocket,Sha256Password,GlobalLog,Redirection,CancelSleepSuccessfully,TlsFingerprintValidation",
4+
"UnsupportedFeatures": "CachingSha2Password,Ed25519,QueryAttributes,Tls11,Tls13,UuidToBin,UnixDomainSocket,Sha256Password,GlobalLog,Redirection,CancelSleepSuccessfully,TlsFingerprintValidation,ParsecAuthentication",
55
"CertificatesPath": "../../../../.ci/server/certs"
66
}
77
}

‎.github/workflows/SideBySide/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Data": {
3-
"ConnectionString": "server=SINGLESTORE_HOST;user id=SQL_USER_NAME;password=SQL_USER_PASSWORD;port=3306;database=singlestoretest;sslmode=None",
4-
"UnsupportedFeatures": "CachingSha2Password,Ed25519,QueryAttributes,Tls11,Tls13,UuidToBin,UnixDomainSocket,Sha256Password,GlobalLog,Redirection,CancelSleepSuccessfully,TlsFingerprintValidation",
3+
"ConnectionString": "server=SINGLESTORE_HOST;user id=SQL_USER_NAME;password=SQL_USER_PASSWORD;port=3306;database=singlestoretest;sslmode=disabled;",
4+
"UnsupportedFeatures": "CachingSha2Password,Ed25519,QueryAttributes,Tls11,Tls13,UuidToBin,UnixDomainSocket,Sha256Password,GlobalLog,Redirection,CancelSleepSuccessfully,TlsFingerprintValidation,ParsecAuthentication",
55
"ManagedService": true
66
}
77
}

‎.github/workflows/config.yml‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
name: SingleStore .NET Connector
22

3-
on: [push]
3+
on:
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
push:
7+
branches: [master]
8+
tags:
9+
- 'v*'
10+
workflow_call:
11+
workflow_dispatch:
412

513
env:
6-
DOTNET_VERSION: 9.0.303
7-
TARGET_FRAMEWORK: net9.0
8-
CONNECTOR_VERSION: 1.3.0
14+
DOTNET_VERSION: 10.0.x
15+
TARGET_FRAMEWORK: net10.0
16+
CONNECTOR_VERSION: 1.4.0
917
LICENSE_KEY: ${{ secrets.LICENSE_KEY }}
1018
SQL_USER_PASSWORD: ${{ secrets.SQL_USER_PASSWORD }}
1119
S2MS_API_KEY: ${{ secrets.S2MS_API_KEY }}
@@ -51,13 +59,13 @@ jobs:
5159
5260
test-ubuntu:
5361
name: ${{ matrix.name }}
54-
runs-on: ubuntu-22.04
5562
needs: build-matrix
63+
runs-on: ubuntu-24.04
5664
strategy:
5765
fail-fast: false
5866
matrix: ${{ fromJson(needs.build-matrix.outputs.matrix) }}
5967
steps:
60-
- uses: actions/checkout@v4
68+
- uses: actions/checkout@v5
6169

6270
- name: Remove unnecessary pre-installed toolchains for free disk spaces
6371
run: |
@@ -77,18 +85,16 @@ jobs:
7785
df -h
7886
7987
- name: Set up .NET
80-
uses: actions/setup-dotnet@v4
88+
uses: actions/setup-dotnet@v5
8189
with:
8290
dotnet-version: ${{ env.DOTNET_VERSION }}
8391

8492
- name: Install dependencies
8593
run: |
8694
sudo apt-get update
87-
sudo apt-get install -y apt-transport-https
88-
sudo apt-get install -y mariadb-client-core-10.6
89-
sudo apt-get install -y mariadb-client-10.6
95+
sudo apt-get install -y mariadb-client-core
96+
sudo apt-get install -y mariadb-client
9097
sudo apt-get update
91-
sudo apt-get install -y dotnet-sdk-9.0
9298
dotnet --info
9399
94100
- name: Start SingleStore Cluster
@@ -138,18 +144,19 @@ jobs:
138144
dotnet test -f ${{ env.TARGET_FRAMEWORK }} -c Release --no-build
139145
cd ../../
140146
147+
141148
test-windows:
142149
runs-on: windows-latest
143150
strategy:
144151
fail-fast: false
145152
steps:
146-
- uses: actions/checkout@v4
153+
- uses: actions/checkout@v5
147154

148155
- name: Install Python dependencies
149156
run: pip install singlestoredb
150157

151158
- name: Install .NET
152-
uses: actions/setup-dotnet@v4
159+
uses: actions/setup-dotnet@v5
153160
with:
154161
dotnet-version: ${{ env.DOTNET_VERSION }}
155162

@@ -161,7 +168,7 @@ jobs:
161168

162169
- name: Fill test config
163170
run: python .github\workflows\fill_test_config.py
164-
171+
165172
- name: Export full connection string
166173
shell: bash
167174
run: echo "CONNECTION_STRING=$(< $HOME/CONNECTION_STRING)" >> $GITHUB_ENV
@@ -189,10 +196,10 @@ jobs:
189196
if: startsWith(github.ref, 'refs/tags/')
190197
runs-on: windows-latest
191198
steps:
192-
- uses: actions/checkout@v4
199+
- uses: actions/checkout@v5
193200

194201
- name: Install .NET
195-
uses: actions/setup-dotnet@v4
202+
uses: actions/setup-dotnet@v5
196203
with:
197204
dotnet-version: ${{ env.DOTNET_VERSION }}
198205

@@ -206,7 +213,7 @@ jobs:
206213
run: dotnet pack -c Release --output net_connector -p:PackageVersion=${{ env.CONNECTOR_VERSION }}
207214

208215
- name: Upload artifact
209-
uses: actions/upload-artifact@v4
216+
uses: actions/upload-artifact@v5
210217
with:
211218
name: net_connector
212219
path: net_connector/

‎.github/workflows/fill_test_config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import os
33
from s2ms_cluster import WORKSPACE_ENDPOINT_FILE
44

5-
NET_FRAMEWORKS = ["net462", "net472", "net6.0", "net7.0", "net8.0", "net9.0"]
5+
NET_FRAMEWORKS = ["net462", "net472", "net6.0", "net7.0", "net8.0", "net10.0"]
66

77

88
if __name__ == "__main__":

‎Directory.Build.props‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
<PropertyGroup>
44
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5-
<LangVersion>preview</LangVersion>
5+
<LangVersion>14.0</LangVersion>
66
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
7-
<NoWarn>$(NoWarn);1591;CA1708;CA1835;CA2215;CA5397;NU5105;SYSLIB0039</NoWarn>
7+
8+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9+
<NoWarn>$(NoWarn);1573;1591;1712;CA1708;CA1835;CA2215;CA5397;NU5105;SYSLIB0039</NoWarn>
10+
811
<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
912
<NuGetAudit>true</NuGetAudit>
1013
<NuGetAuditLevel>low</NuGetAuditLevel>
1114
<NuGetAuditMode>all</NuGetAuditMode>
12-
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
1315
</PropertyGroup>
1416

1517
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

‎Directory.Packages.props‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,29 @@
88
<PackageVersion Include="AdoNet.Specification.Tests" Version="2.0.0-beta.2" />
99
<PackageVersion Include="Dapper.StrongName" Version="2.1.35" />
1010
<PackageVersion Include="IndexRange" Version="1.0.3" />
11-
<PackageVersion Include="log4net" Version="2.0.17" />
11+
<PackageVersion Include="log4net" Version="3.3.1" />
12+
<PackageVersion Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="8.0.16" />
1213
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
1314
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
1415
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
1516
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
1617
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
1718
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
18-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
19-
<PackageVersion Include="MySql.Data" Version="9.1.0" />
19+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
20+
<PackageVersion Include="MySql.Data" Version="9.5.0" />
2021
<PackageVersion Include="NLog" Version="4.7.15" />
2122
<PackageVersion Include="Serilog" Version="2.12.0" />
22-
<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
2323
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
24-
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
24+
<PackageVersion Include="System.Text.Json" Version="9.0.1" />
2525
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
26-
<PackageVersion Include="xunit" Version="2.9.2" />
26+
<PackageVersion Include="xunit" Version="2.9.3" />
2727
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
28-
<PackageVersion Include="YamlDotNet" Version="16.1.3" />
28+
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
2929
</ItemGroup>
3030

3131
<ItemGroup>
3232
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
33+
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
3334
</ItemGroup>
3435

3536
</Project>

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
MIT License
22

33
Copyright (c) 2016-2021 Bradley Grainger
4-
Copyright (c) 2022-2025 SingleStore, Inc.
4+
Copyright (c) 2022-2026 SingleStore, Inc.
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SingleStore Connector for .NET and .NET Core 1.3.0
1+
# SingleStore Connector for .NET and .NET Core 1.4.0
22

33
This is an [ADO.NET](https://docs.microsoft.com/en-us/dotnet/framework/data/adonet/) data
44
provider for [SingleStore](https://www.singlestore.com/). It provides implementations of

‎SingleStoreConnector.slnx‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Solution>
2+
<Folder Name="/tools/">
3+
<Project Path="tools/SchemaCollectionGenerator/SchemaCollectionGenerator.csproj" />
4+
</Folder>
5+
<Project Path="src/SingleStoreConnector.Authentication.Ed25519/SingleStoreConnector.Authentication.Ed25519.csproj" />
6+
<Project Path="src/SingleStoreConnector.DependencyInjection/SingleStoreConnector.DependencyInjection.csproj" />
7+
<Project Path="src/SingleStoreConnector.Logging.log4net/SingleStoreConnector.Logging.log4net.csproj" />
8+
<Project Path="src/SingleStoreConnector.Logging.Microsoft.Extensions.Logging/SingleStoreConnector.Logging.Microsoft.Extensions.Logging.csproj" />
9+
<Project Path="src/SingleStoreConnector.Logging.NLog/SingleStoreConnector.Logging.NLog.csproj" />
10+
<Project Path="src/SingleStoreConnector.Logging.Serilog/SingleStoreConnector.Logging.Serilog.csproj" />
11+
<Project Path="src/SingleStoreConnector/SingleStoreConnector.csproj" />
12+
<Project Path="tests/Conformance.Tests/Conformance.Tests.csproj" />
13+
<Project Path="tests/SideBySide/SideBySide.csproj" />
14+
<Project Path="tests/SingleStoreConnector.DependencyInjection.Tests/SingleStoreConnector.DependencyInjection.Tests.csproj" />
15+
<Project Path="tests/SingleStoreConnector.NativeAot.Tests/SingleStoreConnector.NativeAot.Tests.csproj" />
16+
<Project Path="tests/SingleStoreConnector.Tests/SingleStoreConnector.Tests.csproj" />
17+
</Solution>

‎SingleStoreNETConnector.sln‎

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)