Skip to content

Commit

Permalink
dependency updates (#79)
Browse files Browse the repository at this point in the history
* dependency updates

* resource updates... again...

* new plugin interface
  • Loading branch information
Icehunter authored Jul 7, 2018
1 parent 97e20ad commit 961de8a
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 13 deletions.
17 changes: 11 additions & 6 deletions FFXIVAPP.Client/FFXIVAPP.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +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.0\lib\net462\FFXIVAPP.Common.dll</HintPath>
<HintPath>..\packages\FFXIVAPP.Common.5.0.1\lib\net462\FFXIVAPP.Common.dll</HintPath>
</Reference>
<Reference Include="FFXIVAPP.IPluginInterface, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FFXIVAPP.IPluginInterface.5.0.0\lib\net462\FFXIVAPP.IPluginInterface.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\FFXIVAPP.IPluginInterface.5.0.3\lib\net462\FFXIVAPP.IPluginInterface.dll</HintPath>
</Reference>
<Reference Include="FFXIVAPP.ResourceFiles, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\FFXIVAPP.ResourceFiles.2.0.0\lib\net462\FFXIVAPP.ResourceFiles.dll</HintPath>
<HintPath>..\packages\FFXIVAPP.ResourceFiles.2.0.1\lib\net462\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>
Expand All @@ -86,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.0\lib\net462\Sharlayan.dll</HintPath>
<HintPath>..\packages\Sharlayan.5.0.3\lib\net462\Sharlayan.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
Expand All @@ -98,6 +97,9 @@
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
Expand Down Expand Up @@ -274,10 +276,13 @@
<None Include="app.manifest">
<SubType>Designer</SubType>
</None>
<None Include="NLog.config" />
<None Include="NLog.xsd">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down
41 changes: 41 additions & 0 deletions FFXIVAPP.Client/NLog.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8" ?>
<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
autoReload="true"
throwExceptions="false"
internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">

<!-- optional, add some variables
https://github.com/nlog/NLog/wiki/Configuration-file#variables
-->
<variable name="myvar" value="myvalue"/>

<!--
See https://github.com/nlog/nlog/wiki/Configuration-file
for information on customizing logging rules and outputs.
-->
<targets>

<!--
add your targets here
See https://github.com/nlog/NLog/wiki/Targets for possible targets.
See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
-->

<!--
Write events to a file with the date in the filename.
<target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
layout="${longdate} ${uppercase:${level}} ${message}" />
-->
</targets>

<rules>
<!-- add your logging rules here -->

<!--
Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace) to "f"
<logger name="*" minlevel="Debug" writeTo="f" />
-->
</rules>
</nlog>
13 changes: 6 additions & 7 deletions FFXIVAPP.Client/packages.config
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
<?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.0" targetFramework="net462" />
<package id="FFXIVAPP.IPluginInterface" version="5.0.0" targetFramework="net462" />
<package id="FFXIVAPP.ResourceFiles" version="2.0.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.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" />
<package id="Machina" version="1.0.3" targetFramework="net461" />
<package id="MahApps.Metro" version="1.5.0" targetFramework="net462" />
<package id="MahApps.Metro.IconPacks" version="1.9.1" targetFramework="net462" />
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="2.6.1" targetFramework="net462"
developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="2.6.1" targetFramework="net462" developmentDependency="true" />
<package id="Microsoft.CodeQuality.Analyzers" version="2.6.1" targetFramework="net462" developmentDependency="true" />
<package id="Microsoft.NetCore.Analyzers" version="2.6.1" targetFramework="net462" developmentDependency="true" />
<package id="Microsoft.NETCore.Platforms" version="2.1.0" targetFramework="net462" />
Expand All @@ -21,7 +19,8 @@
<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.0" targetFramework="net462" />
<package id="Sharlayan" version="5.0.3" 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" />
</packages>
Binary file modified distribution/FFXIVAPP.Common.dll
Binary file not shown.
Binary file modified distribution/FFXIVAPP.IPluginInterface.dll
Binary file not shown.
Binary file modified distribution/FFXIVAPP.ResourceFiles.dll
Binary file not shown.
Binary file modified distribution/Sharlayan.dll
Binary file not shown.

0 comments on commit 961de8a

Please sign in to comment.