From 4ec33bab1c04926da6ac98af8ca67e14efdaa533 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Wed, 20 Mar 2019 14:29:38 +1000
Subject: [PATCH] Use string interpolation

---
 BizHawk.Client.DiscoHawk/About.cs          | 2 +-
 BizHawk.Client.DiscoHawk/AudioExtractor.cs | 2 +-
 BizHawk.Client.DiscoHawk/DiscoHawk.cs      | 8 ++++----
 BizHawk.Client.DiscoHawk/MainDiscoForm.cs  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/BizHawk.Client.DiscoHawk/About.cs b/BizHawk.Client.DiscoHawk/About.cs
index c89e7b4cad..ec2e82ab91 100644
--- a/BizHawk.Client.DiscoHawk/About.cs
+++ b/BizHawk.Client.DiscoHawk/About.cs
@@ -14,7 +14,7 @@ namespace BizHawk.Client.DiscoHawk
 		public About()
 		{
 			InitializeComponent();
-			lblVersion.Text = "v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+			lblVersion.Text = $"v{System.Reflection.Assembly.GetExecutingAssembly().GetName().Version}";
 		}
 
 		private void richTextBox1_LinkClicked(object sender, LinkClickedEventArgs e)
diff --git a/BizHawk.Client.DiscoHawk/AudioExtractor.cs b/BizHawk.Client.DiscoHawk/AudioExtractor.cs
index b789d71e0e..bcc20411be 100644
--- a/BizHawk.Client.DiscoHawk/AudioExtractor.cs
+++ b/BizHawk.Client.DiscoHawk/AudioExtractor.cs
@@ -31,7 +31,7 @@ namespace BizHawk.Client.DiscoHawk
 				for (int sector = 0; sector < trackLength; sector++)
 					dsr.ReadLBA_2352(startLba + sector, waveData, sector * 2352);
 
-				string mp3Path = string.Format("{0} - Track {1:D2}.mp3", Path.Combine(path, filebase), track.Number);
+				string mp3Path = $"{Path.Combine(path, filebase)} - Track {track.Number:D2}.mp3";
 				if (File.Exists(mp3Path))
 				{
 					if (!confirmed)
diff --git a/BizHawk.Client.DiscoHawk/DiscoHawk.cs b/BizHawk.Client.DiscoHawk/DiscoHawk.cs
index ee2b6eda31..ba91359d15 100644
--- a/BizHawk.Client.DiscoHawk/DiscoHawk.cs
+++ b/BizHawk.Client.DiscoHawk/DiscoHawk.cs
@@ -102,7 +102,7 @@ namespace BizHawk.Client.DiscoHawk
 						return asm;
 
 				//load missing assemblies by trying to find them in the dll directory
-				string dllname = new AssemblyName(args.Name).Name + ".dll";
+				string dllname = $"{new AssemblyName(args.Name).Name}.dll";
 				string directory = Path.Combine(GetExeDirectoryAbsolute(), "dll");
 				string fname = Path.Combine(directory, dllname);
 				if (!File.Exists(fname)) return null;
@@ -120,7 +120,7 @@ namespace BizHawk.Client.DiscoHawk
 		static extern bool DeleteFileW([MarshalAs(UnmanagedType.LPWStr)]string lpFileName);
 		static void RemoveMOTW(string path)
 		{
-			DeleteFileW(path + ":Zone.Identifier");
+			DeleteFileW($"{path}:Zone.Identifier");
 		}
 
 		static void WhackAllMOTW(string dllDir)
@@ -416,8 +416,8 @@ namespace BizHawk.Client.DiscoHawk
 					sw.Write("                          ");
 					sw.Write(new string('-', count * 4));
 					sw.WriteLine();
-					sw_dump_chunk_one(string.Format("SRC #{0,6} ({1})", lba, new Timestamp(lba)), lba, src_databuf, addr, count);
-					sw_dump_chunk_one(string.Format("DST #{0,6} ({1})", lba, new Timestamp(lba)), lba, dst_databuf, addr, count);
+					sw_dump_chunk_one($"SRC #{lba,6} ({new Timestamp(lba)})", lba, src_databuf, addr, count);
+					sw_dump_chunk_one($"DST #{lba,6} ({new Timestamp(lba)})", lba, dst_databuf, addr, count);
 				};
 
 				//verify each sector contents
diff --git a/BizHawk.Client.DiscoHawk/MainDiscoForm.cs b/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
index cdd2c1a0f7..a0c1d0ac45 100644
--- a/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
+++ b/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
@@ -58,7 +58,7 @@ namespace BizHawk.Client.DiscoHawk
 
 					string baseName = Path.GetFileNameWithoutExtension(file);
 					baseName += "_hawked";
-					string outfile = Path.Combine(Path.GetDirectoryName(file), baseName) + ".ccd";
+					string outfile = $"{Path.Combine(Path.GetDirectoryName(file), baseName)}.ccd";
 					CCD_Format.Dump(disc, outfile);
 				}
 				this.Cursor = Cursors.Default;