diff --git a/Wabbajack.Common/Utils.cs b/Wabbajack.Common/Utils.cs
index e0cf700d..ba911dc9 100644
--- a/Wabbajack.Common/Utils.cs
+++ b/Wabbajack.Common/Utils.cs
@@ -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();
+ }
+
}
}
\ No newline at end of file
diff --git a/Wabbajack.Lib/Compiler.cs b/Wabbajack.Lib/Compiler.cs
index a6f5a90d..9f4ed5f7 100644
--- a/Wabbajack.Lib/Compiler.cs
+++ b/Wabbajack.Lib/Compiler.cs
@@ -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))
{
diff --git a/Wabbajack.Lib/UI/UIUtils.cs b/Wabbajack.Lib/UI/UIUtils.cs
index 576d137c..ee7ad62e 100644
--- a/Wabbajack.Lib/UI/UIUtils.cs
+++ b/Wabbajack.Lib/UI/UIUtils.cs
@@ -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;
}
diff --git a/Wabbajack.Lib/Wabbajack.Lib.csproj b/Wabbajack.Lib/Wabbajack.Lib.csproj
index 7effe0ec..9c311b55 100644
--- a/Wabbajack.Lib/Wabbajack.Lib.csproj
+++ b/Wabbajack.Lib/Wabbajack.Lib.csproj
@@ -152,6 +152,11 @@
Wabbajack.Common
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Wabbajack/css-min.css b/Wabbajack.Lib/css-min.css
similarity index 100%
rename from Wabbajack/css-min.css
rename to Wabbajack.Lib/css-min.css
diff --git a/Wabbajack/css.css b/Wabbajack.Lib/css.css
similarity index 100%
rename from Wabbajack/css.css
rename to Wabbajack.Lib/css.css
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index 4b58455a..0576a319 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -337,12 +337,6 @@
-
-
-
-
-
-