RAR5 support

foesmm · Aug 16, 2018 · 4340284 · 4340284
1 parent af3fefb
commit 4340284
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 38 deletions.
diff --git a/ShaderDisasm/ShaderDisasm.vcxproj b/ShaderDisasm/ShaderDisasm.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{F2AC5DA0-5CE0-4C54-A4D1-6B368F81275A}</ProjectGuid>
     <RootNamespace>ShaderDisasm</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -79,9 +79,9 @@
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\DirectX\Include;$(IncludePath)</IncludePath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath);$(DXSDK_DIR)Lib\x86</LibraryPath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\DirectX\Lib\x64;$(LibraryPath)</LibraryPath>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(DXSDK_DIR)\Include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\DirectX\Include;$(IncludePath)</IncludePath>
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\DirectX\Include;$(IncludePath)</IncludePath>
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(DXSDK_DIR)\Lib\x86;$(LibraryPath)</LibraryPath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\DirectX\Lib\x86;$(LibraryPath)</LibraryPath>
     <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\DirectX\Lib\x64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/externals/SevenZipSharp.dll b/externals/SevenZipSharp.dll
diff --git a/flmm/PackageManager/Archive.cs b/flmm/PackageManager/Archive.cs
@@ -221,7 +221,7 @@ public static bool IsArchive(string p_strPath)
           // ReSharper restore UnusedVariable
         }
       }
-      catch (Exception)
+      catch (Exception e)
       {
         booIsAchive = false;
       }

diff --git a/flmm/ProductInfo.cs b/flmm/ProductInfo.cs
@@ -10,6 +10,6 @@ public static class ProductInfo
     public static readonly Guid GUID = new Guid("072C2AEF-16B2-46B7-BA7F-D0CAA7B4F89F");
     public const string ShortName = "FOMM";
     public const string FullName = "Fallout Mod Manager";
-    public const string Version = "0.14.14.3";
+    public const string Version = "0.14.14.4";
   }
 }
diff --git a/flmm/Properties/Settings.Designer.cs b/flmm/Properties/Settings.Designer.cs
diff --git a/flmm/app.config b/flmm/app.config
@@ -2,10 +2,10 @@
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="Fomm.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="Fomm.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="Fomm.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+      <section name="Fomm.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <applicationSettings>
@@ -18,34 +18,34 @@
   <userSettings>
     <Fomm.Properties.Settings>
       <setting name="fallout3LastBSAUnpackPath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="fallout3BSABrowserPanelSplit" serializeAs="String">
         <value>0</value>
       </setting>
       <setting name="LastBuildFOMODFromFolderPath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="fallout3LaunchCommand" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastPFPPath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="LastPFPSourcesPath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="pfpOutputPath" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="fallout3LaunchCommandArgs" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="MainFormPanelSplit" serializeAs="String">
         <value>0</value>
       </setting>
       <setting name="fallout3ModDirectory" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="checkForNewModVersions" serializeAs="String">
         <value>True</value>
@@ -54,10 +54,10 @@
         <value>False</value>
       </setting>
       <setting name="nexusLoginKey" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="nexusUsername" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="PackageManagerPanelSplit" serializeAs="String">
         <value>0</value>
@@ -96,31 +96,31 @@
         <value>False</value>
       </setting>
       <setting name="fallout3WorkingDirectory" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="fallout3DoneSetup" serializeAs="String">
         <value>False</value>
       </setting>
       <setting name="fallout3InstallInfoDirectory" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="migratedFromPre0130" serializeAs="String">
         <value>False</value>
       </setting>
       <setting name="falloutNewVegasModDirectory" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="falloutNewVegasInstallInfoDirectory" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="falloutNewVegasWorkingDirectory" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="falloutNewVegasLaunchCommand" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="falloutNewVegasLaunchCommandArgs" serializeAs="String">
-        <value />
+        <value/>
       </setting>
       <setting name="falloutNewVegasDoneSetup" serializeAs="String">
         <value>False</value>
@@ -155,22 +155,22 @@
     </Fomm.Properties.Settings>
   </userSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
   </startup>
   <appSettings>
-    <add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <add key="EnableWindowsFormsHighDpiAutoResizing" value="true"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
   </appSettings>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
       </providers>
     </roleManager>
   </system.web>
-</configuration>
+</configuration>
diff --git a/flmm/data/7z-32bit.dll b/flmm/data/7z-32bit.dll
diff --git a/flmm/data/7z-64bit.dll b/flmm/data/7z-64bit.dll
diff --git a/flmm/fomm.csproj b/flmm/fomm.csproj
@@ -16,7 +16,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <StartupObject>
     </StartupObject>
@@ -45,6 +45,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\Release\</OutputPath>
@@ -55,6 +56,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -66,6 +68,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -79,6 +82,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
@@ -88,7 +92,7 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\externals\ICSharpCode.TextEditor.dll</HintPath>
     </Reference>
-    <Reference Include="SevenZipSharp, Version=0.64.3890.29348, Culture=neutral, PublicKeyToken=20de82c62b055c88, processorArchitecture=MSIL">
+    <Reference Include="SevenZipSharp, Version=1.1.106.0, Culture=neutral, PublicKeyToken=c8ff6ba0184838bb, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\externals\SevenZipSharp.dll</HintPath>
     </Reference>

diff --git a/fomm.Scripting/app.config b/fomm.Scripting/app.config
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-
 <configuration>
-	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>
+	<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
diff --git a/fomm.Scripting/fomm.Scripting.csproj b/fomm.Scripting/fomm.Scripting.csproj
@@ -15,7 +15,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
@@ -26,6 +26,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>..\Release\</OutputPath>
@@ -35,6 +36,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -46,6 +48,7 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
@@ -58,6 +61,7 @@
     <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
     <CodeAnalysisFailOnMissingRules>true</CodeAnalysisFailOnMissingRules>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/installer/src/fomminstaller.iss b/installer/src/fomminstaller.iss
@@ -8,7 +8,7 @@
 AppId={{072C2AEF-16B2-46B7-BA7F-D0CAA7B4F89F}
 AppName=FOMM
 ;AppVersion=0.14
-AppVerName=FOMM 0.14.14.3
+AppVerName=FOMM 0.14.14.4
 AppPublisher=niveuseverto
 AppPublisherURL=https://foesmm.org/
 AppSupportURL=https://foesmm.org/

diff --git a/xlive/xlive.vcxproj b/xlive/xlive.vcxproj
@@ -14,6 +14,7 @@
     <ProjectGuid>{399F987B-6F9B-44A9-8AC8-BF5711AE8894}</ProjectGuid>
     <RootNamespace>xlive</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">