Skip to content

Commit 13a63fa

Browse files
committed
Fixed an issue with System.Appdomain blowing up on .net core rtm.
1 parent 144710e commit 13a63fa

File tree

6 files changed

+10
-27
lines changed

6 files changed

+10
-27
lines changed

src/Exceptionless.Signed/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
},
9292
"dependencies": {
9393
"Microsoft.Extensions.PlatformAbstractions": "1.0.0",
94-
"System.AppDomain": "2.0.10",
94+
"System.AppDomain": "2.0.11",
9595
"System.Collections": "4.0.11",
9696
"System.Collections.Concurrent": "4.0.12",
9797
"System.ComponentModel.TypeConverter": "4.1.0",
@@ -145,7 +145,7 @@
145145
},
146146
"dependencies": {
147147
"Microsoft.Extensions.PlatformAbstractions": "1.0.0",
148-
"System.AppDomain": "2.0.10",
148+
"System.AppDomain": "2.0.11",
149149
"System.Collections": "4.0.11",
150150
"System.Collections.Concurrent": "4.0.12",
151151
"System.ComponentModel.TypeConverter": "4.1.0",
@@ -200,7 +200,7 @@
200200
},
201201
"dependencies": {
202202
"Microsoft.Extensions.PlatformAbstractions": "1.0.0",
203-
"System.AppDomain": "2.0.10",
203+
"System.AppDomain": "2.0.11",
204204
"System.Collections": "4.0.11",
205205
"System.Collections.Concurrent": "4.0.12",
206206
"System.ComponentModel.TypeConverter": "4.1.0",

src/Exceptionless.Tests/Configuration/ConfigurationTests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4+
using System.Reflection;
45
using Exceptionless.Configuration;
56
using Exceptionless.Dependency;
67
using Exceptionless.Models;
@@ -43,7 +44,7 @@ public void CanReadFromAttributes() {
4344
Assert.Equal("https://collector.exceptionless.io", config.ServerUrl);
4445
Assert.Equal(0, config.Settings.Count);
4546

46-
config.ReadFromAttributes(typeof(ConfigurationTests).Assembly);
47+
config.ReadFromAttributes(typeof(ConfigurationTests).GetTypeInfo().Assembly);
4748
Assert.Equal("LhhP1C9gijpSKCslHHCvwdSIz298twx271n1l6xw", config.ApiKey);
4849
Assert.Equal("http://localhost:45000", config.ServerUrl);
4950
Assert.Equal(1, config.Settings.Count);

src/Exceptionless.Tests/project.json

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
"Exceptionless": {
1313
"target": "project"
1414
},
15-
"Foundatio": "4.2.1046-pre",
1615
"Moq": "4.6.25-alpha",
1716
"NLog": "4.4.0-beta12",
1817
"dotnet-test-xunit": "2.2.0-preview2-build1029",
@@ -23,17 +22,6 @@
2322
"Exceptionless.RandomData": "1.1.24"
2423
},
2524
"frameworks": {
26-
"netcoreapp1.0": {
27-
"buildOptions": {
28-
"define": [ "NETSTANDARD", "NETSTANDARD1_5" ]
29-
},
30-
"dependencies": {
31-
"Microsoft.NETCore.App": {
32-
"type": "platform",
33-
"version": "1.0.0"
34-
}
35-
}
36-
},
3725
"NET46": {
3826
"buildOptions": {
3927
"define": [ "NET46" ]

src/Exceptionless/Services/DefaultEnvironmentInfoCollector.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ private void PopulateRuntimeInfo(EnvironmentInfo info) {
150150
info.OSName = GetOSName(RuntimeInformation.OSDescription);
151151
info.OSVersion = GetVersion(RuntimeInformation.OSDescription)?.ToString();
152152
info.Architecture = RuntimeInformation.OSArchitecture.ToString();
153-
info.RuntimeVersion = GetVersion(RuntimeInformation.FrameworkDescription)?.ToString();
154153
info.Data["FrameworkDescription"] = RuntimeInformation.FrameworkDescription;
155154
info.Data["ProcessArchitecture"] = RuntimeInformation.ProcessArchitecture;
156155
#endif
@@ -192,6 +191,7 @@ private void PopulateRuntimeInfo(EnvironmentInfo info) {
192191

193192
try {
194193
#if NETSTANDARD
194+
info.RuntimeVersion = computerInfo.Application.RuntimeFramework.Version.ToString();
195195
info.Data["ApplicationBasePath"] = computerInfo.Application.ApplicationBasePath;
196196
info.Data["ApplicationName"] = computerInfo.Application.ApplicationName;
197197
info.Data["RuntimeFramework"] = computerInfo.Application.RuntimeFramework.FullName;

src/Exceptionless/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
},
8383
"dependencies": {
8484
"Microsoft.Extensions.PlatformAbstractions": "1.0.0",
85-
"System.AppDomain": "2.0.10",
85+
"System.AppDomain": "2.0.11",
8686
"System.Collections": "4.0.11",
8787
"System.Collections.Concurrent": "4.0.12",
8888
"System.ComponentModel.TypeConverter": "4.1.0",
@@ -136,7 +136,7 @@
136136
},
137137
"dependencies": {
138138
"Microsoft.Extensions.PlatformAbstractions": "1.0.0",
139-
"System.AppDomain": "2.0.10",
139+
"System.AppDomain": "2.0.11",
140140
"System.Collections": "4.0.11",
141141
"System.Collections.Concurrent": "4.0.12",
142142
"System.ComponentModel.TypeConverter": "4.1.0",
@@ -191,7 +191,7 @@
191191
},
192192
"dependencies": {
193193
"Microsoft.Extensions.PlatformAbstractions": "1.0.0",
194-
"System.AppDomain": "2.0.10",
194+
"System.AppDomain": "2.0.11",
195195
"System.Collections": "4.0.11",
196196
"System.Collections.Concurrent": "4.0.12",
197197
"System.ComponentModel.TypeConverter": "4.1.0",

src/Platforms/Exceptionless.NLog/project.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
},
2222
"buildOptions": {
2323
"compile": [ "**/*.cs", "../../GlobalAssemblyInfo.cs" ],
24+
"debugType": "portable",
2425
"nowarn": [
2526
"CS1591"
2627
],
@@ -37,19 +38,12 @@
3738
"frameworks": {
3839
"netstandard1.3": {
3940
"buildOptions": {
40-
"debugType": "portable",
4141
"define": [ "NETSTANDARD", "NETSTANDARD1_3" ]
42-
},
43-
"dependencies": {
44-
"NLog": "4.4.0-beta11"
4542
}
4643
},
4744
"net45": {
4845
"buildOptions": {
4946
"define": [ "NET45" ]
50-
},
51-
"dependencies": {
52-
"NLog": "4.3.4"
5347
}
5448
}
5549
}

0 commit comments

Comments
 (0)