Skip to content

Commit 917e235

Browse files
niemyjskiniemyjski
authored
Remove Deprecated Microsoft.Extensions.PlatformAbstractions (#315)
1 parent 829bdbc commit 917e235

File tree

4 files changed

+74
-86
lines changed

4 files changed

+74
-86
lines changed

‎src/Exceptionless/Exceptionless.csproj‎

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

3636
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'" Label="Package References">
3737
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
38-
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
3938
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
4039
</ItemGroup>
4140

‎src/Exceptionless/Plugins/Default/080_VersionPlugin.cs‎

Lines changed: 3 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using System;
2-
using System.Linq;
3-
using System.Reflection;
42
using Exceptionless.Logging;
53
using Exceptionless.Models;
4+
using Exceptionless.Utility;
65

76
namespace Exceptionless.Plugins.Default {
87
[Priority(80)]
@@ -40,10 +39,10 @@ private string GetVersion(IExceptionlessLog log) {
4039
if (_appVersionLoaded)
4140
return _appVersion;
4241

43-
var entryAssembly = GetEntryAssembly(log);
42+
var entryAssembly = AssemblyHelper.GetEntryAssembly(log);
4443

4544
try {
46-
string version = GetVersionFromAssembly(entryAssembly);
45+
string version = AssemblyHelper.GetVersionFromAssembly(entryAssembly);
4746
if (!String.IsNullOrEmpty(version)) {
4847
_appVersion = version;
4948
_appVersionLoaded = true;
@@ -54,80 +53,11 @@ private string GetVersion(IExceptionlessLog log) {
5453
log.FormattedError(typeof(VersionPlugin), ex, "Unable to get version from loaded assemblies. Error: {0}", ex.Message);
5554
}
5655

57-
#if NETSTANDARD2_0
58-
try {
59-
var platformService = Microsoft.Extensions.PlatformAbstractions.PlatformServices.Default;
60-
61-
_appVersion = platformService.Application.ApplicationVersion;
62-
_appVersionLoaded = true;
63-
64-
return _appVersion;
65-
} catch (Exception ex) {
66-
log.FormattedError(typeof(VersionPlugin), ex, "Unable to get Platform Services instance. Error: {0}", ex.Message);
67-
}
68-
#endif
69-
7056
_appVersion = null;
7157
_appVersionLoaded = true;
7258

7359
return null;
7460
}
7561

76-
private string GetVersionFromAssembly(Assembly assembly) {
77-
if (assembly == null)
78-
return null;
79-
80-
string version = assembly.GetInformationalVersion();
81-
if (String.IsNullOrEmpty(version) || String.Equals(version, "0.0.0.0"))
82-
version = assembly.GetFileVersion();
83-
84-
if (String.IsNullOrEmpty(version) || String.Equals(version, "0.0.0.0"))
85-
version = assembly.GetVersion();
86-
87-
if (String.IsNullOrEmpty(version) || String.Equals(version, "0.0.0.0")) {
88-
var assemblyName = assembly.GetAssemblyName();
89-
version = assemblyName != null ? assemblyName.Version.ToString() : null;
90-
}
91-
92-
return !String.IsNullOrEmpty(version) && !String.Equals(version, "0.0.0.0") ? version : null;
93-
}
94-
95-
private Assembly GetEntryAssembly(IExceptionlessLog log) {
96-
var entryAssembly = Assembly.GetEntryAssembly();
97-
if (IsUserAssembly(entryAssembly))
98-
return entryAssembly;
99-
100-
try {
101-
var assemblies = AppDomain.CurrentDomain.GetAssemblies().Where(a =>
102-
!a.IsDynamic
103-
&& a != typeof(ExceptionlessClient).GetTypeInfo().Assembly
104-
&& a != GetType().GetTypeInfo().Assembly
105-
&& a != typeof(object).GetTypeInfo().Assembly);
106-
107-
return assemblies.FirstOrDefault(a => IsUserAssembly(a));
108-
} catch (Exception ex) {
109-
log.FormattedError(typeof(VersionPlugin), ex, "Unable to get entry assembly. Error: {0}", ex.Message);
110-
}
111-
112-
return null;
113-
}
114-
115-
private bool IsUserAssembly(Assembly assembly) {
116-
if (assembly == null)
117-
return false;
118-
119-
if (!String.IsNullOrEmpty(assembly.FullName) && (assembly.FullName.StartsWith("System.") || assembly.FullName.StartsWith("Microsoft.")))
120-
return false;
121-
122-
string company = assembly.GetCompany() ?? String.Empty;
123-
string[] nonUserCompanies = new[] { "Exceptionless", "Microsoft" };
124-
if (nonUserCompanies.Any(c => company.IndexOf(c, StringComparison.OrdinalIgnoreCase) >= 0))
125-
return false;
126-
127-
if (assembly.FullName == typeof(ExceptionlessClient).GetTypeInfo().Assembly.FullName)
128-
return false;
129-
130-
return true;
131-
}
13262
}
13363
}

‎src/Exceptionless/Services/DefaultEnvironmentInfoCollector.cs‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,14 @@
44
using System.Linq;
55
using System.Net;
66
using System.Net.Sockets;
7+
using System.Reflection;
78
using System.Runtime.InteropServices;
9+
using System.Runtime.Versioning;
810
using System.Text;
911
using System.Threading;
1012
using Exceptionless.Logging;
1113
using Exceptionless.Models.Data;
14+
using Exceptionless.Utility;
1215

1316
namespace Exceptionless.Services {
1417
public class DefaultEnvironmentInfoCollector : IEnvironmentInfoCollector {
@@ -154,31 +157,30 @@ private void PopulateRuntimeInfo(EnvironmentInfo info) {
154157
}
155158
}
156159

157-
#if NETSTANDARD
158-
Microsoft.Extensions.PlatformAbstractions.PlatformServices computerInfo = null;
159-
#elif NET45
160+
#if NET45
160161
Microsoft.VisualBasic.Devices.ComputerInfo computerInfo = null;
161-
#endif
162162

163163
try {
164-
#if NETSTANDARD
165-
computerInfo = Microsoft.Extensions.PlatformAbstractions.PlatformServices.Default;
166-
#elif NET45
167164
computerInfo = new Microsoft.VisualBasic.Devices.ComputerInfo();
168-
#endif
169165
} catch (Exception ex) {
170166
Log.FormattedWarn(typeof(DefaultEnvironmentInfoCollector), "Unable to get computer info. Error message: {0}", ex.Message);
171167
}
172168

173169
if (computerInfo == null)
174170
return;
171+
#endif
175172

176173
try {
177174
#if NETSTANDARD
178-
info.RuntimeVersion = computerInfo.Application.RuntimeFramework.Version.ToString();
179-
info.Data["ApplicationBasePath"] = computerInfo.Application.ApplicationBasePath;
180-
info.Data["ApplicationName"] = computerInfo.Application.ApplicationName;
181-
info.Data["RuntimeFramework"] = computerInfo.Application.RuntimeFramework.FullName;
175+
info.RuntimeVersion = Environment.Version.ToString();
176+
info.Data["ApplicationBasePath"] = AppContext.BaseDirectory ?? AppDomain.CurrentDomain.BaseDirectory;
177+
178+
179+
var entryAssembly = AssemblyHelper.GetEntryAssembly(Log);
180+
if (entryAssembly != null) {
181+
info.Data["ApplicationName"] = entryAssembly.GetName().Name;
182+
info.Data["RuntimeFramework"] = entryAssembly.GetCustomAttribute<TargetFrameworkAttribute>()?.FrameworkName;
183+
}
182184
#elif NET45
183185
info.OSName = computerInfo.OSFullName;
184186
info.OSVersion = computerInfo.OSVersion;

‎src/Exceptionless/Utility/AssemblyHelper.cs‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,63 @@ public static Assembly GetRootAssembly() {
1010
return Assembly.GetEntryAssembly();
1111
}
1212

13+
public static Assembly GetEntryAssembly(IExceptionlessLog log) {
14+
var entryAssembly = Assembly.GetEntryAssembly();
15+
if (IsUserAssembly(entryAssembly))
16+
return entryAssembly;
17+
18+
try {
19+
var assemblies = AppDomain.CurrentDomain.GetAssemblies().Where(a =>
20+
!a.IsDynamic
21+
&& a != typeof(ExceptionlessClient).GetTypeInfo().Assembly
22+
&& a != typeof(object).GetTypeInfo().Assembly);
23+
24+
return assemblies.FirstOrDefault(a => IsUserAssembly(a));
25+
}
26+
catch (Exception ex) {
27+
log.FormattedError(typeof(AssemblyHelper), ex, "Unable to get entry assembly. Error: {0}", ex.Message);
28+
}
29+
30+
return null;
31+
}
32+
33+
private static bool IsUserAssembly(Assembly assembly) {
34+
if (assembly == null)
35+
return false;
36+
37+
if (!String.IsNullOrEmpty(assembly.FullName) && (assembly.FullName.StartsWith("System.") || assembly.FullName.StartsWith("Microsoft.")))
38+
return false;
39+
40+
string company = assembly.GetCompany() ?? String.Empty;
41+
string[] nonUserCompanies = new[] { "Exceptionless", "Microsoft" };
42+
if (nonUserCompanies.Any(c => company.IndexOf(c, StringComparison.OrdinalIgnoreCase) >= 0))
43+
return false;
44+
45+
if (assembly.FullName == typeof(ExceptionlessClient).GetTypeInfo().Assembly.FullName)
46+
return false;
47+
48+
return true;
49+
}
50+
51+
public static string GetVersionFromAssembly(Assembly assembly) {
52+
if (assembly == null)
53+
return null;
54+
55+
string version = assembly.GetInformationalVersion();
56+
if (String.IsNullOrEmpty(version) || String.Equals(version, "0.0.0.0"))
57+
version = assembly.GetFileVersion();
58+
59+
if (String.IsNullOrEmpty(version) || String.Equals(version, "0.0.0.0"))
60+
version = assembly.GetVersion();
61+
62+
if (String.IsNullOrEmpty(version) || String.Equals(version, "0.0.0.0")) {
63+
var assemblyName = assembly.GetAssemblyName();
64+
version = assemblyName != null ? assemblyName.Version.ToString() : null;
65+
}
66+
67+
return !String.IsNullOrEmpty(version) && !String.Equals(version, "0.0.0.0") ? version : null;
68+
}
69+
1370
public static string GetAssemblyTitle() {
1471
// Get all attributes on this assembly
1572
var assembly = GetRootAssembly();

0 commit comments

Comments
 (0)