Multi-target .NET Framework 4.8 and .NET 8

Common.props

@@ -13,7 +13,7 @@
 		<ErrorReport>prompt</ErrorReport>
 		<Features>strict</Features>
 		<IsTargetingNetFramework>$(TargetFramework.StartsWith("net4"))</IsTargetingNetFramework>
-		<LangVersion>10.0</LangVersion>
+		<LangVersion>12.0</LangVersion>
 		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 		<NoWarn>SA0001</NoWarn>
 		<Nullable>enable</Nullable>
@@ -27,8 +27,7 @@
 		<Optimize>false</Optimize>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-		<DebugSymbols>false</DebugSymbols>
-		<DebugType>portable</DebugType>
+		<DebugType>none</DebugType>
 		<DefineConstants>TRACE</DefineConstants>
 		<Optimize>true</Optimize>
 		<PathMap>$(MSBuildProjectDirectory)=${$(MSBuildProjectName)}/</PathMap>

Directory.Packages.props

@@ -28,7 +28,7 @@
 		<PackageVersion Include="Silk.NET.OpenGL.Legacy" Version="2.18.0" />
 		<PackageVersion Include="SQLitePCLRaw.provider.e_sqlite3" Version="2.1.8" />
 		<PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.435" /><!-- don't forget to update .stylecop.json at the same time -->
-		<PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
+		<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
 		<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
 		<PackageVersion Include="System.Drawing.Common" Version="6.0.0" />
 		<PackageVersion Include="System.Memory" Version="4.5.5" />

src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net48</TargetFramework>
+		<TargetFrameworks>net48;net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>

src/BizHawk.BizInvoke/BizInvoker.cs

@@ -600,7 +600,7 @@ private static ParameterLoadInfo EmitParamterLoad(ILGenerator il, int idx, Type
 				il.Emit(OpCodes.Brfalse, isNull);
 
 				var encoding = il.DeclareLocal(typeof(Encoding), false);
-				il.EmitCall(OpCodes.Call, typeof(Encoding).GetProperty("UTF8")!.GetGetMethod(), Type.EmptyTypes);
+				il.EmitCall(OpCodes.Call, typeof(Encoding).GetProperty("UTF8")!.GetGetMethod()!, Type.EmptyTypes);
 				il.Emit(OpCodes.Stloc, encoding);
 
 				var strlenbytes = il.DeclareLocal(typeof(int), false);
@@ -632,7 +632,7 @@ private static ParameterLoadInfo EmitParamterLoad(ILGenerator il, int idx, Type
 				il.Emit(OpCodes.Add);
 				// charcount
 				il.Emit(OpCodes.Ldloc, strval);
-				il.Emit(OpCodes.Call, typeof(string).GetProperty("Length")!.GetGetMethod());
+				il.Emit(OpCodes.Call, typeof(string).GetProperty("Length")!.GetGetMethod()!);
 				// bytes
 				il.Emit(OpCodes.Ldloc, bytes);
 				// bytelength

src/BizHawk.BizInvoke/BizInvokerUtilities.cs

@@ -58,7 +58,7 @@ private class CF
 		/// </summary>
 		/// <returns></returns>
 		public static int ComputeClassFirstFieldOffset()
-			=> ComputeFieldOffset(typeof(CF).GetField("FirstField"));
+			=> ComputeFieldOffset(typeof(CF).GetField("FirstField")!);
 
 		/// <summary>
 		/// Compute the byte offset of the first byte of string data (UTF16) relative to a pointer to the string.

src/BizHawk.BizInvoke/CallingConventionAdapter.cs

@@ -144,7 +144,7 @@ private class WaterboxAdapter : ICallingConventionAdapter
 		{
 			private class ReferenceEqualityComparer : IEqualityComparer<Delegate>
 			{
-				public bool Equals(Delegate x, Delegate y)
+				public bool Equals(Delegate? x, Delegate? y)
 					=> x == y;
 
 				public int GetHashCode(Delegate obj)

src/BizHawk.Bizware.Audio/BizHawk.Bizware.Audio.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>

src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>

src/BizHawk.Bizware.Graphics.Controls/BizHawk.Bizware.Graphics.Controls.csproj

@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net48</TargetFramework>
+		<TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Nullable>disable</Nullable>
+		<UseWindowsForms>true</UseWindowsForms>
+		<EnableWindowsTargeting>true</EnableWindowsTargeting>
 	</PropertyGroup>
 	<ItemGroup>
-		<Reference Include="System.Windows.Forms" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
 	</ItemGroup>
 </Project>

src/BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>

src/BizHawk.Bizware.Input/BizHawk.Bizware.Input.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>

src/BizHawk.Client.Common/Api/Classes/CommApi.cs

@@ -20,6 +20,6 @@ public sealed class CommApi : ICommApi
 
 		public string? HttpTest() => HTTP == null ? null : string.Join("\n", HttpTestGet(), HTTP.SendScreenshot(), "done testing");
 
-		public string? HttpTestGet() => HTTP?.Get(HTTP.GetUrl)?.Result;
+		public string? HttpTestGet() => HttpCommunication.Get(HTTP?.GetUrl)?.Result;
 	}
 }

src/BizHawk.Client.Common/Api/ClientWebSocketWrapper.cs

@@ -32,12 +32,12 @@ public Task Close(WebSocketCloseStatus closeStatus, string statusDescription, Ca
 			return task;
 		}
 
-		/// <summary>calls <see cref="ClientWebSocket.ReceiveAsync"/></summary>
+		/// <summary>calls <see cref="ClientWebSocket.ReceiveAsync(System.ArraySegment{byte}, CancellationToken)"/></summary>
 		public Task<WebSocketReceiveResult> Receive(ArraySegment<byte> buffer, CancellationToken? cancellationToken = null)
 			=> _w?.ReceiveAsync(buffer, cancellationToken ?? CancellationToken.None)
 				?? throw new ObjectDisposedException(nameof(_w));
 
-		/// <summary>calls <see cref="ClientWebSocket.ReceiveAsync"/></summary>
+		/// <summary>calls <see cref="ClientWebSocket.ReceiveAsync(System.ArraySegment{byte}, CancellationToken)"/></summary>
 		public string Receive(int bufferCap, CancellationToken? cancellationToken = null)
 		{
 			if (_w == null) throw new ObjectDisposedException(nameof(_w));
@@ -46,12 +46,12 @@ public string Receive(int bufferCap, CancellationToken? cancellationToken = null
 			return Encoding.UTF8.GetString(buffer, 0, result.Count);
 		}
 
-		/// <summary>calls <see cref="ClientWebSocket.SendAsync"/></summary>
+		/// <summary>calls <see cref="ClientWebSocket.SendAsync(System.ArraySegment{byte}, WebSocketMessageType, bool, CancellationToken)"/></summary>
 		public Task Send(ArraySegment<byte> buffer, WebSocketMessageType messageType, bool endOfMessage, CancellationToken? cancellationToken = null)
 			=> _w?.SendAsync(buffer, messageType, endOfMessage, cancellationToken ?? CancellationToken.None)
 				?? throw new ObjectDisposedException(nameof(_w));
 
-		/// <summary>calls <see cref="ClientWebSocket.SendAsync"/></summary>
+		/// <summary>calls <see cref="ClientWebSocket.SendAsync(System.ArraySegment{byte}, WebSocketMessageType, bool, CancellationToken)"/></summary>
 		public Task Send(string message, bool endOfMessage, CancellationToken? cancellationToken = null)
 		{
 			if (_w == null) throw new ObjectDisposedException(nameof(_w));

src/BizHawk.Client.Common/Api/DisplaySurfaceID.cs

@@ -15,7 +15,7 @@ public enum DisplaySurfaceID : int
 	public static class DisplaySurfaceIDParser
 	{
 #pragma warning disable BHI1005 // switching on string, possibly from user input, ArgumentException is correct here
-		[return: NotNullIfNotNull("str")]
+		[return: NotNullIfNotNull(nameof(str))]
 		public static DisplaySurfaceID? Parse(string? str) => str?.ToLowerInvariant() switch
 		{
 			null => null, // this makes it easy to cascade the "remembered" value

src/BizHawk.Client.Common/Api/HttpCommunication.cs

@@ -7,7 +7,7 @@ namespace BizHawk.Client.Common
 {
 	public sealed class HttpCommunication
 	{
-		private readonly HttpClient _client = new HttpClient();
+		public static readonly HttpClient Client = new HttpClient();
 
 		private readonly Func<byte[]> _takeScreenshotCallback;
 
@@ -33,24 +33,24 @@ public string ExecPost(string url = null, string payload = "") => Post(
 			new FormUrlEncodedContent(new Dictionary<string, string> { ["payload"] = payload })
 		).Result;
 
-		public async Task<string> Get(string url)
+		public static async Task<string> Get(string url)
 		{
-			_client.DefaultRequestHeaders.ConnectionClose = false;
-			var response = await _client.GetAsync(url).ConfigureAwait(false);
+			Client.DefaultRequestHeaders.ConnectionClose = false;
+			var response = await Client.GetAsync(url).ConfigureAwait(false);
 			if (response.IsSuccessStatusCode)
 			{
 				return await response.Content.ReadAsStringAsync();
 			}
 			return null;
 		}
 
-		public async Task<string> Post(string url, FormUrlEncodedContent content)
+		public static async Task<string> Post(string url, FormUrlEncodedContent content)
 		{
-			_client.DefaultRequestHeaders.ConnectionClose = true;
+			Client.DefaultRequestHeaders.ConnectionClose = true;
 			HttpResponseMessage response;
 			try
 			{
-				response = await _client.PostAsync(url, content).ConfigureAwait(false);
+				response = await Client.PostAsync(url, content).ConfigureAwait(false);
 			}
 			catch (Exception e)
 			{
@@ -87,7 +87,7 @@ public void SetTimeout(int timeout)
 
 			if (timeout != 0)
 			{
-				_client.Timeout = new TimeSpan(0, 0, 0, timeout / 1000, timeout % 1000);
+				Client.Timeout = new TimeSpan(0, 0, 0, timeout / 1000, timeout % 1000);
 				Timeout = timeout;
 			}
 		}

src/BizHawk.Client.Common/BizHawk.Client.Common.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework><!-- some NuGet packages aren't for Standard, and are only loaded at runtime because EmuHawk is still Framework. More work will be required to move to Core. -->
+		<TargetFrameworks>netstandard2.0;net8.0-windows</TargetFrameworks><!-- some NuGet packages aren't for Standard, and are only loaded at runtime because EmuHawk is still Framework. More work will be required to move to Core. -->
 	</PropertyGroup>
 	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>

src/BizHawk.Client.Common/rewind/ZeldaWinder.cs

@@ -291,7 +291,11 @@ private void MaybeResize(int requestedSize)
 					_dest = replacement;
 				}
 			}
+#if NET6_0_OR_GREATER
+			public override void Write(ReadOnlySpan<byte> buffer)
+#else
 			public void Write(ReadOnlySpan<byte> buffer)
+#endif
 			{
 				var requestedSize = _position + buffer.Length;
 				MaybeResize(requestedSize);
@@ -305,7 +309,11 @@ public override void WriteByte(byte value)
 				_dest[_position] = value;
 				_position = requestedSize;
 			}
+#if NET6_0_OR_GREATER
+			public override int Read(Span<byte> buffer) => throw new IOException();
+#else
 			public int Read(Span<byte> buffer) => throw new IOException();
+#endif
 		}
 	}
 }

src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs

@@ -142,7 +142,7 @@ private int ComputeIdealRewindInterval()
 			{
 				return 1; // shrug
 			}
-			
+
 			if (_fixedRewindInterval)
 			{
 				return _targetRewindInterval;
@@ -438,14 +438,22 @@ public override void Flush() {}
 			public override int Read(byte[] buffer, int offset, int count) => throw new IOException();
 			public override long Seek(long offset, SeekOrigin origin) => throw new IOException();
 			public override void SetLength(long value) => throw new IOException();
+#if NET6_0_OR_GREATER
+			public override int Read(Span<byte> buffer) => throw new IOException();
+#else
 			public int Read(Span<byte> buffer) => throw new IOException();
+#endif
 
 			public override void Write(byte[] buffer, int offset, int count)
 			{
 				Write(new ReadOnlySpan<byte>(buffer, offset, count));
 			}
 
+#if NET6_0_OR_GREATER
+			public override void Write(ReadOnlySpan<byte> buffer)
+#else
 			public void Write(ReadOnlySpan<byte> buffer)
+#endif
 			{
 				long requestedSize = _position + buffer.Length;
 				while (requestedSize > _notifySize)
@@ -521,7 +529,11 @@ public override int Read(byte[] buffer, int offset, int count)
 				return Read(new Span<byte>(buffer, offset, count));
 			}
 
+#if NET6_0_OR_GREATER
+			public override int Read(Span<byte> buffer)
+#else
 			public int Read(Span<byte> buffer)
+#endif
 			{
 				long n = Math.Min(_size - _position, buffer.Length);
 				int ret = (int)n;
@@ -572,7 +584,11 @@ public override int ReadByte()
 			public override void SetLength(long value) => throw new IOException();
 			public override void Write(byte[] buffer, int offset, int count) => throw new IOException();
 
+#if NET6_0_OR_GREATER
+			public override void Write(ReadOnlySpan<byte> buffer) => throw new IOException();
+#else
 			public void Write(ReadOnlySpan<byte> buffer) => throw new IOException();
+#endif
 		}
 	}
 }

src/BizHawk.Client.Common/tools/Watch/WatchList/WatchList.cs

@@ -149,7 +149,7 @@ public void Insert(int index, Watch watch)
 		/// </param>
 		public void InsertRange(int index, IEnumerable<Watch> collection)
 		{
-#if NET6_0
+#if NET6_0_OR_GREATER
 			if (collection.TryGetNonEnumeratedCount(out var n) && n is 0) return;
 #else
 			if (collection is ICollection<Watch> hasCount && hasCount.Count is 0) return;

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

@@ -1,27 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net48</TargetFramework>
+		<TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<Import Project="../MainSlnExecutable.props" />
 	<PropertyGroup>
 		<ApplicationIcon>discohawk.ico</ApplicationIcon>
 		<Nullable>disable</Nullable>
+		<UseWindowsForms>true</UseWindowsForms>
+		<EnableWindowsTargeting>true</EnableWindowsTargeting>
 	</PropertyGroup>
 	<ItemGroup>
-		<Reference Include="System.Windows.Forms" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
 		<Content Include="discohawk.ico" />
 		<EmbeddedResource Include="discohawk.ico" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="About.cs" SubType="Form" />
-		<Compile Update="About.Designer.cs" DependentUpon="About.cs" />
-		<EmbeddedResource Update="About.resx" DependentUpon="About.cs" />
 		<Compile Update="ComparisonResults.cs" SubType="Form" />
-		<Compile Update="ComparisonResults.Designer.cs" DependentUpon="ComparisonResults.cs" />
-		<EmbeddedResource Update="ComparisonResults.resx" DependentUpon="ComparisonResults.cs" />
 		<Compile Update="MainDiscoForm.cs" SubType="Form" />
-		<Compile Update="MainDiscoForm.Designer.cs" DependentUpon="MainDiscoForm.cs" />
-		<EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" />
 	</ItemGroup>
 </Project>

src/BizHawk.Client.EmuHawk/AVOut/FFmpegDownloaderForm.cs

@@ -160,4 +160,3 @@ private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
 		}
 	}
 }
-

src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net48</TargetFramework>
+		<TargetFrameworks>net48;net8.0-windows</TargetFrameworks>
 	</PropertyGroup>
 	<Import Project="../MainSlnExecutable.props" />
 	<PropertyGroup>
@@ -9,11 +9,12 @@
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<Nullable>disable</Nullable>
 		<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+		<UseWindowsForms>true</UseWindowsForms>
+		<EnableWindowsTargeting>true</EnableWindowsTargeting>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="System.Net.Http" />
-		<Reference Include="System.Windows.Forms" />
-		<Reference Include="System.IO.Compression" />
+		<Reference Condition="$(IsTargetingNetFramework)" Include="System.IO.Compression" />
 	</ItemGroup>
 	<ItemGroup>
 		<Reference Include="PcxFileTypePlugin.HawkQuantizer" HintPath="$(ProjectDir)../../References/PcxFileTypePlugin.HawkQuantizer.dll" Private="true" />

src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs

@@ -31,13 +31,15 @@ public static void PopulateFromEnum<T>(this ComboBox box, T enumVal)
 			box.SelectedItem = enumVal.GetDescription();
 		}
 
+#if !NET6_0_OR_GREATER
 		/// <summary>extension method to make <see cref="Control.Invoke(Delegate)"/> easier to use</summary>
 		public static void Invoke(this Control control, Action action)
 			=> control.Invoke(action);
 
 		/// <summary>extension method to make <see cref="Control.BeginInvoke(Delegate)"/> easier to use</summary>
 		public static void BeginInvoke(this Control control, Action action)
 			=> control.BeginInvoke(action);
+#endif
 
 		public static ToolStripMenuItem ToColumnsMenu(this InputRoll inputRoll, Action changeCallback)
 		{