Skip to content

Commit b0e06f1

Browse files
mareekmareek
committed
Spring cleaning : updated nuget packages, removed warnings, implemented VS suggestions
1 parent 8a2f902 commit b0e06f1

7 files changed

Lines changed: 39 additions & 41 deletions

File tree

‎Src/UUIDNext.Benchmarks/UUIDNext.Benchmarks.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net8.0;net9.0;net472</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<LangVersion>10</LangVersion>

‎Src/UUIDNext.Test/DatabaseSupport/SqlServerUuidTest.cs‎

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,45 +24,43 @@ public class SqlServerUuidTest
2424
[Fact]
2525
public void TestSQLServerOnLocalDb()
2626
{
27-
using (var connection = new SqlConnection("Server=(localdb)\\MSSQLLocalDB;Integrated Security=true;"))
27+
using var connection = new SqlConnection("Server=(localdb)\\MSSQLLocalDB;Integrated Security=true;");
28+
try
2829
{
29-
try
30-
{
31-
connection.Open();
32-
}
33-
catch
34-
{
35-
// localdb is not available on this computer
36-
return;
37-
}
30+
connection.Open();
31+
}
32+
catch
33+
{
34+
// localdb is not available on this computer
35+
return;
36+
}
3837

39-
try
40-
{
41-
ExecuteNonQuery(connection, $"CREATE DATABASE {databaseName};");
38+
try
39+
{
40+
ExecuteNonQuery(connection, $"CREATE DATABASE {databaseName};");
4241

43-
ExecuteNonQuery(connection, DatabaseTestHelper.GenerateTableCreationQuery(tableName, "int", "uniqueIdentifier"));
42+
ExecuteNonQuery(connection, DatabaseTestHelper.GenerateTableCreationQuery(tableName, "int", "uniqueIdentifier"));
4443

45-
var generator = new UuidV8SqlServerGenerator();
46-
var insertCommand = connection.CreateCommand();
47-
InitInsertCommand(insertCommand, UuidTestHelper.GetDatabaseTestSet(generator, 10).ToArray());
48-
insertCommand.ExecuteNonQuery();
44+
var generator = new UuidV8SqlServerGenerator();
45+
var insertCommand = connection.CreateCommand();
46+
InitInsertCommand(insertCommand, UuidTestHelper.GetDatabaseTestSet(generator, 10).ToArray());
47+
insertCommand.ExecuteNonQuery();
4948

50-
var selectCommand = connection.CreateCommand();
51-
selectCommand.CommandText = @$"SELECT * FROM {tableName} ORDER BY UUID;";
49+
var selectCommand = connection.CreateCommand();
50+
selectCommand.CommandText = @$"SELECT * FROM {tableName} ORDER BY UUID;";
5251

53-
using var reader = selectCommand.ExecuteReader();
54-
int previousOrder = int.MinValue;
55-
while (reader.Read())
56-
{
57-
var expectedOrder = reader.GetInt32(0);
58-
Check.That(expectedOrder).IsStrictlyGreaterThan(previousOrder);
59-
}
60-
}
61-
finally
52+
using var reader = selectCommand.ExecuteReader();
53+
int previousOrder = int.MinValue;
54+
while (reader.Read())
6255
{
63-
ExecuteNonQuery(connection, $"DROP DATABASE {databaseName};");
56+
var expectedOrder = reader.GetInt32(0);
57+
Check.That(expectedOrder).IsStrictlyGreaterThan(previousOrder);
6458
}
6559
}
60+
finally
61+
{
62+
ExecuteNonQuery(connection, $"DROP DATABASE {databaseName};");
63+
}
6664
}
6765

6866
private static void InitInsertCommand(SqlCommand insertCommand, (int expectedPosition, Guid uuid)[] dataToInsert)

‎Src/UUIDNext.Test/Generator/UuidV5GeneratorTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void UuidV5MustHandleNotNormalizedString()
4444
const string poetry = "й";
4545
UuidV5Generator generator = new();
4646
var uuidv5 = generator.New(namespaceId, poetry);
47-
UuidTestHelper.CheckVersionAndVariant(generator.New(namespaceId, poetry), 5);
47+
UuidTestHelper.CheckVersionAndVariant(uuidv5, 5);
4848
}
4949
}
5050
}

‎Src/UUIDNext.Test/UUIDNext.Test.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,18 @@
44

55
<IsPackable>false</IsPackable>
66

7-
<TargetFrameworks>net8.0;net6.0;net472</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net472</TargetFrameworks>
88
<LangVersion>12.0</LangVersion>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
13-
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.1" />
14-
<PackageReference Condition="'$(TargetFramework)' != 'net8.0'" Include="SQLitePCLRaw.bundle_sqlite3" Version="2.1.10" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
12+
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
13+
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.4" />
14+
<PackageReference Condition="'$(TargetFramework)' != 'net8.0'" Include="SQLitePCLRaw.bundle_sqlite3" Version="2.1.11" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
1616
<PackageReference Include="NFluent" Version="3.1.0" />
1717
<PackageReference Include="xunit" Version="2.9.3" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
18+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>

‎Src/UUIDNext/Generator/UuidV7FromSpecificDateGenerator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ internal class UuidV7FromSpecificDateGenerator(int cacheSize = 1024)
2323
{
2424
private const ushort SequenceMaxValue = 0b1111_1111_1111;
2525

26-
private BetterCache<long, ushort> _sequenceByTimestamp = new(cacheSize);
26+
private readonly BetterCache<long, ushort> _sequenceByTimestamp = new(cacheSize);
2727

2828
/// <summary>
2929
/// Create a UUID version 7 where the timestamp part represent the given date

‎Src/UUIDNext/Tools/BetterCache.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private void MoveToTop(int index)
108108
_firstIndex = index;
109109
}
110110

111-
private struct ListItem(int previousIndex, TKey key, TValue value, int nextIndex)
111+
private readonly struct ListItem(int previousIndex, TKey key, TValue value, int nextIndex)
112112
{
113113
public int PreviousIndex { get; } = previousIndex;
114114
public TKey Key { get; } = key;

‎Src/UUIDNext/UUIDNext.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</ItemGroup>
4343

4444
<ItemGroup>
45-
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Memory" Version="4.6.0" />
45+
<PackageReference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="System.Memory" Version="4.6.3" />
4646
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
4747
</ItemGroup>
4848

0 commit comments

Comments
 (0)