Skip to content

Removed tests file from Net2 project #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removed tests file from Net2 project #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
927da5b
Removed tests file from Net2 project, it is duplicated in the tests p…
eduardocampano Apr 10, 2014
bc2df6f
Fixed Con[s]tructor issue #54
eduardocampano Apr 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/SimpleJson.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.20827.3
VisualStudioVersion = 12.0.30110.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{AEDAD4B4-9F2C-4992-8CD6-A43DFDFF7172}"
EndProject
Expand Down
62 changes: 0 additions & 62 deletions src/SimpleJson/EscapeToJavascriptStringTests.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/SimpleJson/SimpleJson-Net20.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="EscapeToJavascriptStringTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SimpleJson.cs" />
</ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions src/SimpleJson/SimpleJson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,7 +1260,7 @@ class PocoJsonSerializerStrategy : IJsonSerializerStrategy

public PocoJsonSerializerStrategy()
{
ConstructorCache = new ReflectionUtils.ThreadSafeDictionary<Type, ReflectionUtils.ConstructorDelegate>(ContructorDelegateFactory);
ConstructorCache = new ReflectionUtils.ThreadSafeDictionary<Type, ReflectionUtils.ConstructorDelegate>(ConstructorDelegateFactory);
GetCache = new ReflectionUtils.ThreadSafeDictionary<Type, IDictionary<string, ReflectionUtils.GetDelegate>>(GetterValueFactory);
SetCache = new ReflectionUtils.ThreadSafeDictionary<Type, IDictionary<string, KeyValuePair<Type, ReflectionUtils.SetDelegate>>>(SetterValueFactory);
}
Expand All @@ -1270,9 +1270,9 @@ protected virtual string MapClrMemberNameToJsonFieldName(string clrPropertyName)
return clrPropertyName;
}

internal virtual ReflectionUtils.ConstructorDelegate ContructorDelegateFactory(Type key)
internal virtual ReflectionUtils.ConstructorDelegate ConstructorDelegateFactory(Type key)
{
return ReflectionUtils.GetContructor(key, key.IsArray ? ArrayConstructorParameterTypes : EmptyTypes);
return ReflectionUtils.GetConstructor(key, key.IsArray ? ArrayConstructorParameterTypes : EmptyTypes);
}

internal virtual IDictionary<string, ReflectionUtils.GetDelegate> GetterValueFactory(Type type)
Expand Down Expand Up @@ -1812,7 +1812,7 @@ public static MethodInfo GetSetterMethodInfo(PropertyInfo propertyInfo)
#endif
}

public static ConstructorDelegate GetContructor(ConstructorInfo constructorInfo)
public static ConstructorDelegate GetConstructor(ConstructorInfo constructorInfo)
{
#if SIMPLE_JSON_NO_LINQ_EXPRESSION
return GetConstructorByReflection(constructorInfo);
Expand All @@ -1821,7 +1821,7 @@ public static ConstructorDelegate GetContructor(ConstructorInfo constructorInfo)
#endif
}

public static ConstructorDelegate GetContructor(Type type, params Type[] argsType)
public static ConstructorDelegate GetConstructor(Type type, params Type[] argsType)
{
#if SIMPLE_JSON_NO_LINQ_EXPRESSION
return GetConstructorByReflection(type, argsType);
Expand Down