mirror of
https://github.com/wabbajack-tools/wabbajack.git
synced 2024-08-30 18:42:17 +00:00
fix sanity tests
This commit is contained in:
parent
518de4dacc
commit
f06d3102ef
@ -567,5 +567,15 @@ namespace Wabbajack.Common
|
||||
Log(msg);
|
||||
throw new Exception(msg);
|
||||
}
|
||||
|
||||
public static Stream GetResourceStream(string name)
|
||||
{
|
||||
return (from assembly in AppDomain.CurrentDomain.GetAssemblies()
|
||||
where !assembly.IsDynamic
|
||||
from rname in assembly.GetManifestResourceNames()
|
||||
where rname == name
|
||||
select assembly.GetManifestResourceStream(name)).First();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -347,7 +347,7 @@ namespace Wabbajack.Lib
|
||||
private void GenerateReport()
|
||||
{
|
||||
string css = "";
|
||||
using (Stream cssStream = Assembly.GetExecutingAssembly().GetManifestResourceStream("Wabbajack.css-min.css"))
|
||||
using (Stream cssStream = Utils.GetResourceStream("Wabbajack.Lib.css-min.css"))
|
||||
{
|
||||
using (StreamReader reader = new StreamReader(cssStream))
|
||||
{
|
||||
|
@ -1,5 +1,6 @@
|
||||
using Microsoft.WindowsAPICodePack.Dialogs;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
@ -7,6 +8,7 @@ using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using System.Windows.Media.Imaging;
|
||||
using System.Windows.Threading;
|
||||
using Wabbajack.Common;
|
||||
|
||||
namespace Wabbajack.Lib
|
||||
{
|
||||
@ -64,11 +66,7 @@ namespace Wabbajack.Lib
|
||||
{
|
||||
var img = new BitmapImage();
|
||||
img.BeginInit();
|
||||
img.StreamSource =
|
||||
(from assembly in AppDomain.CurrentDomain.GetAssemblies()
|
||||
from rname in assembly.GetManifestResourceNames()
|
||||
where rname == name
|
||||
select assembly.GetManifestResourceStream(name)).First();
|
||||
img.StreamSource = Utils.GetResourceStream(name);
|
||||
img.EndInit();
|
||||
return img;
|
||||
}
|
||||
|
@ -152,6 +152,11 @@
|
||||
<Name>Wabbajack.Common</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="css-min.css" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="css.css" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
@ -337,12 +337,6 @@
|
||||
<ItemGroup>
|
||||
<Resource Include="UI\Icons\wabbajack.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="css.css" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="css-min.css" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="UI\banner.png" />
|
||||
</ItemGroup>
|
||||
|
Loading…
Reference in New Issue
Block a user