Skip to content

Commit 9289e2a

Browse files
niemyjskiniemyjski
committed
Fixed compiler errors with signed projects.
1 parent fc1f358 commit 9289e2a

File tree

3 files changed

+31
-17
lines changed

3 files changed

+31
-17
lines changed

‎src/Exceptionless.Portable.Signed/project.json

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,22 @@
3939
"CS1591"
4040
],
4141
"optimize": true,
42-
"warningsAsErrors": true,
42+
"warningsAsErrors": true,
4343
"xmlDoc": true
4444
},
4545
"frameworks": {
4646

4747
"netstandard1.2": {
4848
"buildOptions": {
4949
"debugType": "portable",
50-
"define": [ "SIGNED", "PORTABLE", "NETSTANDARD", "NETSTANDARD1_2" ]
50+
"define": [ "SIGNED", "NO_SQL_CLIENT", "NETSTANDARD", "NETSTANDARD1_2" ]
5151
},
5252
"dependencies": {
5353
"Microsoft.CSharp": "4.0.1-rc2-24027",
5454
"System.Collections": "4.0.11-rc2-24027",
55+
"System.Collections.Concurrent": "4.0.12-rc2-24027",
56+
"System.ComponentModel.TypeConverter": "4.0.1-rc2-24027",
57+
"System.Data.Common": "4.0.1-rc2-24027",
5558
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
5659
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
5760
"System.Globalization": "4.0.11-rc2-24027",
@@ -63,10 +66,13 @@
6366
"System.Net.Requests": "4.0.11-rc2-24027",
6467
"System.ObjectModel": "4.0.12-rc2-24027",
6568
"System.Reflection": "4.1.0-rc2-24027",
69+
"System.Reflection.Emit.ILGeneration": "4.0.1-rc2-24027",
70+
"System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027",
6671
"System.Reflection.Extensions": "4.0.1-rc2-24027",
6772
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
6873
"System.Runtime": "4.1.0-rc2-24027",
6974
"System.Runtime.Extensions": "4.1.0-rc2-24027",
75+
"System.Runtime.Numerics": "4.0.1-rc2-24027",
7076
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
7177
"System.Text.Encoding": "4.0.11-rc2-24027",
7278
"System.Text.Encoding.Extensions": "4.0.11-rc2-24027",
@@ -82,13 +88,15 @@
8288
"netstandard1.3": {
8389
"buildOptions": {
8490
"debugType": "portable",
85-
"define": [ "SIGNED", "PORTABLE", "NETSTANDARD", "NETSTANDARD1_3" ]
91+
"define": [ "SIGNED", "NO_SQL_CLIENT", "NETSTANDARD", "NETSTANDARD1_3" ]
8692
},
8793
"dependencies": {
8894
"Microsoft.CSharp": "4.0.1-rc2-24027",
8995
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
9096
"System.Collections": "4.0.11-rc2-24027",
9197
"System.Collections.Concurrent": "4.0.12-rc2-24027",
98+
"System.ComponentModel.TypeConverter": "4.0.1-rc2-24027",
99+
"System.Data.Common": "4.0.1-rc2-24027",
92100
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
93101
"System.Diagnostics.Process": "4.1.0-rc2-24027",
94102
"System.Diagnostics.StackTrace": "4.0.1-rc2-24027",
@@ -104,7 +112,10 @@
104112
"System.Net.Requests": "4.0.11-rc2-24027",
105113
"System.ObjectModel": "4.0.12-rc2-24027",
106114
"System.Reflection": "4.1.0-rc2-24027",
115+
"System.Reflection.Emit.ILGeneration": "4.0.1-rc2-24027",
116+
"System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027",
107117
"System.Reflection.Extensions": "4.0.1-rc2-24027",
118+
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
108119
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
109120
"System.Runtime": "4.1.0-rc2-24027",
110121
"System.Runtime.Extensions": "4.1.0-rc2-24027",
@@ -121,19 +132,22 @@
121132
"System.Threading.Thread": "4.0.0-rc2-24027",
122133
"System.Xml.ReaderWriter": "4.0.11-rc2-24027",
123134
"System.Xml.XDocument": "4.0.11-rc2-24027",
135+
"System.Xml.XmlDocument": "4.0.1-rc2-24027",
124136
"System.Xml.XmlSerializer": "4.0.11-rc2-24027"
125137
}
126138
},
127139
"netstandard1.4": {
128140
"buildOptions": {
129141
"debugType": "portable",
130-
"define": [ "SIGNED", "PORTABLE", "NETSTANDARD", "NETSTANDARD1_4" ]
142+
"define": [ "SIGNED", "NO_SQL_CLIENT", "NETSTANDARD", "NETSTANDARD1_4" ]
131143
},
132144
"dependencies": {
133145
"Microsoft.CSharp": "4.0.1-rc2-24027",
134146
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
135147
"System.Collections": "4.0.11-rc2-24027",
136148
"System.Collections.Concurrent": "4.0.12-rc2-24027",
149+
"System.ComponentModel.TypeConverter": "4.0.1-rc2-24027",
150+
"System.Data.Common": "4.0.1-rc2-24027",
137151
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
138152
"System.Diagnostics.Process": "4.1.0-rc2-24027",
139153
"System.Diagnostics.StackTrace": "4.0.1-rc2-24027",
@@ -150,7 +164,10 @@
150164
"System.Net.Requests": "4.0.11-rc2-24027",
151165
"System.ObjectModel": "4.0.12-rc2-24027",
152166
"System.Reflection": "4.1.0-rc2-24027",
167+
"System.Reflection.Emit.ILGeneration": "4.0.1-rc2-24027",
168+
"System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027",
153169
"System.Reflection.Extensions": "4.0.1-rc2-24027",
170+
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
154171
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
155172
"System.Runtime": "4.1.0-rc2-24027",
156173
"System.Runtime.Extensions": "4.1.0-rc2-24027",
@@ -167,20 +184,23 @@
167184
"System.Threading.Thread": "4.0.0-rc2-24027",
168185
"System.Xml.ReaderWriter": "4.0.11-rc2-24027",
169186
"System.Xml.XDocument": "4.0.11-rc2-24027",
187+
"System.Xml.XmlDocument": "4.0.1-rc2-24027",
170188
"System.Xml.XmlSerializer": "4.0.11-rc2-24027"
171189
}
172190
},
173191
"netstandard1.5": {
174192
"buildOptions": {
175193
"debugType": "portable",
176-
"define": [ "SIGNED", "PORTABLE", "NETSTANDARD", "NETSTANDARD1_5" ]
194+
"define": [ "NO_SQL_CLIENT", "NETSTANDARD", "NETSTANDARD1_5" ]
177195
},
178196
"dependencies": {
179197
"Microsoft.CSharp": "4.0.1-rc2-24027",
180198
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-final",
181199
"System.AppDomain": "2.0.8",
182200
"System.Collections": "4.0.11-rc2-24027",
183201
"System.Collections.Concurrent": "4.0.12-rc2-24027",
202+
"System.ComponentModel.TypeConverter": "4.0.1-rc2-24027",
203+
"System.Data.Common": "4.0.1-rc2-24027",
184204
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
185205
"System.Diagnostics.Process": "4.1.0-rc2-24027",
186206
"System.Diagnostics.StackTrace": "4.0.1-rc2-24027",
@@ -198,7 +218,10 @@
198218
"System.Net.Requests": "4.0.11-rc2-24027",
199219
"System.ObjectModel": "4.0.12-rc2-24027",
200220
"System.Reflection": "4.1.0-rc2-24027",
221+
"System.Reflection.Emit.ILGeneration": "4.0.1-rc2-24027",
222+
"System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027",
201223
"System.Reflection.Extensions": "4.0.1-rc2-24027",
224+
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
202225
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
203226
"System.Runtime": "4.1.0-rc2-24027",
204227
"System.Runtime.Extensions": "4.1.0-rc2-24027",
@@ -215,13 +238,14 @@
215238
"System.Threading.Thread": "4.0.0-rc2-24027",
216239
"System.Xml.ReaderWriter": "4.0.11-rc2-24027",
217240
"System.Xml.XDocument": "4.0.11-rc2-24027",
241+
"System.Xml.XmlDocument": "4.0.1-rc2-24027",
218242
"System.Xml.XmlSerializer": "4.0.11-rc2-24027"
219243
}
220244
},
221245
".NETPortable,Version=v4.6,Profile=Profile151": {
222246
"buildOptions": {
223247
"debugType": "portable",
224-
"define": [ "SIGNED", "NETPORTABLE", "PORTABLE", "NETSTANDARD1_2" ]
248+
"define": [ "SIGNED", "PORTABLE" ]
225249
},
226250
"frameworkAssemblies": {
227251
"Microsoft.CSharp": "",

‎src/Exceptionless.Portable/Newtonsoft.Json/Serialization/ITraceWriter.cs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,4 @@ public interface ITraceWriter
2525
/// <param name="ex">The trace exception. This parameter is optional.</param>
2626
void Trace(TraceLevel level, string message, Exception ex);
2727
}
28-
29-
#if NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2
30-
public enum TraceLevel {
31-
Off = 0,
32-
Error = 1,
33-
Warning = 2,
34-
Info = 3,
35-
Verbose = 4,
36-
}
37-
#endif
3828
}

‎src/Exceptionless.Portable/Newtonsoft.Json/TraceLevel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#if (DOTNET || PORTABLE40 || PORTABLE)
2+
#if (DOTNET || PORTABLE40 || PORTABLE || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2)
33
using Exceptionless.Json.Serialization;
44

55
namespace Exceptionless.Json

0 commit comments

Comments
 (0)