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

Commit 8eeac5d

Browse files
committed
Revert existing changes under a LITE flag so can be stripped out later
1 parent 9599aa3 commit 8eeac5d

File tree

6 files changed

+25
-26
lines changed

6 files changed

+25
-26
lines changed

src/ServiceStack.Text/HttpUtils.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,6 @@ public static void UploadFile(this WebRequest webRequest, Stream fileStream, str
783783
UploadFile(webRequest, fileStream, fileName, mimeType);
784784
}
785785

786-
#if !(XBOX || PCL)
787786
public static string PostXmlToUrl(this string url, object data,
788787
Action<HttpWebRequest> requestFilter = null, Action<HttpWebResponse> responseFilter = null)
789788
{
@@ -797,7 +796,6 @@ public static string PutXmlToUrl(this string url, object data,
797796
return SendStringToUrl(url, method: "PUT", requestBody: data.ToXml(), contentType: MimeTypes.Xml, accept: MimeTypes.Xml,
798797
requestFilter: requestFilter, responseFilter: responseFilter);
799798
}
800-
#endif
801799
}
802800

803801
public interface IHttpResultsFilter : IDisposable

src/ServiceStack.Text/Pcl.Dynamic.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//Copyright (c) Service Stack LLC. All Rights Reserved.
22
//License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
33

4-
#if !(PCL || __IOS__ || ANDROID)
4+
#if !(PCL || LITE)
55

66
using System;
77
using System.Collections.Generic;

src/ServiceStack.Text/PclExport.Net40.cs

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,15 @@ public override WebResponse GetResponse(WebRequest webRequest)
165165
return webRequest.GetResponse();
166166
}
167167

168-
//public override bool IsDebugBuild(Assembly assembly)
169-
//{
170-
// return assembly.AllAttributes()
171-
// .OfType<DebuggableAttribute>()
172-
// .Select(attr => attr.IsJITTrackingEnabled)
173-
// .FirstOrDefault();
174-
//}
168+
#if !LITE
169+
public override bool IsDebugBuild(Assembly assembly)
170+
{
171+
return assembly.AllAttributes()
172+
.OfType<System.Diagnostics.DebuggableAttribute>()
173+
.Select(attr => attr.IsJITTrackingEnabled)
174+
.FirstOrDefault();
175+
}
176+
#endif
175177

176178
public override string MapAbsolutePath(string relativePath, string appendPartialPathModifier)
177179
{
@@ -208,12 +210,12 @@ public override Type FindType(string typeName, string assemblyName)
208210
{
209211
var binPath = AssemblyUtils.GetAssemblyBinPath(Assembly.GetExecutingAssembly());
210212
Assembly assembly = null;
211-
var assemblyDllPath = binPath + String.Format("{0}.{1}", assemblyName, "dll");
213+
var assemblyDllPath = binPath + string.Format("{0}.{1}", assemblyName, "dll");
212214
if (File.Exists(assemblyDllPath))
213215
{
214216
assembly = AssemblyUtils.LoadAssembly(assemblyDllPath);
215217
}
216-
var assemblyExePath = binPath + String.Format("{0}.{1}", assemblyName, "exe");
218+
var assemblyExePath = binPath + string.Format("{0}.{1}", assemblyName, "exe");
217219
if (File.Exists(assemblyExePath))
218220
{
219221
assembly = AssemblyUtils.LoadAssembly(assemblyExePath);
@@ -409,7 +411,7 @@ private Expression GetCastOrConvertExpression(Expression expression, Type target
409411

410412
public override string ToXsdDateTimeString(DateTime dateTime)
411413
{
412-
#if !(__IOS__ || ANDROID)
414+
#if !LITE
413415
return System.Xml.XmlConvert.ToString(dateTime.ToStableUniversalTime(), System.Xml.XmlDateTimeSerializationMode.Utc);
414416
#else
415417
return dateTime.ToStableUniversalTime().ToString(DateTimeSerializer.XsdDateTimeFormat);
@@ -418,7 +420,7 @@ public override string ToXsdDateTimeString(DateTime dateTime)
418420

419421
public override string ToLocalXsdDateTimeString(DateTime dateTime)
420422
{
421-
#if !(__IOS__ || ANDROID)
423+
#if !LITE
422424
return System.Xml.XmlConvert.ToString(dateTime, System.Xml.XmlDateTimeSerializationMode.Local);
423425
#else
424426
return dateTime.ToString(DateTimeSerializer.XsdDateTimeFormat);
@@ -427,14 +429,14 @@ public override string ToLocalXsdDateTimeString(DateTime dateTime)
427429

428430
public override DateTime ParseXsdDateTime(string dateTimeStr)
429431
{
430-
#if !(__IOS__ || ANDROID)
432+
#if !LITE
431433
return System.Xml.XmlConvert.ToDateTime(dateTimeStr, System.Xml.XmlDateTimeSerializationMode.Utc);
432434
#else
433435
return DateTime.ParseExact(dateTimeStr, DateTimeSerializer.XsdDateTimeFormat, CultureInfo.InvariantCulture);
434436
#endif
435437
}
436438

437-
#if !(__IOS__ || ANDROID)
439+
#if !LITE
438440
public override DateTime ParseXsdDateTimeAsUtc(string dateTimeStr)
439441
{
440442
return System.Xml.XmlConvert.ToDateTime(dateTimeStr, System.Xml.XmlDateTimeSerializationMode.Utc).Prepare(parsedAsUtc: true);
@@ -468,13 +470,13 @@ public override ParseStringDelegate GetSpecializedCollectionParseMethod<TSeriali
468470

469471
public override ParseStringDelegate GetJsReaderParseMethod<TSerializer>(Type type)
470472
{
471-
//#if !__IOS__
472-
// if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) ||
473-
// type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))
474-
// {
475-
// return DeserializeDynamic<TSerializer>.Parse;
476-
// }
477-
//#endif
473+
#if !(__IOS__ || LITE)
474+
if (type.AssignableFrom(typeof(System.Dynamic.IDynamicMetaObjectProvider)) ||
475+
type.HasInterface(typeof(System.Dynamic.IDynamicMetaObjectProvider)))
476+
{
477+
return DeserializeDynamic<TSerializer>.Parse;
478+
}
479+
#endif
478480
return null;
479481
}
480482

src/ServiceStack.Text/PclExport.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System;
55
using System.Collections.Generic;
6-
using System.Diagnostics;
76
using System.Globalization;
87
using System.IO;
98
using System.Linq;

src/ServiceStack.Text/StringExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -998,7 +998,7 @@ public static int CountOccurrencesOf(this string text, char needle)
998998
return count;
999999
}
10001000

1001-
#if !(XBOX || PCL)
1001+
#if !LITE
10021002
public static string HexEscape(this string text, params char[] anyCharOf)
10031003
{
10041004
if (String.IsNullOrEmpty(text)) return text;

src/ServiceStack.Text/XmlSerializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !(XBOX || PCL)
1+
#if !LITE
22
using System;
33
using System.IO;
44
using System.Runtime.Serialization;

0 commit comments

Comments
 (0)