From 83e83d35cc1230ddbcdd2c6d58222eba1abae31b Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 3 May 2020 08:20:43 +1000
Subject: [PATCH] Retarget BizHawk.Client.Common to .NET Standard 2.0

---
 .../BizHawk.Client.Common.csproj              | 28 ++++---------------
 BizHawk.Client.Common/movie/bk2/StringLogs.cs |  2 +-
 .../rewind/StreamBlobDatabase.cs              |  2 +-
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 61dd25d302..ac1db87a61 100644
--- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -2,38 +2,22 @@
 	<Import Project="$(SolutionDir)MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<TargetFramework>net48</TargetFramework>
+		<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. -->
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-		<Reference Include="Microsoft.CSharp" />
-		<!--<Reference Include="System" />-->
-		<!--<Reference Include="System.Core" />-->
-		<!--<Reference Include="System.Data" />-->
-		<!--<Reference Include="System.Data.DataSetExtensions" />-->
-		<Reference Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64">
-			<SpecificVersion>False</SpecificVersion>
-			<HintPath>$(SolutionDir)References/x64/SQLite/System.Data.SQLite.dll</HintPath>
-		</Reference>
-		<!--<Reference Include="System.Drawing" />-->
-		<Reference Include="System.IO.Compression" />
-		<!--<Reference Include="System.Windows.Forms" />-->
-		<!--<Reference Include="System.Xml" />-->
-		<!--<Reference Include="System.Xml.Linq" />-->
-	</ItemGroup>
-	<ItemGroup>
+		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="All" /><!-- for (extra?) dynamic type support -->
+		<Reference Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64"
+			SpecificVersion="False"
+			HintPath="$(SolutionDir)References/x64/SQLite/System.Data.SQLite.dll" />
+		<PackageReference Include="System.Drawing.Common" Version="4.7.0" PrivateAssets="All" />
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" />
 		<Reference Include="NLua"
 			HintPath="$(SolutionDir)output/dll/nlua/NLua.dll"
 			Private="False" />
 		<PackageReference Include="SharpCompress" Version="0.24.0" PrivateAssets="All" />
 		<PackageReference Include="SharpZipLib" Version="1.1.0" PrivateAssets="All" />
-	</ItemGroup>
-	<ItemGroup>
 		<ProjectReference Include="$(SolutionDir)BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
 		<ProjectReference Include="$(SolutionDir)Bizware/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
-	</ItemGroup>
-	<ItemGroup>
 		<Compile Include="$(SolutionDir)Version/svnrev.cs" />
 		<Compile Include="$(SolutionDir)Version/VersionInfo.cs" />
 	</ItemGroup>
diff --git a/BizHawk.Client.Common/movie/bk2/StringLogs.cs b/BizHawk.Client.Common/movie/bk2/StringLogs.cs
index fad0c457af..83351c2fe9 100644
--- a/BizHawk.Client.Common/movie/bk2/StringLogs.cs
+++ b/BizHawk.Client.Common/movie/bk2/StringLogs.cs
@@ -110,7 +110,7 @@ namespace BizHawk.Client.Common
 			if (disk)
 			{
 				var path = TempFileManager.GetTempFilename("movieOnDisk");
-				_stream = new FileStream(path, FileMode.Create, FileSystemRights.FullControl, FileShare.None, 4 * 1024, FileOptions.DeleteOnClose);
+				_stream = new FileStream(path, FileMode.Create, FileAccess.ReadWrite, FileShare.None, 4 * 1024, FileOptions.DeleteOnClose);
 			}
 			else
 			{
diff --git a/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs b/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs
index c12abe4690..fb7f80e36d 100644
--- a/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs
+++ b/BizHawk.Client.Common/rewind/StreamBlobDatabase.cs
@@ -30,7 +30,7 @@ namespace BizHawk.Client.Common
 				// I checked the DeleteOnClose operation to make sure it cleans up when the process is aborted, and it seems to.
 				// Otherwise we would have a more complex tempfile management problem here.
 				// 4KB buffer chosen due to similarity to .net defaults, and fear of anything larger making hiccups for small systems (we could try asyncing this stuff though...)
-				Stream = new FileStream(path, FileMode.Create, System.Security.AccessControl.FileSystemRights.FullControl, FileShare.None, 4 * 1024, FileOptions.DeleteOnClose);
+				Stream = new FileStream(path, FileMode.Create, FileAccess.ReadWrite, FileShare.None, 4 * 1024, FileOptions.DeleteOnClose);
 			}
 			else
 			{