new logo; other small changes, removed fody

FFXIVAPP · Jul 12, 2017 · 4805396 · 4805396
1 parent 9c19679
commit 4805396
Show file tree

Hide file tree

Showing 23 changed files with 24 additions and 432,328 deletions.
diff --git a/FFXIVAPP.Client/AppBootstrapper.cs b/FFXIVAPP.Client/AppBootstrapper.cs
@@ -24,6 +24,7 @@
 using System.Timers;
 using FFXIVAPP.Client.Models;
 using FFXIVAPP.Client.Views;
+using FFXIVAPP.Common.Helpers;
 using FFXIVAPP.Common.Models;
 using FFXIVAPP.Common.Utilities;
 using NLog;
@@ -46,8 +47,6 @@ internal class AppBootstrapper : INotifyPropertyChanged
          *  setting up dependencies
          */
 
-        public Timer ProcessDetachCheckTimer = new Timer(30000);
-
         private AppBootstrapper()
         {
             if (App.MArgs != null)
@@ -152,38 +151,6 @@ private AppBootstrapper()
             Initializer.LoadPlugins();
 
             #endregion
-
-            ProcessDetachCheckTimer.Elapsed += ProcessDetachCheckTimerOnElapsed;
-        }
-
-        private void ProcessDetachCheckTimerOnElapsed(object sender, ElapsedEventArgs elapsedEventArgs)
-        {
-            try
-            {
-                switch (Constants.IsOpen)
-                {
-                    case true:
-                        try
-                        {
-                            Process.GetProcessById(Constants.ProcessModel.ProcessID);
-                        }
-                        catch (ArgumentException)
-                        {
-                            Constants.IsOpen = false;
-                        }
-                        break;
-                    case false:
-                        SettingsView.View.PIDSelect.Items.Clear();
-                        Initializer.StopMemoryWorkers();
-                        Initializer.ResetProcessID();
-                        Initializer.StartMemoryWorkers();
-                        break;
-                }
-            }
-            catch (Exception ex)
-            {
-                Logging.Log(Logger, new LogItem(ex, true));
-            }
         }
 
         #region Property Bindings

diff --git a/FFXIVAPP.Client/FFXIVAPP.Client.csproj b/FFXIVAPP.Client/FFXIVAPP.Client.csproj
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="..\..\ffxivapp-props\FFXIVAPP.Common.props" />
-  <Import Project="..\..\ffxivapp-props\FFXIVAPP.IPluginInterface.props" />
-  <Import Project="..\..\ffxivapp-props\Machina.props" />
-  <Import Project="..\..\ffxivapp-props\Sharlayan.props" />
-  <Import Project="..\..\ffxivapp-props\Fody.props" Condition="Exists('..\ffxivapp-props\Fody.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -72,13 +67,18 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
-      <Private>False</Private>
+    <Reference Include="FFXIVAPP.Common, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\ffxivapp-aio\packages\FFXIVAPP.Common.3.0.2\lib\net461\FFXIVAPP.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="FFXIVAPP.IPluginInterface, Version=3.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\ffxivapp-aio\packages\FFXIVAPP.IPluginInterface.3.0.2\lib\net461\FFXIVAPP.IPluginInterface.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.5, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
     </Reference>
+    <Reference Include="Machina, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\ffxivapp-aio\packages\Machina.1.0.2\lib\net461\Machina.dll</HintPath>
+    </Reference>
     <Reference Include="MahApps.Metro, Version=1.2.0.0, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
       <HintPath>..\packages\MahApps.Metro.1.2.0.0\lib\net45\MahApps.Metro.dll</HintPath>
     </Reference>
@@ -91,6 +91,9 @@
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.4.11\lib\net45\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="Sharlayan, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\ffxivapp-aio\packages\Sharlayan.3.0.1\lib\net461\Sharlayan.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Data" />
@@ -271,7 +274,7 @@
     </Resource>
     <Resource Include="Defaults\ChatHistory.xml" />
     <Resource Include="Defaults\Settings.xml" />
-    <Resource Include="FodyWeavers.xml" />
+    <None Include="FodyWeavers.xml" />
     <Content Include="Licenses\License.NAudio.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -367,16 +370,6 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\ffxivapp-common\FFXIVAPP.Common\FFXIVAPP.Common.csproj">
-      <Project>{8d6cda64-78be-4bf0-b613-0c9afa225df5}</Project>
-      <Name>FFXIVAPP.Common</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\ffxivapp-iplugininterface\FFXIVAPP.IPluginInterface\FFXIVAPP.IPluginInterface.csproj">
-      <Project>{56e3fd21-17c4-4306-ba2c-adaf6aaea330}</Project>
-      <Name>FFXIVAPP.IPluginInterface</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/FFXIVAPP.Client/FodyWeavers.xml b/FFXIVAPP.Client/FodyWeavers.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Weavers>
-	<Costura/>
 </Weavers>
diff --git a/FFXIVAPP.Client/ShellView.xaml.cs b/FFXIVAPP.Client/ShellView.xaml.cs
@@ -71,8 +71,6 @@ private void MetroWindowLoaded(object sender, RoutedEventArgs e)
             AppViewModel.Instance.NotifyIcon.Text = "FFXIVAPP";
             AppViewModel.Instance.NotifyIcon.ContextMenu.MenuItems[0]
                         .Enabled = false;
-
-            AppBootstrapper.Instance.ProcessDetachCheckTimer.Enabled = true;
         }
 
         /// <summary>

diff --git a/FFXIVAPP.Client/packages.config b/FFXIVAPP.Client/packages.config
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="1.6.2" targetFramework="net461" developmentDependency="true" />
   <package id="FFXIVAPP.Common" version="3.0.2" targetFramework="net461" />
   <package id="FFXIVAPP.IPluginInterface" version="3.0.2" targetFramework="net461" />
-  <package id="Fody" version="2.1.0" targetFramework="net461" developmentDependency="true" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net461" />
   <package id="Machina" version="1.0.2" targetFramework="net461" />
   <package id="MahApps.Metro" version="1.2.0.0" targetFramework="net461" />

diff --git a/FFXIVAPP.Updater/FFXIVAPP.Updater.csproj b/FFXIVAPP.Updater/FFXIVAPP.Updater.csproj
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="..\..\ffxivapp-props\Fody.props" Condition="Exists('..\ffxivapp-props\Fody.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -73,10 +72,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Costura, Version=1.6.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.1.6.2\lib\dotnet\Costura.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="DotNetZip, Version=1.10.1.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>..\packages\DotNetZip.1.10.1\lib\net20\DotNetZip.dll</HintPath>
     </Reference>

diff --git a/FFXIVAPP.Updater/FodyWeavers.xml b/FFXIVAPP.Updater/FodyWeavers.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Weavers>
-  <Costura />
 </Weavers>
diff --git a/FFXIVAPP.Updater/packages.config b/FFXIVAPP.Updater/packages.config
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Costura.Fody" version="1.6.2" targetFramework="net461" developmentDependency="true" />
   <package id="DotNetZip" version="1.10.1" targetFramework="net461" />
-  <package id="Fody" version="2.1.0" targetFramework="net461" developmentDependency="true" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net461" />
   <package id="MahApps.Metro" version="1.2.0.0" targetFramework="net461" />
   <package id="NAudio" version="1.8.0" targetFramework="net461" />

diff --git a/distribution/FFXIVAPP.Client.exe b/distribution/FFXIVAPP.Client.exe
diff --git a/distribution/FFXIVAPP.Client.vshost.exe b/distribution/FFXIVAPP.Client.vshost.exe