Add runtime framework moniker to WinForms demo form title

aqibbanday · Dec 30, 2019 · 364be14 · 364be14
1 parent fe0c768
commit 364be14
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/NAudioDemo/MainForm.cs b/NAudioDemo/MainForm.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Linq;
+using System.Reflection;
+using System.Runtime.Versioning;
 using System.Windows.Forms;
 using NAudioDemo.Utils;
 
@@ -21,7 +23,9 @@ public MainForm()
                 listBoxDemos.Items.Add(demo);
             }
 
-            Text += ((System.Runtime.InteropServices.Marshal.SizeOf(IntPtr.Zero) == 8) ? " (x64)" : " (x86)");
+            var arch = Environment.Is64BitProcess ? "x64" : "x86";
+            var framework = Assembly.GetEntryAssembly().GetCustomAttribute<TargetFrameworkAttribute>().FrameworkName;
+            this.Text = $"{this.Text} ({framework}) ({arch})";
         }
 
 

diff --git a/NAudioWpfDemo/MainWindow.xaml.cs b/NAudioWpfDemo/MainWindow.xaml.cs
@@ -18,8 +18,7 @@ public MainWindow()
             InitializeComponent();
             var arch = Environment.Is64BitProcess ? "x64" : "x86";
             var framework = Assembly.GetEntryAssembly().GetCustomAttribute<TargetFrameworkAttribute>().FrameworkName;
-            //this.Title = this.Title + arch;
-            this.Title = $"{this.Title} ({framework}, {arch})";
+            this.Title = $"{this.Title} ({framework}) ({arch})";
         }
     }
 }