Skip to content

Commit 6a7c1df

Browse files
committed
5.0.1
-Fix span API conditions -Add net6.0 and net8.0 as target framework
1 parent 40d48cd commit 6a7c1df

24 files changed

Lines changed: 87 additions & 118 deletions

Directory.Build.props

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ImplicitUsings>enable</ImplicitUsings>
4+
<Nullable>disable</Nullable>
5+
<LangVersion>latest</LangVersion>
6+
<Deterministic>true</Deterministic>
7+
<Platforms>AnyCPU</Platforms>
8+
<PlatformTarget>AnyCPU</PlatformTarget>
9+
<Authors>DevAM</Authors>
10+
<Company>DevAM</Company>
11+
<Copyright>DevAM</Copyright>
12+
<RepositoryType>git</RepositoryType>
13+
<NeutralLanguage>en</NeutralLanguage>
14+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15+
<PackageProjectUrl>https://github.com/DevAM-Tools/LargeCollections</PackageProjectUrl>
16+
<RepositoryUrl>https://github.com/DevAM-Tools/LargeCollections</RepositoryUrl>
17+
<PackageReadmeFile>README.md</PackageReadmeFile>
18+
<Version>5.0.1</Version>
19+
<AssemblyVersion>5.0.1</AssemblyVersion>
20+
<FileVersion>5.0.1</FileVersion>
21+
<SignAssembly>False</SignAssembly>
22+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
23+
</PropertyGroup>
24+
</Project>

LargeCollections.DiskCache/DiskCache.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ public void AddRange(IEnumerable<KeyValuePair<TKey, TValue>> items)
680680
}
681681
}
682682

683-
#if NETSTANDARD2_1_OR_GREATER
683+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER || NET5_0_OR_GREATER
684684
[MethodImpl(MethodImplOptions.AggressiveInlining)]
685685
public void AddRange(ReadOnlySpan<KeyValuePair<TKey, TValue>> items)
686686
{

LargeCollections.DiskCache/LargeCollections.DiskCache.csproj

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>disable</Nullable>
7-
<LangVersion>latest</LangVersion>
8-
<Platforms>AnyCPU</Platforms>
9-
<PlatformTarget>AnyCPU</PlatformTarget>
10-
<Authors>DevAM</Authors>
11-
<Company>DevAM</Company>
12-
<Copyright>DevAM</Copyright>
13-
<RepositoryType>git</RepositoryType>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
145
<PackageTags>LargeCollection;LargeCollections;Large;Collection;Collections;Dictionary;DiskCache;Cache;Disk;Sqlite;Spatial;Query</PackageTags>
15-
<NeutralLanguage>en</NeutralLanguage>
16-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
176
<Description>Dictionary-like collections that allow to limit the amount of memory (RAM) in MB that will be used. Any memory requirement that exceeds this amount is automatically swapped out to disk. Additionally it offers multi-threaded operations for performance improvements.</Description>
18-
<PackageProjectUrl>https://github.com/DevAM-Tools/LargeCollections</PackageProjectUrl>
19-
<RepositoryUrl>https://github.com/DevAM-Tools/LargeCollections</RepositoryUrl>
20-
<PackageReadmeFile>README.md</PackageReadmeFile>
217
<Title>LargeCollections.DiskCache</Title>
228
<Product>LargeCollections.DiskCache</Product>
23-
<Version>5.0.0</Version>
24-
<AssemblyVersion>5.0.0</AssemblyVersion>
25-
<FileVersion>5.0.0</FileVersion>
26-
<SignAssembly>False</SignAssembly>
279
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
10+
<IncludeSymbols>true</IncludeSymbols>
2811
<PackageId>DevAM.LargeCollections.DiskCache</PackageId>
2912
</PropertyGroup>
3013

@@ -34,7 +17,7 @@
3417
</ItemGroup>
3518

3619
<ItemGroup>
37-
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.9" />
20+
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.10" />
3821
</ItemGroup>
3922

4023
<ItemGroup>

LargeCollections.Observable/LargeCollections.Observable.csproj

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>disable</Nullable>
7-
<LangVersion>latest</LangVersion>
8-
<Platforms>AnyCPU</Platforms>
9-
<PlatformTarget>AnyCPU</PlatformTarget>
10-
<Authors>DevAM</Authors>
11-
<Company>DevAM</Company>
12-
<Copyright>DevAM</Copyright>
13-
<RepositoryType>git</RepositoryType>
14-
<PackageTags>
15-
ObservableCollection,LargeObservableCollection
16-
</PackageTags>
17-
<NeutralLanguage>en</NeutralLanguage>
18-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
19-
<Description>
20-
A large observable collection that can store up to 1_152_921_504_606_846_976 items.
21-
</Description>
22-
<PackageProjectUrl>https://github.com/DevAM-Tools/LargeCollections</PackageProjectUrl>
23-
<RepositoryUrl>https://github.com/DevAM-Tools/LargeCollections</RepositoryUrl>
24-
<PackageReadmeFile>README.md</PackageReadmeFile>
25-
<Title>LargeCollections.Observable</Title>
26-
<Product>LargeCollections.Observable</Product>
27-
<Version>5.0.0</Version>
28-
<AssemblyVersion>5.0.0</AssemblyVersion>
29-
<FileVersion>5.0.0</FileVersion>
30-
<SignAssembly>False</SignAssembly>
31-
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
32-
<PackageId>DevAM.LargeCollections.Observable</PackageId>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
5+
<PackageTags>ObservableCollection,LargeObservableCollection</PackageTags>
6+
<Description>
7+
A large observable collection that can store up to 1_152_921_504_606_846_976 items.
8+
</Description>
9+
<Title>LargeCollections.Observable</Title>
10+
<Product>LargeCollections.Observable</Product>
11+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
12+
<IncludeSymbols>true</IncludeSymbols>
13+
<PackageId>DevAM.LargeCollections.Observable</PackageId>
3314
</PropertyGroup>
3415

3516
<ItemGroup>

LargeCollections.Observable/LargeObservableCollection.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public LargeObservableCollection(IEnumerable<T> items, bool suppressEventExcepti
7575
AddRange(items);
7676
}
7777

78-
#if NETSTANDARD2_1_OR_GREATER
78+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER || NET5_0_OR_GREATER
7979
public LargeObservableCollection(ReadOnlySpan<T> span) : this(span, suppressEventExceptions: false)
8080
{
8181
}
@@ -323,7 +323,7 @@ public void AddRange(T[] source, int offset, int count)
323323
}
324324
}
325325

326-
#if NETSTANDARD2_1_OR_GREATER
326+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER || NET5_0_OR_GREATER
327327
[MethodImpl(MethodImplOptions.AggressiveInlining)]
328328
public void AddRange(ReadOnlySpan<T> source)
329329
{
@@ -529,7 +529,7 @@ public void CopyFromArray(T[] source, int sourceOffset, long targetOffset, int c
529529
}
530530
}
531531

532-
#if NETSTANDARD2_1_OR_GREATER
532+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER || NET5_0_OR_GREATER
533533
[MethodImpl(MethodImplOptions.AggressiveInlining)]
534534
public void CopyFromSpan(ReadOnlySpan<T> source, long targetOffset, int count)
535535
{
@@ -574,7 +574,7 @@ public void CopyTo(ILargeArray<T> target, long sourceOffset, long targetOffset,
574574
public void CopyToArray(T[] target, long sourceOffset, int targetOffset, int count)
575575
=> _List.CopyToArray(target, sourceOffset, targetOffset, count);
576576

577-
#if NETSTANDARD2_1_OR_GREATER
577+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER || NET5_0_OR_GREATER
578578
[MethodImpl(MethodImplOptions.AggressiveInlining)]
579579
public void CopyToSpan(Span<T> target, long sourceOffset, int count)
580580
=> _List.CopyToSpan(target, sourceOffset, count);

LargeCollections.Observable/ReadOnlyLargeObservableCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public void CopyTo(ILargeArray<T> target, long sourceOffset, long targetOffset,
195195
public void CopyToArray(T[] target, long sourceOffset, int targetOffset, int count)
196196
=> _Inner.CopyToArray(target, sourceOffset, targetOffset, count);
197197

198-
#if NETSTANDARD2_1_OR_GREATER
198+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER || NET5_0_OR_GREATER
199199
[MethodImpl(MethodImplOptions.AggressiveInlining)]
200200
public void CopyToSpan(Span<T> target, long sourceOffset, int count)
201201
=> _Inner.CopyToSpan(target, sourceOffset, count);

LargeCollections.Test/LargeArrayTest.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2424
*/
2525

2626
using System.Collections;
27+
using TUnit.Core;
2728

2829
namespace LargeCollections.Test;
2930

LargeCollections.Test/LargeCollections.Test.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,14 @@
22

33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>disable</Nullable>
7-
<LangVersion>latest</LangVersion>
85
<IsPackable>false</IsPackable>
96
<DefineConstants>UNIT_TEST</DefineConstants>
10-
<Version>5.0.0</Version>
117
</PropertyGroup>
128

139
<ItemGroup>
1410
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
15-
<PackageReference Include="TUnit" Version="0.67.0" />
16-
<PackageReference Include="TUnit.Assertions" Version="0.67.0" />
11+
<PackageReference Include="TUnit" Version="0.72.0" />
12+
<PackageReference Include="TUnit.Assertions" Version="0.72.0" />
1713
<PackageReference Include="coverlet.collector" Version="6.0.4">
1814
<PrivateAssets>all</PrivateAssets>
1915
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

LargeCollections.Test/LargeDictionaryTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ await Assert.That(() => largeDictionary.Add(new KeyValuePair<string, long>(null,
9595
largeDictionary.AddRange([]);
9696
await Assert.That(largeDictionary.Count).IsEqualTo(count);
9797

98-
#if NETSTANDARD2_1_OR_GREATER
98+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER || NET5_0_OR_GREATER
9999
// Test 6a: Test AddRange ReadOnlySpan version with empty span
100100
ReadOnlySpan<KeyValuePair<string, long>> emptySpan = [];
101101
largeDictionary.AddRange(emptySpan);
@@ -127,7 +127,7 @@ public async Task AddRangeReadOnlySpan(long count)
127127
return;
128128
}
129129

130-
#if NETSTANDARD2_1_OR_GREATER
130+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER || NET5_0_OR_GREATER
131131
LargeDictionary<string, long> largeDictionary = [];
132132

133133
// Test AddRange with ReadOnlySpan
@@ -1082,7 +1082,7 @@ public async Task ConstructorParameterTests()
10821082
await Assert.That(dict4["key1"]).IsEqualTo(1);
10831083
await Assert.That(dict4["key2"]).IsEqualTo(2);
10841084

1085-
#if NETSTANDARD2_1_OR_GREATER
1085+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER || NET5_0_OR_GREATER
10861086
// Test 5: Constructor with ReadOnlySpan and custom parameters
10871087
ReadOnlySpan<KeyValuePair<string, int>> spanItems = items.AsSpan();
10881088

LargeCollections.Test/LargeListTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ public async Task MinLoadFactorConstructorValidation()
499499
await Assert.That(listFromEnum.MinLoadFactor).IsEqualTo(0.3);
500500
await Assert.That(listFromEnum.Count).IsEqualTo(5L);
501501

502-
#if NETSTANDARD2_1_OR_GREATER
502+
#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER || NET5_0_OR_GREATER
503503
// Test 4: Test constructors with ReadOnlySpan
504504
ReadOnlySpan<int> span = items.AsSpan();
505505
LargeList<int> listFromSpan = new(span, minLoadFactor: 0.4);

0 commit comments

Comments
 (0)