Fix TraceSource handling of GetEntryAssembly (#29228)

stephentoub · web-flow · commit f443d030eea8 · 2018-04-20T07:37:56.000-04:00
diff --git a/src/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceInternal.cs b/src/System.Diagnostics.TraceSource/src/System/Diagnostics/TraceInternal.cs
@@ -56,7 +56,7 @@ internal static string AppName
             {
                 if (s_appName == null)
                 {
-                    s_appName = Assembly.GetEntryAssembly().GetName().Name;
+                    s_appName = Assembly.GetEntryAssembly()?.GetName().Name ?? string.Empty;
                 }
                 return s_appName;
             }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ internal static string AppName`
`56`	`56`	`{`
`57`	`57`	`if (s_appName == null)`
`58`	`58`	`{`
`59`		`- s_appName = Assembly.GetEntryAssembly().GetName().Name;`
	`59`	`+ s_appName = Assembly.GetEntryAssembly()?.GetName().Name ?? string.Empty;`
`60`	`60`	`}`
`61`	`61`	`return s_appName;`
`62`	`62`	`}`