Merge remote-tracking branch 'origin/mw5-support' into mw5-support

# Conflicts:
#	Wabbajack.Test/Wabbajack.Test.csproj
#	Wabbajack/Wabbajack.csproj
This commit is contained in:
Timothy Baldridge 2020-12-16 14:42:45 -07:00
commit 9101ed48f5

View File

@ -62,7 +62,7 @@
<PackageReference Include="System.Reactive" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="5.0.0" />
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
<PackageReference Include="YamlDotNet" Version="8.1.2" />
<PackageReference Include="YamlDotNet" Version="9.1.0" />
</ItemGroup>
<ItemGroup>
<Compile Update="Serialization\PrimitiveHandlers.cs">