Merge remote-tracking branch 'origin/master'

This commit is contained in:
Timothy Baldridge 2021-02-23 20:55:26 -07:00
commit 4a350951c3
3 changed files with 22 additions and 8 deletions

View File

@ -101,13 +101,9 @@ namespace Compression.BSA
file.FullPath = Encoding.UTF8.GetString(_rdr.ReadBytes(_rdr.ReadInt16()));
}
Files = files;
}
public async ValueTask DisposeAsync()
{
_stream?.Dispose();
_rdr?.Dispose();
_rdr.Dispose();
}
public IEnumerable<IFile> Files { get; private set; }

View File

@ -164,8 +164,7 @@ namespace Wabbajack.Common
public static bool operator ==(Extension a, Extension b)
{
// Super fast comparison because extensions are interned
return ReferenceEquals(a._extension, b._extension);
return string.Equals(a._extension, b._extension, StringComparison.CurrentCultureIgnoreCase);
}
public static bool operator !=(Extension a, Extension b)

View File

@ -42,6 +42,25 @@ namespace Wabbajack.Test
await utils.VerifyInstalledFile(mod, @"Data\scripts\test.pex");
}
[Fact]
public async Task TestCacheFileAreIgnored()
{
var profile = utils.AddProfile();
var mod = await utils.AddMod();
var testCache = await utils.AddModFile(mod, @"Data\scripts\test.cache", 10);
var testPex = await utils.AddModFile(mod, @"Data\scripts\test.pex", 10);
await utils.Configure();
await utils.AddManualDownload(
new Dictionary<string, byte[]> {{"/baz/biz.pex", await testPex.ReadAllBytesAsync()}});
await CompileAndInstall(profile);
await utils.VerifyInstalledFile(mod, @"Data\scripts\test.pex");
}
[Fact]
public async Task ExtraFilesInDownloadFolderDontStopCompilation()
{