Added NuSpec for Resources library and incremented the version number…

…s. Updated the build file as well.
Workshell · Jul 7, 2016 · 8fe4b68 · 8fe4b68
1 parent a61012d
commit 8fe4b68
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 15 deletions.
diff --git a/Build/build.bat b/Build/build.bat
@@ -1 +1,2 @@
-..\Tools\nuget pack ..\Src\Workshell.PE\Workshell.PE.csproj -Build -Prop Configuration=Release;
+..\Tools\nuget pack ..\Src\Workshell.PE\Workshell.PE.csproj -Build -Prop Configuration=Release;
+..\Tools\nuget pack ..\Src\Workshell.PE.Resources\Workshell.PE.Resources.csproj -Build -Prop Configuration=Release;
diff --git a/Src/Demo Application/Program.cs b/Src/Demo Application/Program.cs
@@ -22,8 +22,10 @@ static void Main(string[] args)
             //string file_name = Assembly.GetEntryAssembly().Location;
             //string file_name = @"C:\Windows\SysWOW64\kernel32.dll";
             //string file_name = @"C:\Windows\System32\kernel32.dll";
-            string file_name = @"C:\Windows\SysWOW64\shell32.dll";
+            //string file_name = @"C:\Windows\SysWOW64\shell32.dll";
             //string file_name = @"C:\Windows\System32\shell32.dll";
+            string file_name = @"C:\Windows\System32\user32.dll";
+            //string file_name = @"C:\Windows\explorer.exe";
             //string file_name = @"C:\Windows\SysWOW64\xpsservices.dll";
             //string file_name = @"c:\windows\system32\advapi32.dll";
             string error_message;
@@ -37,15 +39,13 @@ static void Main(string[] args)
 
             ExecutableImage image = ExecutableImage.FromFile(file_name);
             Resources resources = Resources.Get(image);
-            ResourceType icon_groups = resources.FirstOrDefault(type => type.Id == ResourceType.RT_GROUP_ICON);
-            Resource group_resource = icon_groups.FirstOrDefault(res => res.Id == 7);
-            IconGroupResource icon_group = IconGroupResource.Load(group_resource, Resource.DEFAULT_LANGUAGE);
-            IconGroupResourceEntry icon_entry = icon_group.FirstOrDefault();
-            ResourceType icons = resources.FirstOrDefault(type => type.Id == ResourceType.RT_ICON);
-            Resource resource = icons.FirstOrDefault(res => res.Id == /*icon_entry.IconId*/105);
-            IconResource icon_resource = IconResource.FromResource(resource, Resource.DEFAULT_LANGUAGE);
-
-            icon_group.Save(@"D:\test.ico", IconGroupFormat.Icon);
+            ResourceType types = resources.First(t => t.Id == ResourceType.RT_BITMAP);
+            Resource resource = types.First(t => t.Id == 32661);
+            BitmapResource bitmap_resource = BitmapResource.Load(resource);
+
+            var x = bitmap_resource.ToBitmap();
+
+            x.Save(@"D:\test.bmp");
 
             //Console.ReadKey();
         }

diff --git a/Src/Workshell.PE.Resources/Properties/AssemblyInfo.cs b/Src/Workshell.PE.Resources/Properties/AssemblyInfo.cs
@@ -59,5 +59,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersion("1.0.0")]
+[assembly: AssemblyVersion("1.1.*")]
+[assembly: AssemblyInformationalVersion("1.1.0")]
diff --git a/Src/Workshell.PE.Resources/Workshell.PE.Resources.nuspec b/Src/Workshell.PE.Resources/Workshell.PE.Resources.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>Workshell.PE.Resources</id>
+        <version>$version$</version>
+        <title>Workshell PE Resource Extentensions</title>
+		<summary>A set of extensions for Workshell PE to help deal with resources.</summary>
+        <description>A set of classes to help deal with resources within an executable such as bitmaps, icons and cursors.</description>
+        <authors>Workshell Ltd</authors>
+		<copyright>Workshell Ltd</copyright>
+        <language>en-US</language>
+        <projectUrl>https://github.com/Workshell/pe</projectUrl>
+        <licenseUrl>https://raw.githubusercontent.com/Workshell/pe/master/license.txt</licenseUrl>
+		<iconUrl>http://img.workshell.co.uk/logo_128.png</iconUrl>
+        <tags>pe executable native resources</tags>
+        <dependencies>
+            <group targetFramework=".NETFramework4.0">
+				<dependency id="Workshell.PE" version="$version$" />
+			</group>
+        </dependencies>
+    </metadata>
+</package>
diff --git a/Src/Workshell.PE/Properties/AssemblyInfo.cs b/Src/Workshell.PE/Properties/AssemblyInfo.cs
@@ -58,8 +58,8 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyInformationalVersion("1.0.0")]
+[assembly: AssemblyVersion("1.1.*")]
+[assembly: AssemblyInformationalVersion("1.1.0")]
 
 #if !SIGNED
 [assembly: InternalsVisibleTo("peres")]