Skip to content

Commit 1fd009c

Browse files
retailcoderretailcoder
authored
Merge pull request #3629 from retailcoder/next
updated nlog
2 parents 65b93c0 + 9fa0a77 commit 1fd009c

27 files changed

+25665
-164
lines changed

‎RetailCoder.VBE/NLog.xsd

Lines changed: 770 additions & 146 deletions
Large diffs are not rendered by default.

‎RetailCoder.VBE/Rubberduck.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@
252252
<HintPath>..\packages\HtmlAgilityPack.1.4.9.5\lib\Net45\HtmlAgilityPack.dll</HintPath>
253253
<Private>True</Private>
254254
</Reference>
255-
<Reference Include="ICSharpCode.AvalonEdit">
256-
<HintPath>..\packages\AvalonEdit.5.0.3\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
255+
<Reference Include="ICSharpCode.AvalonEdit, Version=5.0.3.0, Culture=neutral, PublicKeyToken=9cc39be672370310, processorArchitecture=MSIL">
256+
<HintPath>..\packages\AvalonEdit.5.0.4\lib\Net40\ICSharpCode.AvalonEdit.dll</HintPath>
257257
</Reference>
258258
<Reference Include="Infralution.Localization.Wpf">
259259
<HintPath>..\libs\Infralution.Localization.Wpf.dll</HintPath>
@@ -275,6 +275,9 @@
275275
<HintPath>..\libs\Microsoft.Vbe.Interop.Forms.dll</HintPath>
276276
<Private>True</Private>
277277
</Reference>
278+
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
279+
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
280+
</Reference>
278281
<Reference Include="PresentationCore" />
279282
<Reference Include="PresentationFramework" />
280283
<Reference Include="PresentationFramework.Aero" />
@@ -308,9 +311,6 @@
308311
<Reference Include="office">
309312
<HintPath>..\libs\Office.dll</HintPath>
310313
</Reference>
311-
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c">
312-
<HintPath>..\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>
313-
</Reference>
314314
</ItemGroup>
315315
<ItemGroup>
316316
<Compile Include="API\VBA\Accessibility.cs" />

‎RetailCoder.VBE/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<packages>
33
<package id="Antlr4" version="4.3.0" targetFramework="net45" />
44
<package id="Antlr4.Runtime" version="4.3.0" targetFramework="net45" />
5-
<package id="AvalonEdit" version="5.0.3" targetFramework="net45" />
5+
<package id="AvalonEdit" version="5.0.4" targetFramework="net45" />
66
<package id="Castle.Core" version="4.1.1" targetFramework="net45" />
77
<package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
88
<package id="EasyHook" version="2.7.6270" targetFramework="net45" />
99
<package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
1010
<package id="LibGit2Sharp" version="0.24.0" targetFramework="net45" />
1111
<package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net45" />
12-
<package id="NLog" version="4.0.1" targetFramework="net45" />
13-
<package id="NLog.Schema" version="4.0.1" targetFramework="net45" />
12+
<package id="NLog" version="4.4.12" targetFramework="net45" />
13+
<package id="NLog.Schema" version="4.4.12" targetFramework="net45" />
1414
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
1515
<package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net45" />
1616
</packages>

‎Rubberduck.Inspections/NLog.xsd

Lines changed: 3103 additions & 0 deletions
Large diffs are not rendered by default.

‎Rubberduck.Inspections/Rubberduck.Inspections.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
<Private>True</Private>
4242
</Reference>
4343
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
44-
<HintPath>..\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>
45-
<Private>True</Private>
44+
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
4645
</Reference>
4746
<Reference Include="System" />
4847
<Reference Include="System.Core" />
@@ -204,6 +203,9 @@
204203
</ItemGroup>
205204
<ItemGroup>
206205
<None Include="app.config" />
206+
<None Include="NLog.xsd">
207+
<SubType>Designer</SubType>
208+
</None>
207209
<None Include="packages.config" />
208210
</ItemGroup>
209211
<ItemGroup />

‎Rubberduck.Inspections/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Antlr4.Runtime" version="4.3.0" targetFramework="net452" />
4-
<package id="NLog" version="4.0.1" targetFramework="net452" />
4+
<package id="NLog" version="4.4.12" targetFramework="net45" />
5+
<package id="NLog.Schema" version="4.4.12" targetFramework="net45" />
56
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
67
</packages>

‎Rubberduck.Parsing/NLog.xsd

Lines changed: 3103 additions & 0 deletions
Large diffs are not rendered by default.

‎Rubberduck.Parsing/Rubberduck.Parsing.csproj

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@
5050
</Reference>
5151
<Reference Include="Microsoft.Build.Tasks.v4.0" />
5252
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
53-
<HintPath>..\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>
54-
<Private>True</Private>
53+
<HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>
5554
</Reference>
5655
<Reference Include="System" />
5756
<Reference Include="System.Core" />
@@ -434,6 +433,9 @@
434433
<CustomToolNamespace>Rubberduck.Parsing.Grammar</CustomToolNamespace>
435434
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
436435
</None>
436+
<None Include="NLog.xsd">
437+
<SubType>Designer</SubType>
438+
</None>
437439
<None Include="packages.config" />
438440
<None Include="Grammar\VBALexer.g4">
439441
<Generator>MSBuild:Compile</Generator>

‎Rubberduck.Parsing/packages.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<packages>
33
<package id="Antlr4" version="4.3.0" targetFramework="net45" />
44
<package id="Antlr4.Runtime" version="4.3.0" targetFramework="net45" />
5-
<package id="NLog" version="4.0.1" targetFramework="net45" />
5+
<package id="NLog" version="4.4.12" targetFramework="net45" />
6+
<package id="NLog.Schema" version="4.4.12" targetFramework="net45" />
67
<package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />
78
</packages>

0 commit comments

Comments
 (0)