chore: 🤖 update dependencies and common GoogleTranslate

FFXIVAPP · Apr 26, 2020 · 3bdc637 · 3bdc637
1 parent 1565d8c
commit 3bdc637
Show file tree

Hide file tree

Showing 16 changed files with 134 additions and 119 deletions.
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
@@ -2,10 +2,10 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="FFXIVAPP.Common" value="D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-common\packages" />
-	<add key="FFXIVAPP.IPluginInterface" value="D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-iplugininterface\packages" />
-    <add key="FFXIVAPP.ResourceFiles" value="D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-resourcefiles\packages" />
-    <add key="Sharlayan" value="D:\Users\Icehunter\Source\Repos\ffxivapp\sharlayan\distribution" />
+    <add key="FFXIVAPP.Common" value="C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-common\packages" />
+	<add key="FFXIVAPP.IPluginInterface" value="C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-iplugininterface\packages" />
+    <add key="FFXIVAPP.ResourceFiles" value="C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-resourcefiles\packages" />
+    <add key="Sharlayan" value="C:\Users\Icehunter\Source\Repos\ffxivapp\sharlayan\distribution" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />

diff --git a/FFXIVAPP.Client/FFXIVAPP.Client.csproj b/FFXIVAPP.Client/FFXIVAPP.Client.csproj
@@ -54,13 +54,13 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="FFXIVAPP.Common, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FFXIVAPP.Common.5.0.1\lib\net462\FFXIVAPP.Common.dll</HintPath>
+      <HintPath>..\..\ffxivapp-common\build\Debug\FFXIVAPP.Common.dll</HintPath>
     </Reference>
     <Reference Include="FFXIVAPP.IPluginInterface, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FFXIVAPP.IPluginInterface.5.0.3\lib\net462\FFXIVAPP.IPluginInterface.dll</HintPath>
+      <HintPath>..\..\ffxivapp-iplugininterface\build\Debug\FFXIVAPP.IPluginInterface.dll</HintPath>
     </Reference>
     <Reference Include="FFXIVAPP.ResourceFiles, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\FFXIVAPP.ResourceFiles.2.0.1\lib\net462\FFXIVAPP.ResourceFiles.dll</HintPath>
+      <HintPath>..\..\ffxivapp-resourcefiles\build\Debug\FFXIVAPP.ResourceFiles.dll</HintPath>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.8.4.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <HintPath>..\packages\HtmlAgilityPack.1.8.4\lib\Net45\HtmlAgilityPack.dll</HintPath>
@@ -85,7 +85,7 @@
       <HintPath>..\packages\NLog.4.5.6\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Sharlayan, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Sharlayan.5.0.3\lib\net462\Sharlayan.dll</HintPath>
+      <HintPath>..\..\sharlayan\distribution\Sharlayan.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
@@ -332,6 +332,24 @@
     <Analyzer Include="..\packages\Text.Analyzers.2.6.1\analyzers\dotnet\cs\Text.Analyzers.dll" />
     <Analyzer Include="..\packages\Text.Analyzers.2.6.1\analyzers\dotnet\cs\Text.CSharp.Analyzers.dll" />
   </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>
+    <ProjectReference Include="..\..\ffxivapp-resourcefiles\FFXIVAPP.ResourceFiles\FFXIVAPP.ResourceFiles.csproj">
+      <Project>{38e2405f-58d4-411c-b1df-6e2d6f14082e}</Project>
+      <Name>FFXIVAPP.ResourceFiles</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\sharlayan\Sharlayan\Sharlayan.csproj">
+      <Project>{9510d5ef-208a-4897-a582-8eae5c6e9406}</Project>
+      <Name>Sharlayan</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>%25SYSTEMROOT%25\System32\WindowsPowerShell\v1.0\powershell.exe –NonInteractive –ExecutionPolicy Unrestricted –command "&amp; { &amp;'$(SolutionDir)RestorePackages.ps1' '$(SolutionDir).nuget/nuget.exe' }"</PreBuildEvent>
@@ -349,11 +367,11 @@
   </Target>
   <Import Project="..\packages\Fody.3.1.3\build\Fody.targets" Condition="Exists('..\packages\Fody.3.1.3\build\Fody.targets')" />
   <Import Project="..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.3.1.0\build\Costura.Fody.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+  <!-- 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.
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/FFXIVAPP.Client/Initializer.cs b/FFXIVAPP.Client/Initializer.cs
@@ -157,9 +157,6 @@ internal static class Initializer {
 
                                 MessageBoxHelper.ShowMessageAsync(title, message.ToString(), () => ShellView.CloseApplication(true), delegate { });
                             }
-
-                            var uri = "https://ffxiv-app.com/Analytics/Google/?eCategory=Application Launch&eAction=Version Check&eLabel=FFXIVAPP";
-                            DispatcherHelper.Invoke(() => MainView.View.GoogleAnalytics.Navigate(uri));
                         }
                     }
                 }

diff --git a/FFXIVAPP.Client/Properties/AssemblyInfo.cs b/FFXIVAPP.Client/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("SyndicatedLife")]
 [assembly: AssemblyProduct("FFXIVAPP.Client")]
-[assembly: AssemblyCopyright("Copyright © 2007 - 2017 Ryan Wilson")]
+[assembly: AssemblyCopyright("Copyright © 2007 - 2020 Ryan Wilson")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/FFXIVAPP.Client/ViewModels/MainViewModel.cs b/FFXIVAPP.Client/ViewModels/MainViewModel.cs
@@ -38,7 +38,7 @@ internal sealed class MainViewModel : INotifyPropertyChanged {
 
         public void OpenWebSite() {
             try {
-                Process.Start("https://ffxiv-app.com");
+                Process.Start("https://xivapp.com");
             }
             catch (Exception ex) {
                 MessageBoxHelper.ShowMessage(AppViewModel.Instance.Locale["app_WarningMessage"], ex.Message);

diff --git a/FFXIVAPP.Client/Views/MainView.xaml b/FFXIVAPP.Client/Views/MainView.xaml
@@ -18,7 +18,7 @@
                        Source="/FFXIVAPP.ResourceFiles;component/Theme/splash.png" />
                 <Button Width="200"
                         Command="{Binding OpenWebSiteCommand}"
-                        Content="Open https://ffxiv-app.com" />
+                        Content="Open https://xivapp.com" />
                 <WebBrowser x:Name="GoogleAnalytics" Visibility="Collapsed" />
             </StackPanel>
         </ScrollViewer>

diff --git a/FFXIVAPP.Client/packages.config b/FFXIVAPP.Client/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Costura.Fody" version="3.1.0" targetFramework="net462" />
-  <package id="FFXIVAPP.Common" version="5.0.1" targetFramework="net462" />
-  <package id="FFXIVAPP.IPluginInterface" version="5.0.3" targetFramework="net462" />
+  <package id="FFXIVAPP.Common" version="5.0.2" targetFramework="net462" />
+  <package id="FFXIVAPP.IPluginInterface" version="5.0.4" targetFramework="net462" />
   <package id="FFXIVAPP.ResourceFiles" version="2.0.1" targetFramework="net462" />
   <package id="Fody" version="3.1.3" targetFramework="net462" developmentDependency="true" />
   <package id="HtmlAgilityPack" version="1.8.4" targetFramework="net462" />
@@ -19,7 +19,7 @@
   <package id="NLog" version="4.5.6" targetFramework="net462" />
   <package id="NLog.Config" version="4.5.6" targetFramework="net462" />
   <package id="NLog.Schema" version="4.5.6" targetFramework="net462" />
-  <package id="Sharlayan" version="5.0.3" targetFramework="net462" />
+  <package id="Sharlayan" version="5.0.5" targetFramework="net462" />
   <package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net462" developmentDependency="true" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
   <package id="Text.Analyzers" version="2.6.1" targetFramework="net462" developmentDependency="true" />

diff --git a/FFXIVAPP.Updater/MainWindow.xaml.cs b/FFXIVAPP.Updater/MainWindow.xaml.cs
@@ -63,17 +63,16 @@ public partial class MainWindow : INotifyPropertyChanged {
         /// <summary>
         /// </summary>
         private void DownloadUpdate() {
-            this.GoogleAnalytics.Navigate("https://ffxiv-app.com/Analytics/Google/?eCategory=Application Update&eAction=Download&eLabel=FFXIVAPP");
-            this.GoogleAnalytics.LoadCompleted += delegate {
-                try {
-                    this._webClient.DownloadFileCompleted += this.WebClientOnDownloadFileCompleted;
-                    this._webClient.DownloadProgressChanged += this.WebClientOnDownloadProgressChanged;
-                    this._webClient.DownloadFileAsync(new Uri(MainWindowViewModel.Instance.DownloadURI), MainWindowViewModel.Instance.ZipFileName);
-                }
-                catch (Exception) {
-                    Environment.Exit(0);
-                }
-            };
+            try
+            {
+                this._webClient.DownloadFileCompleted += this.WebClientOnDownloadFileCompleted;
+                this._webClient.DownloadProgressChanged += this.WebClientOnDownloadProgressChanged;
+                this._webClient.DownloadFileAsync(new Uri(MainWindowViewModel.Instance.DownloadURI), MainWindowViewModel.Instance.ZipFileName);
+            }
+            catch (Exception)
+            {
+                Environment.Exit(0);
+            }
         }
 
         private void ExtractAndClean() {

diff --git a/FFXIVAPP.Updater/Properties/AssemblyInfo.cs b/FFXIVAPP.Updater/Properties/AssemblyInfo.cs
@@ -20,7 +20,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("SyndicatedLife")]
 [assembly: AssemblyProduct("FFXIVAPP.Updater")]
-[assembly: AssemblyCopyright("Copyright © 2007 - 2017 Ryan Wilson")]
+[assembly: AssemblyCopyright("Copyright © 2007 - 2020 Ryan Wilson")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/FFXIVAPP.sln.DotSettings b/FFXIVAPP.sln.DotSettings
@@ -458,6 +458,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

diff --git a/SetupLinks.bat b/SetupLinks.bat
@@ -1,6 +1,6 @@
-mklink /J FFXIVAPP.Plugin.Event D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-event\distribution
-mklink /J FFXIVAPP.Plugin.Informer D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-informer\distribution
-mklink /J FFXIVAPP.Plugin.Log D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-log\distribution
-mklink /J FFXIVAPP.Plugin.Parse D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-parse\distribution
-mklink /J FFXIVAPP.Plugin.Radar D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-radar\distribution
-mklink /J FFXIVAPP.Plugin.Widgets D:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-widgets\distribution
+mklink /J FFXIVAPP.Plugin.Event C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-event\distribution
+mklink /J FFXIVAPP.Plugin.Informer C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-informer\distribution
+mklink /J FFXIVAPP.Plugin.Log C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-log\distribution
+mklink /J FFXIVAPP.Plugin.Parse C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-parse\distribution
+mklink /J FFXIVAPP.Plugin.Radar C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-radar\distribution
+mklink /J FFXIVAPP.Plugin.Widgets C:\Users\Icehunter\Source\Repos\ffxivapp\ffxivapp-plugin-widgets\distribution
diff --git a/distribution/FFXIVAPP.Common.dll b/distribution/FFXIVAPP.Common.dll