Skip to content

Commit 37922ff

Browse files
committed
fixed nullable issue
fixed deploy key
1 parent 2bcdac4 commit 37922ff

File tree

6 files changed

+24
-15
lines changed

6 files changed

+24
-15
lines changed

FileContextCore/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FileContextCoreCert.pfx

FileContextCore/FileContextCore.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
55
<SignAssembly Condition="'$(OS)' == 'Windows_NT'">true</SignAssembly>
6-
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
6+
<AssemblyOriginatorKeyFile>FileContextCoreCert.pfx</AssemblyOriginatorKeyFile>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8-
<Version>3.0.0</Version>
8+
<Version>3.0.1</Version>
99
<Company>morrisjdev</Company>
1010
<Authors>morrisjdev</Authors>
1111
<Description>File provider for Entity Framework Core (to be used for development purposes)</Description>
1212
<Copyright>Copyright © Morris Janatzek</Copyright>
1313
<Title>FileContextCore</Title>
14-
<PackageLicenseUrl>https://raw.githubusercontent.com/morrisjdev/FileContextCore/master/LICENSE</PackageLicenseUrl>
14+
<PackageLicenseUrl></PackageLicenseUrl>
1515
<PackageIconUrl>https://morrisj.net/img/morrisjdev_logo.png</PackageIconUrl>
1616
<RepositoryUrl>https://github.com/morrisjdev/FileContextCore</RepositoryUrl>
1717
<RepositoryType>git</RepositoryType>
1818
<PackageTags>Entity Framework Core;entity-framework-core;EF;Data;O/RM;FileContext;FileDB;JSON;XML;CSV;ELSX;Excel</PackageTags>
1919
<PackageProjectUrl>https://github.com/morrisjdev/FileContextCore</PackageProjectUrl>
2020
<NeutralLanguage>en-US</NeutralLanguage>
2121
<DelaySign>false</DelaySign>
22-
<AssemblyVersion>3.0.0.0</AssemblyVersion>
22+
<AssemblyVersion>3.0.1.0</AssemblyVersion>
2323
</PropertyGroup>
2424

2525
<ItemGroup>
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<_LastSelectedProfileId>C:\Users\morri\Documents\Projects\productive\FileContextCore\FileContextCore\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
4+
<_LastSelectedProfileId>C:\Users\mjanatzek\Documents\Projects\private\FileContextCore\FileContextCore\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
55
</PropertyGroup>
66
</Project>

FileContextCore/Properties/PublishProfiles/FolderProfile.pubxml

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
77
<PublishProtocol>FileSystem</PublishProtocol>
88
<Configuration>Release</Configuration>
99
<Platform>Any CPU</Platform>
10-
<TargetFramework>netcoreapp2.1</TargetFramework>
10+
<TargetFramework>netstandard2.0</TargetFramework>
1111
<PublishDir>bin\Release\netcoreapp2.1\publish\</PublishDir>
12-
<SelfContained>false</SelfContained>
13-
<_IsPortable>true</_IsPortable>
1412
</PropertyGroup>
1513
</Project>

FileContextCore/Serializer/SerializerHelper.cs

+17-7
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,25 @@ static class SerializerHelper
1313
{
1414
public static object Deserialize(this string input, Type type)
1515
{
16-
type = Nullable.GetUnderlyingType(type) ?? type;
17-
18-
if (String.IsNullOrEmpty(input))
16+
type = Nullable.GetUnderlyingType(type) ?? type;
17+
18+
if (string.IsNullOrEmpty(input))
19+
{
1920
return type.GetDefaultValue();
21+
}
2022

2123
if (type == typeof(TimeSpan))
24+
{
2225
return TimeSpan.Parse(input, CultureInfo.InvariantCulture);
23-
else if (type == typeof(Guid))
26+
27+
}
28+
29+
if (type == typeof(Guid))
30+
{
2431
return Guid.Parse(input);
25-
else if (type.IsArray)
32+
}
33+
34+
if (type.IsArray)
2635
{
2736
Type arrType = type.GetElementType();
2837
List<object> arr = new List<object>();
@@ -34,8 +43,9 @@ public static object Deserialize(this string input, Type type)
3443

3544
return arr.ToArray();
3645
}
37-
else
38-
return Convert.ChangeType(input, type, CultureInfo.InvariantCulture);
46+
47+
48+
return Convert.ChangeType(input, type, CultureInfo.InvariantCulture);
3949
}
4050

4151
public static string Serialize(this object input)

FileContextCore/key.snk

-596 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)