Embeded dlls

Author: Xicy

TumblrThemeSelect/Loader.cs

@@ -2,40 +2,41 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using RestSharp.Extensions;
+
 
 namespace TumblrThemeSelect
 {
-    public class Loader
+    public static class Loader
     {
         [STAThread]
         public static void Main()
         {
-            AppDomain.CurrentDomain.AssemblyResolve += OnResolveAssembly;
+            var executingAssembly = Assembly.GetExecutingAssembly();
+            var assemblies = executingAssembly.GetManifestResourceNames().Where(n => n.EndsWith(".dll")).ToDictionary(n => n, n => Assembly.Load(executingAssembly.GetManifestResourceStream(n).ReadAsBytes()));
+
+            AppDomain.CurrentDomain.AssemblyResolve += (s, e) =>
+            {
+                return assemblies.FirstOrDefault(kv => kv.Key == $"{new AssemblyName(e.Name).Name}.dll").Value;
+            };
 
             App.Main();
         }
 
-        private static Assembly OnResolveAssembly(object sender, ResolveEventArgs e)
+        public static byte[] ReadAsBytes(this Stream input)
         {
-            var thisAssembly = Assembly.GetExecutingAssembly();
-
-            var resources = thisAssembly.GetManifestResourceNames().Where(s => s.EndsWith(new AssemblyName(e.Name).Name + ".dll"));
-
-            if (!resources.Any()) return null;
-
-            try
+            var array = new byte[16384];
+            byte[] result;
+            using (var memoryStream = new MemoryStream())
             {
-                return Assembly.Load(thisAssembly.GetManifestResourceStream(resources.First()).ReadAsBytes());
-            }
-            catch (IOException)
-            {
-                return null;
-            }
-            catch (BadImageFormatException)
-            {
-                return null;
+                int count;
+                while ((count = input.Read(array, 0, array.Length)) > 0)
+                {
+                    memoryStream.Write(array, 0, count);
+                }
+                result = memoryStream.ToArray();
             }
+            return result;
         }
+
     }
 }

TumblrThemeSelect/TumblrThemeSelect.csproj

@@ -81,9 +81,11 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json">
       <HintPath>Embeded\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="RestSharp">
       <HintPath>Embeded\RestSharp.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Runtime.Serialization" />
@@ -97,6 +99,7 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="Xceed.Wpf.Toolkit">
       <HintPath>Embeded\Xceed.Wpf.Toolkit.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -156,25 +159,27 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Embeded\Newtonsoft.Json.dll" />
-    <EmbeddedResource Include="Embeded\RestSharp.dll" />
-    <EmbeddedResource Include="Embeded\Xceed.Wpf.Toolkit.dll" />
+    <None Include="Embeded\Newtonsoft.Json.dll" />
+    <None Include="Embeded\RestSharp.dll" />
+    <None Include="Embeded\Xceed.Wpf.Toolkit.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
-  <Target Name="AfterBuild">
-  </Target>
   -->
   <Target Name="AfterResolveReferences">
     <ItemGroup>
       <EmbeddedResource Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Extension)' == '.dll'">
-        <LogicalName>%(ReferenceCopyLocalPaths.DestinationSubDirectory)%(ReferenceCopyLocalPaths.Filename)%(ReferenceCopyLocalPaths.Extension)   
-            </LogicalName>
+        <LogicalName>%(ReferenceCopyLocalPaths.DestinationSubDirectory)%(ReferenceCopyLocalPaths.Filename)%(ReferenceCopyLocalPaths.Extension)</LogicalName>
       </EmbeddedResource>
     </ItemGroup>
   </Target>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+	<ItemGroup>
+        <FilesToDelete Include="$(OutDir)\*.dll"/>
+    </ItemGroup>   
+    <Delete Files="@(FilesToDelete)" />   
+  </Target>
 </Project>