Prerelease 4

AA2Install.csproj

@@ -49,7 +49,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Archives\7z.cs" />
-    <Compile Include="Archives\PP.cs" />
     <Compile Include="Configuration.cs" />
     <Compile Include="Console.cs" />
     <Compile Include="formAbout.cs">
@@ -98,31 +97,26 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="tools\x64\7za.dll">
+    <None Include="tools\7z\x64\7za.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="tools\x64\7za.exe">
+    <None Include="tools\7z\x64\7za.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="tools\x64\7zxa.dll">
+    <None Include="tools\7z\x64\7zxa.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="tools\x86_64\7za.exe">
+    <None Include="tools\7z\x86\7za.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="tools\x86_64\7za.dll">
+    <None Include="tools\7z\x86\7za.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="tools\x86_64\7zxa.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="tools\x86_64\AA2Decrypt.exe">
+    <None Include="tools\7z\x86\7zxa.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

Changelog.txt

@@ -1,4 +1,11 @@
-Pre3
+Pre4
++ Injection now supports backups
++ Properly shows progress when injecting
++ Fixed crash when previewing image when installing
++ Injection now (partially) runs on another thread
++ Injection buttons now disable normally
+
+Pre3
 + Imported code from enimaroah/SB3Utility, tweaked to get it to work standalone
 + Memory leaks found in image previews patched
 + .pp direct injection (beta)

Paths.cs

@@ -17,25 +17,15 @@ public static string _7Za
             {
                 if (Environment.Is64BitOperatingSystem)
                 {
-                    return Environment.CurrentDirectory + @"\tools\x64\7za.exe";
+                    return Environment.CurrentDirectory + @"\tools\7z\x64\7za.exe";
                 } 
                 else 
                 {
-                    return Environment.CurrentDirectory + @"\tools\x86_64\7za.exe";
+                    return Environment.CurrentDirectory + @"\tools\7z\x86\7za.exe";
                 }
             }
         }
         /// <summary>
-        /// AA2Decrypt location
-        /// </summary>
-        public static string AA2Decrypt
-        {
-            get
-            {
-                return Environment.CurrentDirectory + @"\tools\x86_64\AA2Decrypt.exe";
-            }
-        }
-        /// <summary>
         /// AA2Play data install location
         /// </summary>
         public static string AA2Play
@@ -104,16 +94,6 @@ public static string MODS
             }
         }
         /// <summary>
-        /// PP non-working directory
-        /// </summary>
-        public static string PP
-        {
-            get
-            {
-                return Environment.CurrentDirectory + @"\PP";
-            }
-        }
-        /// <summary>
         /// PP working directory
         /// </summary>
         public static string WORKING

SB3UtilityPP/SB3UtilityPP.csproj

@@ -18,7 +18,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>