Skip to content

Commit 019f0ba

Browse files
committed
Removed the embedded directive
1 parent 9496671 commit 019f0ba

File tree

7 files changed

+7
-55
lines changed

7 files changed

+7
-55
lines changed

Libraries/Settings.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ $client_projects = @(
2727
)
2828

2929
$client_build_configurations = @(
30-
@{ Constants = "EMBEDDED;PORTABLE40"; TargetFrameworkVersionProperty="NET40"; NuGetDir = "portable-net40+sl50+win+wpa81+wp80"; }
31-
@{ Constants = "EMBEDDED;PORTABLE40"; TargetFrameworkVersionProperty="NET40"; NuGetDir = "net40"; },
32-
@{ Constants = "EMBEDDED;PORTABLE40"; TargetFrameworkVersionProperty="NET45"; NuGetDir = "net45"; }
30+
@{ Constants = "PORTABLE40"; TargetFrameworkVersionProperty="NET40"; NuGetDir = "portable-net40+sl50+win+wpa81+wp80"; }
31+
@{ Constants = "PORTABLE40"; TargetFrameworkVersionProperty="NET40"; NuGetDir = "net40"; },
32+
@{ Constants = "PORTABLE40"; TargetFrameworkVersionProperty="NET45"; NuGetDir = "net45"; }
3333
)

Source/Shared/Exceptionless.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<DebugType>full</DebugType>
2222
<Optimize>false</Optimize>
2323
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>TRACE;DEBUG;PORTABLE40;EMBEDDED</DefineConstants>
24+
<DefineConstants>TRACE;DEBUG;PORTABLE40</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
2727
<NoWarn>1998</NoWarn>

Source/Shared/Serializer/DataDictionaryConverter.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
using System;
22
using Exceptionless.Models;
3-
#if EMBEDDED
43
using Exceptionless.Json;
54
using Exceptionless.Json.Converters;
65
using Exceptionless.Json.Linq;
7-
#else
8-
using Newtonsoft.Json;
9-
using Newtonsoft.Json.Converters;
10-
using Newtonsoft.Json.Linq;
11-
#endif
12-
136
namespace Exceptionless.Serializer {
147
internal class DataDictionaryConverter : CustomCreationConverter<DataDictionary> {
158
public override DataDictionary Create(Type objectType) {

Source/Shared/Serializer/ExceptionlessContractResolver.cs

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
using System;
22
using System.Reflection;
33
using Exceptionless.Models;
4-
#if EMBEDDED
54
using Exceptionless.Json;
65
using Exceptionless.Json.Serialization;
76
using Exceptionless.Extensions;
8-
#else
9-
using Newtonsoft.Json;
10-
using Newtonsoft.Json.Serialization;
11-
using Exceptionless.Core.Extensions;
12-
#endif
137

148
namespace Exceptionless.Serializer {
15-
#if EMBEDDED
16-
internal
17-
#else
18-
public
19-
#endif
20-
class ExceptionlessContractResolver : DefaultContractResolver {
9+
internal class ExceptionlessContractResolver : DefaultContractResolver {
2110
private readonly Func<JsonProperty, object, bool> _includeProperty;
2211

2312
public ExceptionlessContractResolver(Func<JsonProperty, object, bool> includeProperty = null) {
@@ -43,12 +32,7 @@ protected override JsonDictionaryContract CreateDictionaryContract(Type objectTy
4332
return contract;
4433
}
4534

46-
#if EMBEDDED
47-
protected internal
48-
#else
49-
protected
50-
#endif
51-
override string ResolvePropertyName(string propertyName) {
35+
protected internal override string ResolvePropertyName(string propertyName) {
5236
return propertyName.ToLowerUnderscoredWords();
5337
}
5438
}

Source/Shared/Serializer/JsonTextWriterWithDepth.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
using System;
22
using System.IO;
3-
#if EMBEDDED
43
using Exceptionless.Json;
5-
#else
6-
using Newtonsoft.Json;
7-
#endif
84

95
namespace Exceptionless.Serializer {
106
internal class JsonTextWriterWithDepth : JsonTextWriter {

Source/Shared/Serializer/RequestInfoConverter.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
using System;
2-
#if EMBEDDED
32
using Exceptionless.Json;
43
using Exceptionless.Json.Converters;
54
using Exceptionless.Json.Linq;
6-
#else
7-
using Newtonsoft.Json;
8-
using Newtonsoft.Json.Converters;
9-
using Newtonsoft.Json.Linq;
10-
#endif
115
using Exceptionless.Models.Data;
126

137
namespace Exceptionless.Serializer {

Source/Shared/Submission/Net/ExceptionlessHeaders.cs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
1-
#region Copyright 2015 Exceptionless
1+
using System;
22

3-
// This program is free software: you can redistribute it and/or modify it
4-
// under the terms of the GNU Affero General Public License as published
5-
// by the Free Software Foundation, either version 3 of the License, or
6-
// (at your option) any later version.
7-
//
8-
// http://www.gnu.org/licenses/agpl-3.0.html
9-
10-
#endregion
11-
12-
using System;
13-
14-
#if !EMBEDDED
15-
namespace Exceptionless.Api.Utility {
16-
#else
173
namespace Exceptionless.Submission.Net {
18-
#endif
194
public static class ExceptionlessHeaders {
205
public const string Bearer = "Bearer";
216
public const string LegacyConfigurationVersion = "v";

0 commit comments

Comments
 (0)