Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 3317501

Browse files
xplicitxplicit
committed
Merge conflicts
2 parents c5ffaed + ba5abe2 commit 3317501

32 files changed

+1104
-676
lines changed

‎build/copy-pcl.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ SET MSBUILD=C:\Windows\Microsoft.NET\Framework\v3.5\MSBuild.exe
33
REM SET BUILD=Debug
44
SET BUILD=Release
55

6-
COPY ..\src\ServiceStack.Text\bin\Pcl\ServiceStack.Text.* ..\..\ServiceStack\lib\pcl
7-
REM COPY ..\src\ServiceStack.Text\bin\Sl5\ServiceStack.Text.* ..\..\ServiceStack\lib\sl5
6+
COPY "..\src\ServiceStack.Text\bin\portable45-net45+win8\ServiceStack.Text.dll" ..\..\ServiceStack\lib\pcl
7+
COPY ..\src\ServiceStack.Text\bin\Sl5\ServiceStack.Text.* ..\..\ServiceStack\lib\sl5
88
COPY ..\src\ServiceStack.Text\PclExport.Net40.cs ..\..\ServiceStack\src\ServiceStack.Pcl.Android\
99
COPY ..\src\ServiceStack.Text\PclExport.Net40.cs ..\..\ServiceStack\src\ServiceStack.Pcl.Ios\
1010
COPY ..\src\ServiceStack.Text\PclExport.Net40.cs ..\..\ServiceStack\src\ServiceStack.Pcl.Net45\

‎lib/net45/ServiceStack.Client.dll

0 Bytes
Binary file not shown.

‎lib/net45/ServiceStack.dll

8 KB
Binary file not shown.

‎lib/netstandard1.6/ServiceStack.Client.dll

0 Bytes
Binary file not shown.

‎lib/netstandard1.6/ServiceStack.dll

8 KB
Binary file not shown.

‎src/ServiceStack.Text.PCL.sln

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,36 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26114.2
3+
VisualStudioVersion = 15.0.26430.6
54
MinimumVisualStudioVersion = 10.0.40219.1
65
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4466A1CB-5882-4E95-BD92-64FFD6EB1131}"
76
ProjectSection(SolutionItems) = preProject
87
..\build\copy-pcl.bat = ..\build\copy-pcl.bat
98
EndProjectSection
109
EndProject
11-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.PCL", "ServiceStack.Text\ServiceStack.Text.PCL.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"
12-
EndProject
13-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text", "ServiceStack.Text\ServiceStack.Text.csproj", "{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text.PCL", "ServiceStack.Text\ServiceStack.Text.PCL.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"
1411
EndProject
1512
Global
1613
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1714
Debug|Any CPU = Debug|Any CPU
18-
Release|Any CPU = Release|Any CPU
1915
Debug|x64 = Debug|x64
2016
Debug|x86 = Debug|x86
17+
Release|Any CPU = Release|Any CPU
2118
Release|x64 = Release|x64
2219
Release|x86 = Release|x86
2320
EndGlobalSection
2421
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2522
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2623
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|x64.ActiveCfg = Debug|Any CPU
25+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|x64.Build.0 = Debug|Any CPU
26+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|x86.ActiveCfg = Debug|Any CPU
27+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|x86.Build.0 = Debug|Any CPU
2728
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
2829
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Debug|x64.ActiveCfg = Debug|x64
32-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Debug|x64.Build.0 = Debug|x64
33-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Debug|x86.ActiveCfg = Debug|x86
34-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Debug|x86.Build.0 = Debug|x86
35-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Release|x64.ActiveCfg = Release|x64
38-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Release|x64.Build.0 = Release|x64
39-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Release|x86.ActiveCfg = Release|x86
40-
{D146CBD1-3F73-4961-AD4C-B97D796D4F7D}.Release|x86.Build.0 = Release|x86
30+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|x64.ActiveCfg = Release|Any CPU
31+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|x64.Build.0 = Release|Any CPU
32+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|x86.ActiveCfg = Release|Any CPU
33+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|x86.Build.0 = Release|Any CPU
4134
EndGlobalSection
4235
GlobalSection(SolutionProperties) = preSolution
4336
HideSolutionNode = FALSE

‎src/ServiceStack.Text.SL5.sln

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,31 @@
1-
21
Microsoft Visual Studio Solution File, Format Version 12.00
32
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26114.2
3+
VisualStudioVersion = 15.0.26430.6
54
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text.SL5", "ServiceStack.Text\ServiceStack.Text.SL5.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceStack.Text", "ServiceStack.Text\ServiceStack.Text.csproj", "{9101EA96-5486-4FE1-BD42-0C5671F0E313}"
5+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text.SL5", "ServiceStack.Text\ServiceStack.Text.SL5.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"
96
EndProject
107
Global
118
GlobalSection(SolutionConfigurationPlatforms) = preSolution
129
Debug|Any CPU = Debug|Any CPU
13-
Release|Any CPU = Release|Any CPU
1410
Debug|x64 = Debug|x64
1511
Debug|x86 = Debug|x86
12+
Release|Any CPU = Release|Any CPU
1613
Release|x64 = Release|x64
1714
Release|x86 = Release|x86
1815
EndGlobalSection
1916
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2017
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2118
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
19+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|x64.ActiveCfg = Debug|Any CPU
20+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|x64.Build.0 = Debug|Any CPU
21+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|x86.ActiveCfg = Debug|Any CPU
22+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Debug|x86.Build.0 = Debug|Any CPU
2223
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
2324
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|Any CPU.Build.0 = Release|Any CPU
24-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
25-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Debug|Any CPU.Build.0 = Debug|Any CPU
26-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Debug|x64.ActiveCfg = Debug|x64
27-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Debug|x64.Build.0 = Debug|x64
28-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Debug|x86.ActiveCfg = Debug|x86
29-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Debug|x86.Build.0 = Debug|x86
30-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Release|Any CPU.ActiveCfg = Release|Any CPU
31-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Release|x64.ActiveCfg = Release|x64
33-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Release|x64.Build.0 = Release|x64
34-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Release|x86.ActiveCfg = Release|x86
35-
{9101EA96-5486-4FE1-BD42-0C5671F0E313}.Release|x86.Build.0 = Release|x86
25+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|x64.ActiveCfg = Release|Any CPU
26+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|x64.Build.0 = Release|Any CPU
27+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|x86.ActiveCfg = Release|Any CPU
28+
{579B3FDB-CDAD-44E1-8417-885C38E49A0E}.Release|x86.Build.0 = Release|Any CPU
3629
EndGlobalSection
3730
GlobalSection(SolutionProperties) = preSolution
3831
HideSolutionNode = FALSE

‎src/ServiceStack.Text/AutoMappingUtils.cs

Lines changed: 13 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -607,9 +607,9 @@ public class AssignmentEntry
607607
public string Name;
608608
public AssignmentMember From;
609609
public AssignmentMember To;
610-
public PropertyGetterDelegate GetValueFn;
611-
public PropertySetterDelegate SetValueFn;
612-
public PropertyGetterDelegate ConvertValueFn;
610+
public GetMemberDelegate GetValueFn;
611+
public SetMemberDelegate SetValueFn;
612+
public GetMemberDelegate ConvertValueFn;
613613

614614
public AssignmentEntry(string name, AssignmentMember @from, AssignmentMember to)
615615
{
@@ -648,27 +648,27 @@ public AssignmentMember(Type type, MethodInfo methodInfo)
648648
public FieldInfo FieldInfo;
649649
public MethodInfo MethodInfo;
650650

651-
public PropertyGetterDelegate GetGetValueFn()
651+
public GetMemberDelegate GetGetValueFn()
652652
{
653653
if (PropertyInfo != null)
654654
return PropertyInfo.GetPropertyGetterFn();
655655
if (FieldInfo != null)
656656
return FieldInfo.GetFieldGetterFn();
657657
if (MethodInfo != null)
658-
return (PropertyGetterDelegate)
659-
MethodInfo.CreateDelegate(typeof(PropertyGetterDelegate));
658+
return (GetMemberDelegate)
659+
MethodInfo.CreateDelegate(typeof(GetMemberDelegate));
660660

661661
return null;
662662
}
663663

664-
public PropertySetterDelegate GetSetValueFn()
664+
public SetMemberDelegate GetSetValueFn()
665665
{
666666
if (PropertyInfo != null)
667667
return PropertyInfo.GetPropertySetterFn();
668668
if (FieldInfo != null)
669669
return FieldInfo.GetFieldSetterFn();
670670
if (MethodInfo != null)
671-
return (PropertySetterDelegate)MethodInfo.MakeDelegate(typeof(PropertySetterDelegate));
671+
return (SetMemberDelegate)MethodInfo.MakeDelegate(typeof(SetMemberDelegate));
672672

673673
return null;
674674
}
@@ -763,38 +763,15 @@ public void Populate(object to, object from,
763763
}
764764
}
765765

766-
public delegate void PropertySetterDelegate(object instance, object value);
767-
public delegate object PropertyGetterDelegate(object instance);
766+
public delegate object GetMemberDelegate(object instance);
768767

769-
internal static class PropertyInvoker
770-
{
771-
public static PropertySetterDelegate GetPropertySetterFn(this PropertyInfo propertyInfo)
772-
{
773-
return PclExport.Instance.GetPropertySetterFn(propertyInfo);
774-
}
775-
776-
public static PropertyGetterDelegate GetPropertyGetterFn(this PropertyInfo propertyInfo)
777-
{
778-
return PclExport.Instance.GetPropertyGetterFn(propertyInfo);
779-
}
780-
}
781-
782-
internal static class FieldInvoker
783-
{
784-
public static PropertySetterDelegate GetFieldSetterFn(this FieldInfo fieldInfo)
785-
{
786-
return PclExport.Instance.GetFieldSetterFn(fieldInfo);
787-
}
788-
789-
public static PropertyGetterDelegate GetFieldGetterFn(this FieldInfo fieldInfo)
790-
{
791-
return PclExport.Instance.GetFieldGetterFn(fieldInfo);
792-
}
793-
}
768+
public delegate void SetMemberDelegate(object instance, object value);
769+
public delegate void SetMemberRefDelegate(ref object instance, object propertyValue);
770+
public delegate void SetMemberRefGenericDelegate<T>(ref T instance, object value);
794771

795772
internal static class TypeConverter
796773
{
797-
public static PropertyGetterDelegate CreateTypeConverter(Type fromType, Type toType)
774+
public static GetMemberDelegate CreateTypeConverter(Type fromType, Type toType)
798775
{
799776
if (fromType == toType)
800777
return null;

‎src/ServiceStack.Text/Common/DeserializeType.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ internal static object ParsePrimitive(string value, char firstChar)
266266
internal class TypeAccessor
267267
{
268268
internal ParseStringSegmentDelegate GetProperty;
269-
internal SetPropertyDelegate SetProperty;
269+
internal SetMemberDelegate SetProperty;
270270
internal Type PropertyType;
271271

272272
public static Type ExtractType(ITypeSerializer Serializer, string strType)
@@ -337,12 +337,12 @@ internal static ParseStringSegmentDelegate GetPropertyMethod(ITypeSerializer ser
337337
return getPropertyFn;
338338
}
339339

340-
private static SetPropertyDelegate GetSetPropertyMethod(TypeConfig typeConfig, PropertyInfo propertyInfo)
340+
private static SetMemberDelegate GetSetPropertyMethod(TypeConfig typeConfig, PropertyInfo propertyInfo)
341341
{
342342
if (typeConfig.Type != propertyInfo.DeclaringType)
343343
propertyInfo = propertyInfo.DeclaringType.GetPropertyInfo(propertyInfo.Name);
344344

345-
if (!propertyInfo.CanWrite && !typeConfig.EnableAnonymousFieldSetterses) return null;
345+
if (!propertyInfo.CanWrite && !typeConfig.EnableAnonymousFieldSetters) return null;
346346

347347
FieldInfo fieldInfo = null;
348348
if (!propertyInfo.CanWrite)
@@ -367,16 +367,16 @@ private static SetPropertyDelegate GetSetPropertyMethod(TypeConfig typeConfig, P
367367
return PclExport.Instance.GetSetMethod(propertyInfo, fieldInfo);
368368
}
369369

370-
internal static SetPropertyDelegate GetSetPropertyMethod(Type type, PropertyInfo propertyInfo)
370+
internal static SetMemberDelegate GetSetPropertyMethod(Type type, PropertyInfo propertyInfo)
371371
{
372372
if (!propertyInfo.CanWrite || propertyInfo.GetIndexParameters().Any()) return null;
373373

374-
return PclExport.Instance.GetSetPropertyMethod(propertyInfo);
374+
return PclExport.Instance.GetPropertySetterFn(propertyInfo);
375375
}
376376

377-
internal static SetPropertyDelegate GetSetFieldMethod(Type type, FieldInfo fieldInfo)
377+
internal static SetMemberDelegate GetSetFieldMethod(Type type, FieldInfo fieldInfo)
378378
{
379-
return PclExport.Instance.GetSetFieldMethod(fieldInfo);
379+
return PclExport.Instance.GetFieldSetterFn(fieldInfo);
380380
}
381381

382382
public static TypeAccessor Create(ITypeSerializer serializer, TypeConfig typeConfig, FieldInfo fieldInfo)
@@ -389,12 +389,12 @@ public static TypeAccessor Create(ITypeSerializer serializer, TypeConfig typeCon
389389
};
390390
}
391391

392-
private static SetPropertyDelegate GetSetFieldMethod(TypeConfig typeConfig, FieldInfo fieldInfo)
392+
private static SetMemberDelegate GetSetFieldMethod(TypeConfig typeConfig, FieldInfo fieldInfo)
393393
{
394394
if (typeConfig.Type != fieldInfo.DeclaringType)
395395
fieldInfo = fieldInfo.DeclaringType.GetFieldInfo(fieldInfo.Name);
396396

397-
return PclExport.Instance.GetSetFieldMethod(fieldInfo);
397+
return PclExport.Instance.GetFieldSetterFn(fieldInfo);
398398
}
399399
}
400400

‎src/ServiceStack.Text/Common/JsDelegates.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ namespace ServiceStack.Text.Common
3232

3333
public delegate void WriteObjectDelegate(TextWriter writer, object obj);
3434

35-
public delegate void SetPropertyDelegate(object instance, object propertyValue);
36-
3735
public delegate object ParseStringDelegate(string stringValue);
3836

3937
public delegate object ParseStringSegmentDelegate(StringSegment value);

0 commit comments

Comments
 (0)