Skip to content

Commit 537c397

Browse files
author
Doug Schmidt
authored
Merge pull request #45 from DougSchmidt-AI/feature/PF-991-UpdateLog4NetReferences
PF-991 - Update the log4net dependency on the converter tool
2 parents daa1251 + c49256a commit 537c397

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ It is recommended that you use the most recent version of the plugin which match
1616

1717
| AQTS Version | Latest compatible plugin Version |
1818
| --- | --- |
19-
| AQTS 2019.2+ | [v19.2.10](https://github.com/AquaticInformatics/flowtracker2-field-data-plugin/releases/download/v19.2.10/FlowTracker2Plugin.plugin) - Adds incrementing vertical numbers |
19+
| AQTS 2019.2+ | [v19.2.12](https://github.com/AquaticInformatics/flowtracker2-field-data-plugin/releases/download/v19.2.12/FlowTracker2Plugin.plugin) - Adds incrementing vertical numbers |
2020
| 2017.4 - 2019.1 | [v17.4.44](https://github.com/AquaticInformatics/flowtracker2-field-data-plugin/releases/download/v17.4.44/FlowTracker2Plugin.plugin) |
2121

2222
## Requirements for building the plugin from source
@@ -52,4 +52,4 @@ See the [PluginTester](https://github.com/AquaticInformatics/aquarius-field-data
5252

5353
## Installation of the plugin
5454

55-
Use the [FieldDataPluginTool](https://github.com/AquaticInformatics/aquarius-field-data-framework/tree/master/src/FieldDataPluginTool) to install the plugin on your AQTS app server.
55+
Use the SystemConfig page to install/enable this plugin on your AQTS app server.

src/FlowTracker2Converter/FlowTracker2Converter.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<Reference Include="ICSharpCode.SharpZipLib">
4545
<HintPath>..\External\ICSharpCode.SharpZipLib.dll</HintPath>
4646
</Reference>
47-
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
48-
<HintPath>..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
47+
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
48+
<HintPath>..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
4949
</Reference>
5050
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>
@@ -55,8 +55,10 @@
5555
<HintPath>..\External\SonTek.StandaloneDataParser.dll</HintPath>
5656
</Reference>
5757
<Reference Include="System" />
58+
<Reference Include="System.Configuration" />
5859
<Reference Include="System.Core" />
5960
<Reference Include="System.Drawing" />
61+
<Reference Include="System.Web" />
6062
<Reference Include="System.Windows.Forms" />
6163
<Reference Include="System.Xml" />
6264
</ItemGroup>

src/FlowTracker2Converter/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Costura.Fody" version="1.6.2" targetFramework="net47" developmentDependency="true" />
44
<package id="Fody" version="2.0.0" targetFramework="net47" developmentDependency="true" />
5-
<package id="log4net" version="2.0.8" targetFramework="net47" />
5+
<package id="log4net" version="2.0.12" targetFramework="net47" />
66
</packages>

0 commit comments

Comments
 (0)