Update MEM, now moves .mem files to the staging directory rather than…

… output as MEM now can integrate other .mem files.
ME3Tweaks · Jul 3, 2017 · 6e4e5d2 · 6e4e5d2
1 parent c52ab1a
commit 6e4e5d2
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 30 deletions.
diff --git a/AlotAddOnGUI.sln b/AlotAddOnGUI.sln
@@ -1,20 +1,20 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.14
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlotAddOnGUI", "AlotAddOnGUI\AlotAddOnGUI.csproj", "{C091BEC9-74DD-46DA-9452-24125BCF573B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
+		Debug|x64 = Debug|x64
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C091BEC9-74DD-46DA-9452-24125BCF573B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C091BEC9-74DD-46DA-9452-24125BCF573B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C091BEC9-74DD-46DA-9452-24125BCF573B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C091BEC9-74DD-46DA-9452-24125BCF573B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C091BEC9-74DD-46DA-9452-24125BCF573B}.Debug|x64.ActiveCfg = Debug|x64
+		{C091BEC9-74DD-46DA-9452-24125BCF573B}.Debug|x64.Build.0 = Debug|x64
+		{C091BEC9-74DD-46DA-9452-24125BCF573B}.Release|x64.ActiveCfg = Release|x64
+		{C091BEC9-74DD-46DA-9452-24125BCF573B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/AlotAddOnGUI/AlotAddOnGUI.csproj b/AlotAddOnGUI/AlotAddOnGUI.csproj
@@ -30,30 +30,31 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+  <PropertyGroup>
+    <ApplicationIcon>ALOTADDON.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>ALOTADDON.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">

diff --git a/AlotAddOnGUI/MainWindow.xaml.cs b/AlotAddOnGUI/MainWindow.xaml.cs
@@ -173,6 +173,8 @@ private void RunUpdater()
                 }
                 catch (Exception) { }
             });
+            //pipe.SendText("START_UPDATE_CHECK Mgamerz AlotAddOnGUI 1.0.0.0");
+
             pipe.SendText("START_UPDATE_CHECK Mgamerz AlotAddOnGUI " + System.Reflection.Assembly.GetEntryAssembly().GetName().Version);
         }
 
@@ -648,6 +650,8 @@ private async void Button_InstallME2_Click(object sender, RoutedEventArgs e)
 
         private bool ExtractAddon(AddonFile af)
         {
+            string stagingdirectory = System.AppDomain.CurrentDomain.BaseDirectory + MEM_STAGING_DIR + "\\";
+
             string prefix = "[" + Path.GetFileNameWithoutExtension(af.Filename) + "] ";
             Log.Information(prefix + "Processing extraction on " + af.Filename);
             string fileextension = System.IO.Path.GetExtension(af.Filename);
@@ -703,11 +707,11 @@ private bool ExtractAddon(AddonFile af)
                                 foreach (string memfile in memfiles)
 
                                 {
-                                    Log.Information("-- Subtask: Move MEM file to output directory" + memfile);
+                                    Log.Information("-- Subtask: Move MEM file to staging directory" + memfile);
 
                                     string name = Path.GetFileNameWithoutExtension(memfile);
                                     string ext = Path.GetExtension(memfile);
-                                    File.Copy(memfile, EXE_DIRECTORY + MEM_OUTPUT_DIR + "\\" + name + " - ME" + CURRENT_GAME_BUILD + ext, true);
+                                    File.Copy(memfile, stagingdirectory + "\\" + name + " - ME" + CURRENT_GAME_BUILD + ext, true);
                                 }
                             }
 

diff --git a/AlotAddOnGUI/Properties/AssemblyInfo.cs b/AlotAddOnGUI/Properties/AssemblyInfo.cs
@@ -17,7 +17,7 @@
 [assembly: AssemblyCulture("")]
 
 // Version informationr(
-[assembly: AssemblyVersion("1.2.28.93")]
-[assembly: AssemblyFileVersion("1.2.28.93")]
+[assembly: AssemblyVersion("1.2.31.97")]
+[assembly: AssemblyFileVersion("1.2.31.97")]
 [assembly: NeutralResourcesLanguageAttribute( "en-US" )]
 
diff --git a/AlotAddOnGUI/memodder/MassEffectModder.exe b/AlotAddOnGUI/memodder/MassEffectModder.exe