From ae9135807149586b6d57e4d222412c7e87636f8c Mon Sep 17 00:00:00 2001 From: YoshiRulz <OSSYoshiRulz@gmail.com> Date: Tue, 25 Jan 2022 17:11:52 +1000 Subject: [PATCH] Fix dependency problem and upgrade `SharpCompress` --- src/BizHawk.Client.Common/BizHawk.Client.Common.csproj | 2 +- src/BizHawk.Common/BizHawk.Common.csproj | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj index f3db45b2a2..2a2627f62c 100644 --- a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj +++ b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj @@ -10,7 +10,7 @@ <ItemGroup> <Reference Include="NLua, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL" SpecificVersion="false" HintPath="$(ProjectDir)../../Assets/dll/nlua/NLua.dll" Private="false" /><!-- don't copy, will be copied with Assets --> <Reference Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64" SpecificVersion="False" HintPath="$(ProjectDir)../../References/x64/SQLite/System.Data.SQLite.dll" Private="true" /> - <PackageReference Include="SharpCompress" Version="0.26.0" /><!-- can't upgrade as newer versions transitively depend on incompatible version of System.Runtime.CompilerServices.Unsafe --> + <PackageReference Include="SharpCompress" Version="0.30.1" /> <ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" /> <ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" /> <EmbeddedResource Include="Resources/**/*" /> diff --git a/src/BizHawk.Common/BizHawk.Common.csproj b/src/BizHawk.Common/BizHawk.Common.csproj index 6f7d5c70a9..0302730688 100644 --- a/src/BizHawk.Common/BizHawk.Common.csproj +++ b/src/BizHawk.Common/BizHawk.Common.csproj @@ -10,6 +10,7 @@ <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.Memory" Version="4.5.4" /> <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" PrivateAssets="all" /> + <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" /> <PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" /> <PackageReference Include="Menees.Analyzers" Version="2.0.4" Condition=" '$(MachineRunAnalyzersDuringBuild)' != '' " /> <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.333" Condition=" '$(MachineRunAnalyzersDuringBuild)' != '' " />