Simplify CROSS_PLATFORM #ifs

Directory.Packages.props

@@ -6,7 +6,7 @@
   <ItemGroup>
     <PackageVersion Include="AvalonEdit" Version="6.3.1.120" />
     <PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
-    <PackageVersion Include="CliWrap" Version="3.10.0" />
+    <PackageVersion Include="CliWrap" Version="3.10.1" />
     <PackageVersion Include="DataGridExtensions" Version="2.9.1" />
     <PackageVersion Include="DiffLib" Version="2025.0.0" />
     <PackageVersion Include="Dirkster.AvalonDock.Themes.VS2013" Version="4.72.1" />
@@ -29,7 +29,7 @@
     <PackageVersion Include="Microsoft.NETCore.ILDAsm" Version="10.0.5" />
     <PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.5" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.201" />
-    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
+    <PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.1.0" />
     <PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="2.1.0" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.142" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.6" />

ILSpy/TreeNodes/AssemblyTreeNode.cs

@@ -154,50 +154,32 @@ namespace ICSharpCode.ILSpy.TreeNodes
 					var metadata = module?.Metadata;
 					if (metadata?.IsAssembly == true && metadata.TryGetFullAssemblyName(out var assemblyName))
 					{
-#if CROSS_PLATFORM
-						tooltip.Inlines.Add(new Bold().Add(new Run("Name: ")));
-#else
-						tooltip.Inlines.Add(new Bold(new Run("Name: ")));
-#endif
+						tooltip.Inlines.Add(CreateBoldRun("Name: "));
 						tooltip.Inlines.Add(new Run(assemblyName));
 						tooltip.Inlines.Add(new LineBreak());
 					}
-#if CROSS_PLATFORM
-					tooltip.Inlines.Add(new Bold().Add(new Run("Location: ")));
-#else
-					tooltip.Inlines.Add(new Bold(new Run("Location: ")));
-#endif
+
+					tooltip.Inlines.Add(CreateBoldRun("Location: "));
 					tooltip.Inlines.Add(new Run(LoadedAssembly.FileName));
+
 					if (module != null)
 					{
 						if (module is PEFile peFile)
 						{
 							tooltip.Inlines.Add(new LineBreak());
-#if CROSS_PLATFORM
-							tooltip.Inlines.Add(new Bold().Add(new Run("Architecture: ")));
-#else
-							tooltip.Inlines.Add(new Bold(new Run("Architecture: ")));
-#endif
+							tooltip.Inlines.Add(CreateBoldRun("Architecture: "));
 							tooltip.Inlines.Add(new Run(Language.GetPlatformDisplayName(peFile)));
 						}
 						string runtimeName = Language.GetRuntimeDisplayName(module);
 						if (runtimeName != null)
 						{
 							tooltip.Inlines.Add(new LineBreak());
-#if CROSS_PLATFORM
-							tooltip.Inlines.Add(new Bold().Add(new Run("Runtime: ")));
-#else
-							tooltip.Inlines.Add(new Bold(new Run("Runtime: ")));
-#endif
+							tooltip.Inlines.Add(CreateBoldRun("Runtime: "));
 							tooltip.Inlines.Add(new Run(runtimeName));
 						}
 						var debugInfo = LoadedAssembly.GetDebugInfoOrNull();
 						tooltip.Inlines.Add(new LineBreak());
-#if CROSS_PLATFORM
-							tooltip.Inlines.Add(new Bold().Add(new Run("Debug info: ")));
-#else
-						tooltip.Inlines.Add(new Bold(new Run("Debug info: ")));
-#endif
+						tooltip.Inlines.Add(CreateBoldRun("Debug info: "));
 						tooltip.Inlines.Add(new Run(debugInfo?.Description ?? "none"));
 					}
 				}
@@ -206,6 +188,15 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			}
 		}
 
+		private static Bold CreateBoldRun(string text)
+		{
+#if CROSS_PLATFORM
+			return new Bold().Add(new Run(text)));
+#else
+			return new Bold(new Run(text));
+#endif
+		}
+
 		public void UpdateToolTip()
 		{
 			tooltip = null;