Fix non-string resource in DiscoHawk

src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj

@@ -64,6 +64,7 @@
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
 		<Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" />
 		<Content Include="discohawk.ico" />
+		<EmbeddedResource Include="discohawk.ico" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="About.cs" SubType="Form" />
@@ -74,10 +75,6 @@
 		<EmbeddedResource Update="ComparisonResults.resx" DependentUpon="ComparisonResults.cs" />
 		<Compile Update="MainDiscoForm.cs" SubType="Form" />
 		<Compile Update="MainDiscoForm.Designer.cs" DependentUpon="MainDiscoForm.cs" />
-
-		<EmbeddedResource Remove="MainDiscoForm.resx" />
-<!-- TODO uses non-string
 		<EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" />
--->
 	</ItemGroup>
 </Project>

src/BizHawk.Client.DiscoHawk/MainDiscoForm.Designer.cs

@@ -253,7 +253,6 @@
 			this.Controls.Add(this.lblMagicDragArea);
 			this.Controls.Add(this.ExitButton);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-//			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); //TODO non-string in .resx
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
 			this.Name = "MainDiscoForm";

src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Windows.Forms;
 using System.IO;
 using BizHawk.Common.StringExtensions;
@@ -17,6 +18,7 @@ namespace BizHawk.Client.DiscoHawk
 		public MainDiscoForm()
 		{
 			InitializeComponent();
+			Icon = new Icon(typeof(MainDiscoForm).Assembly.GetManifestResourceStream("BizHawk.Client.DiscoHawk.discohawk.ico") ?? throw new NullReferenceException());
 		}
 
 		private void MainDiscoForm_Load(object sender, EventArgs e)