Better cabinet handling, update version

SabreTools · Jul 19, 2018 · 0cf2b0f · 0cf2b0f
1 parent a3094ef
commit 0cf2b0f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 23 deletions.
diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj
@@ -44,8 +44,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="UnshieldSharp, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UnshieldSharp.1.4.2.1\lib\net461\UnshieldSharp.dll</HintPath>
+    <Reference Include="UnshieldSharp, Version=1.4.2.2, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\UnshieldSharp.1.4.2.2\lib\net461\UnshieldSharp.dll</HintPath>
     </Reference>
     <Reference Include="zlib.net, Version=1.0.3.0, Culture=neutral, PublicKeyToken=47d7877cb3620160">
       <HintPath>..\packages\zlib.net.1.0.4.0\lib\zlib.net.dll</HintPath>

diff --git a/BurnOutSharp/BurnOutSharp.nuspec b/BurnOutSharp/BurnOutSharp.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>BurnOutSharp</id>
-    <version>1.03.7</version>
+    <version>1.03.7.1</version>
     <title>BurnOutSharp</title>
     <authors>Matt Nadareski, Gernot Knippen</authors>
     <owners>Matt Nadareski, Gernot Knippen</owners>
@@ -15,7 +15,7 @@
     <dependencies>
       <dependency id="LessIO" version="0.5.0" />
       <dependency id="libmspack4n" version="0.8.0" />
-      <dependency id="UnshieldSharp" version="1.4.2.1" />
+      <dependency id="UnshieldSharp" version="1.4.2.2" />
     </dependencies>
   </metadata>
   <files>

diff --git a/BurnOutSharp/Properties/AssemblyInfo.cs b/BurnOutSharp/Properties/AssemblyInfo.cs
@@ -32,5 +32,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.03.7")]
-[assembly: AssemblyFileVersion("1.03.7.0")]
+[assembly: AssemblyVersion("1.03.7.1")]
+[assembly: AssemblyFileVersion("1.03.7.1")]
diff --git a/BurnOutSharp/ProtectionFind.cs b/BurnOutSharp/ProtectionFind.cs
@@ -462,6 +462,7 @@ private static string ScanInFile(string file)
             {
                 try
                 {
+                    List<string> protections = new List<string>();
                     string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
                     Directory.CreateDirectory(tempPath);
 
@@ -479,16 +480,17 @@ private static string ScanInFile(string file)
                             catch { }
 
                             if (!String.IsNullOrEmpty(protection))
-                            {
-                                try
-                                {
-                                    Directory.Delete(tempPath, true);
-                                }
-                                catch { }
-                                return protection;
-                            }
+                                protections.Add(protection);
                         }
                     }
+
+                    try
+                    {
+                        Directory.Delete(tempPath, true);
+                    }
+                    catch { }
+
+                    return string.Join(", ", protections);
                 }
                 catch { }
             }
@@ -498,6 +500,7 @@ private static string ScanInFile(string file)
             {
                 try
                 {
+                    List<string> protections = new List<string>();
                     string tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
                     Directory.CreateDirectory(tempPath);
 
@@ -510,15 +513,16 @@ private static string ScanInFile(string file)
                         File.Delete(tempfile);
 
                         if (!String.IsNullOrEmpty(protection))
-                        {
-                            try
-                            {
-                                Directory.Delete(tempPath, true);
-                            }
-                            catch { }
-                            return protection;
-                        }
+                            protections.Add(protection);
+                    }
+
+                    try
+                    {
+                        Directory.Delete(tempPath, true);
                     }
+                    catch { }
+
+                    return string.Join(", ", protections);
                 }
                 catch { }
             }

diff --git a/BurnOutSharp/packages.config b/BurnOutSharp/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="LessIO" version="0.5.0" targetFramework="net461" />
   <package id="libmspack4n" version="0.8.0" targetFramework="net461" />
-  <package id="UnshieldSharp" version="1.4.2.1" targetFramework="net461" />
+  <package id="UnshieldSharp" version="1.4.2.2" targetFramework="net461" />
   <package id="zlib.net" version="1.0.4.0" targetFramework="net461" />
 </packages>