ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Retarget BizHawk.Client.Common to .NET Standard 2.0

This commit is contained in:
YoshiRulz 2020-05-03 08:20:43 +10:00
parent 03f678de9d
commit 83e83d35cc
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
BizHawk.Client.Common/BizHawk.Client.Common.csproj
View File

@ -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>

2
BizHawk.Client.Common/movie/bk2/StringLogs.cs
View File

@ -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
{

2
BizHawk.Client.Common/rewind/StreamBlobDatabase.cs
View File

@ -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
{