Skip to content

Commit df34b64

Browse files
MaceWinduMaceWindu
authored
Merge pull request #104 from linq2db/infra/updates
Update dependencies
2 parents 0f9e695 + 5400e4a commit df34b64

Some content is hidden

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

55 files changed

+236
-254
lines changed

‎.editorconfig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,13 @@ dotnet_diagnostic.CA3076.severity = none # CA3076: Insecure XSLT Script Executio
137137
dotnet_diagnostic.CA1000.severity = none # CA1000: Do not declare static members on generic types
138138
dotnet_diagnostic.CA1001.severity = none # CA1001: Types that own disposable fields should be disposable
139139
dotnet_diagnostic.CA1010.severity = none # CA1010: Collections should implement generic interface
140-
dotnet_diagnostic.CA1050.severity = none # CA1050: Declare types in namespaces
140+
dotnet_diagnostic.CA1031.severity = none # CA1031: Catch more specific exception
141+
dotnet_diagnostic.CA1032.severity = none # CA1032: Add constructors to exception
141142
dotnet_diagnostic.CA1036.severity = none # CA1036: Override methods on comparable types
143+
dotnet_diagnostic.CA1050.severity = none # CA1050: Declare types in namespaces
142144
dotnet_diagnostic.CA1051.severity = none # CA1051: Do not declare visible instance fields
145+
dotnet_diagnostic.CA1062.severity = none # CA1062: Vaidate aruments of public API
146+
dotnet_diagnostic.CA1064.severity = none # CA1064: Exception should be public
143147
dotnet_diagnostic.CA1067.severity = none # CA1067: Override Equals when implementing IEquatable
144148
dotnet_diagnostic.CA1068.severity = none # CA1068: CancellationToken parameters must come last
145149
dotnet_diagnostic.CA1069.severity = none # CA1069: Enums should not have duplicate values
@@ -156,6 +160,7 @@ dotnet_diagnostic.CA1720.severity = none # CA1720: Identifiers should not contai
156160
dotnet_diagnostic.CA1806.severity = none # CA1806: Do not ignore method results
157161
dotnet_diagnostic.CA1822.severity = none # CA1822: Mark members as static
158162
dotnet_diagnostic.CA2211.severity = none # CA2211: Non-constant fields should not be visible
163+
dotnet_diagnostic.CA2237.severity = none # CA2237: add [Serializable] (no way)
159164

160165
###################################################################################
161166
# VS analyzers #

‎Build/BuildNuspecs.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if ($version) {
3737
$xml.package.metadata.AppendChild($child)
3838

3939
$child = $xml.CreateElement('copyright', $nsUri)
40-
$child.InnerText = 'Copyright © 2016-2023 ' + $authors
40+
$child.InnerText = 'Copyright © 2016-2024 ' + $authors
4141
$xml.package.metadata.AppendChild($child)
4242

4343
$child = $xml.CreateElement('authors', $nsUri)
@@ -72,7 +72,7 @@ if ($version) {
7272

7373
$child = $xml.CreateElement('file', $nsUri)
7474
$attr = $xml.CreateAttribute('src')
75-
$attr.Value = 'icon64.png'
75+
$attr.Value = 'icon.png'
7676
$child.Attributes.Append($attr)
7777
$attr = $xml.CreateAttribute('target')
7878
$attr.Value = 'images\icon.png'

‎Build/azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
variables:
22
solution: 'linq2db.LINQPad.sln'
33
build_configuration: 'Release'
4-
assemblyVersion: 5.1.0.0
5-
nugetVersion: 5.1.0
6-
nugetDevVersion: 5.1.1
7-
nugetPRVersion: 5.1.1
4+
assemblyVersion: 5.2.0.0
5+
nugetVersion: 5.2.0
6+
nugetDevVersion: 5.2.1
7+
nugetPRVersion: 5.2.1
88
artifact_lpx: 'lpx'
99
artifact_lpx6: 'lpx6'
1010
artifact_nuget: 'nuget'

‎Build/icon.png

22.1 KB
Loading

‎Build/icon64.png

-3.44 KB
Binary file not shown.

‎Directory.Packages.props

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
11
<Project>
22
<ItemGroup>
3-
<PackageVersion Include="linq2db" Version="5.2.2" />
4-
<PackageVersion Include="linq2db.Tools" Version="5.2.2" />
3+
<PackageVersion Include="linq2db" Version="5.4.0" />
4+
<PackageVersion Include="linq2db.Tools" Version="5.4.0" />
55

66
<PackageVersion Include="LINQPad.Reference" Version="1.3.0" />
77

8-
<PackageVersion Include="PolySharp" Version="1.13.2" />
8+
<PackageVersion Include="PolySharp" Version="1.14.1" />
99

10-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
10+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
1111
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
1212
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
1313
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
1414
<PackageVersion Include="System.Memory" Version="4.5.5" />
1515
<PackageVersion Include="System.Buffers" Version="4.5.1" />
16-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
17-
<PackageVersion Include="System.Text.Json" Version="7.0.2" />
16+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
17+
<PackageVersion Include="System.Text.Json" Version="8.0.2" />
18+
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
1819

19-
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.117" />
20-
<PackageVersion Include="System.Data.Odbc" Version="7.0.0" />
21-
<PackageVersion Include="System.Data.OleDb" Version="7.0.0" />
22-
<PackageVersion Include="MySqlConnector" Version="2.2.6" />
20+
<PackageVersion Include="System.Data.SQLite.Core" Version="1.0.118" />
21+
<PackageVersion Include="System.Data.Odbc" Version="8.0.0" />
22+
<PackageVersion Include="System.Data.OleDb" Version="8.0.0" />
23+
<PackageVersion Include="MySqlConnector" Version="2.3.5" />
2324
<PackageVersion Include="AdoNetCore.AseClient" Version="0.19.2" />
24-
<PackageVersion Include="IBM.Data.DB.Provider" Version="11.5.5010.4" GeneratePathProperty="true" />
25-
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.1" />
26-
<PackageVersion Include="Oracle.ManagedDataAccess" Version="21.10.0" />
27-
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.100" />
28-
<PackageVersion Include="Net.IBM.Data.Db2" Version="7.0.0.200" />
29-
<PackageVersion Include="ClickHouse.Client" Version="6.6.0" />
30-
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="9.1.1" />
31-
<PackageVersion Include="Npgsql" Version="7.0.4" />
25+
<PackageVersion Include="IBM.Data.DB.Provider" Version="11.5.9000.4" GeneratePathProperty="true" />
26+
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.0" />
27+
<PackageVersion Include="Oracle.ManagedDataAccess" Version="21.13.0" />
28+
<PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.130" />
29+
<PackageVersion Include="Net.IBM.Data.Db2" Version="7.0.0.400" />
30+
<PackageVersion Include="ClickHouse.Client" Version="7.1.1" />
31+
<PackageVersion Include="FirebirdSql.Data.FirebirdClient" Version="10.0.0" />
32+
<PackageVersion Include="Npgsql" Version="8.0.2" />
3233
<PackageVersion Include="Octonica.ClickHouseClient" Version="2.2.9" />
3334
<!--<PackageVersion Include="linq2db4iSeries" Version="5.1.0" />-->
3435

‎MIT-LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-2023 Linq To DB Team
1+
Copyright (c) 2016-2024 Linq To DB Team
22

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

‎Source/Compat/ReadOnlyHashSet.cs

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,27 @@
11
#if !NET5_0_OR_GREATER
22
namespace System.Collections.Generic;
33

4-
internal sealed class ReadOnlyHashSet<T> : IReadOnlySet<T>
4+
internal sealed class ReadOnlyHashSet<T>(ISet<T> set) : IReadOnlySet<T>
55
{
6-
private readonly ISet<T> _set;
6+
int IReadOnlyCollection<T>.Count => set.Count;
77

8-
public ReadOnlyHashSet(ISet<T> set)
9-
{
10-
_set = set;
11-
}
8+
bool IReadOnlySet<T>.Contains(T item) => set.Contains(item);
129

13-
int IReadOnlyCollection<T>.Count => _set.Count;
10+
IEnumerator<T> IEnumerable<T>.GetEnumerator() => set.GetEnumerator();
1411

15-
bool IReadOnlySet<T>.Contains(T item) => _set.Contains(item);
12+
IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)set).GetEnumerator();
1613

17-
IEnumerator<T> IEnumerable<T>.GetEnumerator() => _set.GetEnumerator();
14+
bool IReadOnlySet<T>.IsProperSubsetOf(IEnumerable<T> other) => set.IsProperSubsetOf(other);
1815

19-
IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable)_set).GetEnumerator();
16+
bool IReadOnlySet<T>.IsProperSupersetOf(IEnumerable<T> other) => set.IsProperSupersetOf(other);
2017

21-
bool IReadOnlySet<T>.IsProperSubsetOf(IEnumerable<T> other) => _set.IsProperSubsetOf(other);
18+
bool IReadOnlySet<T>.IsSubsetOf(IEnumerable<T> other) => set.IsSubsetOf(other);
2219

23-
bool IReadOnlySet<T>.IsProperSupersetOf(IEnumerable<T> other) => _set.IsProperSupersetOf(other);
20+
bool IReadOnlySet<T>.IsSupersetOf(IEnumerable<T> other) => set.IsSupersetOf(other);
2421

25-
bool IReadOnlySet<T>.IsSubsetOf(IEnumerable<T> other) => _set.IsSubsetOf(other);
22+
bool IReadOnlySet<T>.Overlaps(IEnumerable<T> other) => set.Overlaps(other);
2623

27-
bool IReadOnlySet<T>.IsSupersetOf(IEnumerable<T> other) => _set.IsSupersetOf(other);
28-
29-
bool IReadOnlySet<T>.Overlaps(IEnumerable<T> other) => _set.Overlaps(other);
30-
31-
bool IReadOnlySet<T>.SetEquals(IEnumerable<T> other) => _set.SetEquals(other);
24+
bool IReadOnlySet<T>.SetEquals(IEnumerable<T> other) => set.SetEquals(other);
3225

3326

3427
}

‎Source/Compat/ReadOnlySetExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
internal static class ReadOnlySetExtensions
44
{
5+
#pragma warning disable CA1859 // change return type
56
public static IReadOnlySet<T> AsReadOnly<T>(this HashSet<T> set)
7+
#pragma warning restore CA1859 // change return type
68
{
79
#if NET5_0_OR_GREATER
810
return set;

‎Source/Configuration/AppConfig.cs

Lines changed: 16 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ namespace LinqToDB.LINQPad;
99
/// Implements Linq To DB connection settings provider, which use data from JSON config.
1010
/// Used as settings source for static data context.
1111
/// </summary>
12-
internal sealed class AppConfig : ILinqToDBSettings
12+
internal sealed class AppConfig(IConnectionStringSettings[] connectionStrings) : ILinqToDBSettings
1313
{
14+
#pragma warning disable CA1859 // change return type
1415
public static ILinqToDBSettings LoadJson(string configPath)
16+
#pragma warning restore CA1859 // change return type
1517
{
1618
var config = JsonSerializer.Deserialize<JsonConfig>(File.ReadAllText(configPath));
1719

1820
if (config?.ConnectionStrings?.Count is null or 0)
19-
return new AppConfig(Array.Empty<IConnectionStringSettings>());
21+
return new AppConfig([]);
2022

2123
var connections = new Dictionary<string, ConnectionStringSettings>(StringComparer.InvariantCultureIgnoreCase);
2224
foreach (var cn in config.ConnectionStrings)
@@ -40,15 +42,18 @@ public static ILinqToDBSettings LoadJson(string configPath)
4042
return new AppConfig(connections.Values.ToArray());
4143
}
4244

45+
#pragma warning disable CA1859 // change return type
4346
public static ILinqToDBSettings LoadAppConfig(string configPath)
47+
#pragma warning restore CA1859 // change return type
4448
{
4549
var xml = new XmlDocument() { XmlResolver = null };
46-
xml.Load(XmlReader.Create(new StringReader(File.ReadAllText(configPath)), new XmlReaderSettings() { XmlResolver = null }));
50+
using var reader = XmlReader.Create(new StringReader(File.ReadAllText(configPath)), new XmlReaderSettings() { XmlResolver = null });
51+
xml.Load(reader);
4752

4853
var connections = xml.SelectNodes("/configuration/connectionStrings/add");
4954

5055
if (connections?.Count is null or 0)
51-
return new AppConfig(Array.Empty<IConnectionStringSettings>());
56+
return new AppConfig([]);
5257

5358
var settings = new List<ConnectionStringSettings>();
5459

@@ -65,36 +70,22 @@ public static ILinqToDBSettings LoadAppConfig(string configPath)
6570
return new AppConfig(settings.ToArray());
6671
}
6772

68-
private readonly IConnectionStringSettings[] _connectionStrings;
69-
70-
public AppConfig(IConnectionStringSettings[] connectionStrings)
71-
{
72-
_connectionStrings = connectionStrings;
73-
}
74-
75-
IEnumerable<IDataProviderSettings> ILinqToDBSettings.DataProviders => Array.Empty<IDataProviderSettings>();
73+
IEnumerable<IDataProviderSettings> ILinqToDBSettings.DataProviders => [];
7674
string? ILinqToDBSettings.DefaultConfiguration => null;
7775
string? ILinqToDBSettings.DefaultDataProvider => null;
78-
IEnumerable<IConnectionStringSettings> ILinqToDBSettings.ConnectionStrings => _connectionStrings;
76+
IEnumerable<IConnectionStringSettings> ILinqToDBSettings.ConnectionStrings => connectionStrings;
7977

78+
#pragma warning disable CA1812 // Remove unused type
8079
private sealed class JsonConfig
80+
#pragma warning restore CA1812 // Remove unused type
8181
{
8282
public IDictionary<string, string>? ConnectionStrings { get; set; }
8383
}
8484

85-
private sealed class ConnectionStringSettings : IConnectionStringSettings
85+
private sealed class ConnectionStringSettings(string name, string connectionString) : IConnectionStringSettings
8686
{
87-
private readonly string _name;
88-
private readonly string _connectionString;
89-
90-
public ConnectionStringSettings(string name, string connectionString)
91-
{
92-
_name = name;
93-
_connectionString = connectionString;
94-
}
95-
96-
string IConnectionStringSettings.ConnectionString => _connectionString;
97-
string IConnectionStringSettings.Name => _name;
87+
string IConnectionStringSettings.ConnectionString => connectionString;
88+
string IConnectionStringSettings.Name => name;
9889
bool IConnectionStringSettings.IsGlobal => false;
9990

10091
public string? ProviderName { get; set; }

0 commit comments

Comments
 (0)