Skip to content

Commit c1697e5

Browse files
authored
Merge pull request #25 from KuraiAndras/netstandard-2-support
Change to .net standard 2.0
2 parents a7d1acf + 8231458 commit c1697e5

File tree

6 files changed

+18
-16
lines changed

6 files changed

+18
-16
lines changed

ASPNETDemo/ASPNETDemo.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
99
</ItemGroup>
1010

1111
<ItemGroup>

Example/Example.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

FileContextCore/Check.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public static IReadOnlyList<T> HasNoNulls<T>(IReadOnlyList<T> value, [InvokerPar
9797
}
9898

9999
[Conditional("DEBUG")]
100-
public static void DebugAssert([System.Diagnostics.CodeAnalysis.DoesNotReturnIf(false)] bool condition, string message)
100+
public static void DebugAssert(bool condition, string message)
101101
{
102102
if (!condition)
103103
{

FileContextCore/FileContextCore.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<LangVersion>8.0</LangVersion>
56
<SignAssembly Condition="'$(OS)' == 'Windows_NT'">true</SignAssembly>
67
<AssemblyOriginatorKeyFile>FileContextCoreCert.snk</AssemblyOriginatorKeyFile>
78
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8-
<Version>3.3.0</Version>
9+
<Version>3.4.0</Version>
910
<Company>morrisjdev</Company>
1011
<Authors>morrisjdev</Authors>
1112
<Description>File provider for Entity Framework Core (to be used for development purposes)</Description>
@@ -19,17 +20,17 @@
1920
<PackageProjectUrl>https://github.com/morrisjdev/FileContextCore</PackageProjectUrl>
2021
<NeutralLanguage>en-US</NeutralLanguage>
2122
<DelaySign>false</DelaySign>
22-
<AssemblyVersion>3.3.0.0</AssemblyVersion>
23-
<FileVersion>3.3.0.0</FileVersion>
23+
<AssemblyVersion>3.4.0.0</AssemblyVersion>
24+
<FileVersion>3.4.0.0</FileVersion>
2425
<PackageLicenseFile>LICENSE</PackageLicenseFile>
2526
</PropertyGroup>
2627

2728
<ItemGroup>
28-
<PackageReference Include="CsvHelper" Version="12.1.3" />
29-
<PackageReference Include="EPPlus" Version="4.5.3.2" />
30-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0" />
32-
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
29+
<PackageReference Include="CsvHelper" Version="15.0.5" />
30+
<PackageReference Include="EPPlus" Version="5.1.2" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
33+
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
3334
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
3435
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
3536
</ItemGroup>

FileContextCore/Serializer/CSVSerializer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Text;
88
using FileContextCore.Infrastructure.Internal;
99
using Microsoft.EntityFrameworkCore;
10-
using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
10+
using System.Globalization;
1111

1212
namespace FileContextCore.Serializer
1313
{
@@ -34,7 +34,7 @@ public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey
3434
}
3535

3636
TextReader tr = new StringReader(list);
37-
CsvReader reader = new CsvReader(tr);
37+
CsvReader reader = new CsvReader(tr, CultureInfo.CurrentCulture);
3838

3939
reader.Read();
4040
reader.ReadHeader();
@@ -61,7 +61,7 @@ public Dictionary<TKey, object[]> Deserialize<TKey>(string list, Dictionary<TKey
6161
public string Serialize<TKey>(Dictionary<TKey, object[]> list)
6262
{
6363
StringWriter sw = new StringWriter();
64-
CsvWriter writer = new CsvWriter(sw);
64+
CsvWriter writer = new CsvWriter(sw, CultureInfo.CurrentCulture);
6565

6666
for (int i = 0; i < _propertyKeys.Length; i++)
6767
{

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ Feel free to create a PR with your new provider and I'll add it to FileContextCo
182182

183183
| FileContext Version | EF Core Version |
184184
|---------------------|-----------------|
185+
| 3.4.* | 3.1.0 |
185186
| 3.3.* | 3.0.0 |
186187
| 3.2.* | 3.0.0 |
187188
| 3.0.1/3.0.0/2.2.6 | 2.2.6 |

0 commit comments

Comments
 (0)