Skip to content

Commit 5990b42

Browse files
committed
Downgrade NLog to 3.1 until Common.Logging.NLog32 is released
1 parent bbf25ce commit 5990b42

File tree

11 files changed

+19
-19
lines changed

11 files changed

+19
-19
lines changed

IntegrationEngine.Core/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2626
<dependentAssembly>
2727
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
28-
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
28+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
2929
</dependentAssembly>
3030
</assemblyBinding>
3131
</runtime>

IntegrationEngine.Core/package.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<dependency id="MySql.Data.Entity" version="6.9.5" />
2727
<dependency id="NEST" version="1.4.0" />
2828
<dependency id="Newtonsoft.Json" version="6.0.8" />
29-
<dependency id="NLog" version="3.2.0.0" />
29+
<dependency id="NLog" version="3.1.0.0" />
3030
<dependency id="RabbitMQ.Client" version="3.4.3" />
3131
</dependencies>
3232
</metadata>

IntegrationEngine.Core/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<package id="MySql.Data.Entity" version="6.9.5" targetFramework="net45" />
1010
<package id="NEST" version="1.4.0" targetFramework="net45" />
1111
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
12-
<package id="NLog" version="3.2.0.0" targetFramework="net45" />
12+
<package id="NLog" version="3.1.0.0" targetFramework="net45" />
1313
<package id="RabbitMQ.Client" version="3.4.3" targetFramework="net45" />
1414
</packages>

IntegrationEngine.Model.net40/IntegrationEngine.Model.net40.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="CronExpressionDescriptor">
37-
<HintPath>..\packages\CronExpressionDescriptor.1.12.0\lib\net35\CronExpressionDescriptor.dll</HintPath>
38-
</Reference>
3936
<Reference Include="System" />
4037
<Reference Include="System.Core" />
4138
<Reference Include="System.Xml.Linq" />
@@ -52,6 +49,9 @@
5249
<Reference Include="Nest">
5350
<HintPath>..\packages\NEST.1.4.0\lib\Nest.dll</HintPath>
5451
</Reference>
52+
<Reference Include="CronExpressionDescriptor">
53+
<HintPath>..\packages\CronExpressionDescriptor.1.13.0\lib\net35\CronExpressionDescriptor.dll</HintPath>
54+
</Reference>
5555
</ItemGroup>
5656
<ItemGroup>
5757
<Compile Include="..\configuration\SharedAssemblyInfo.cs">

IntegrationEngine.Model.net40/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CronExpressionDescriptor" version="1.12.0" targetFramework="net40" />
3+
<package id="CronExpressionDescriptor" version="1.13.0" targetFramework="net40" />
44
<package id="Elasticsearch.Net" version="1.4.0" targetFramework="net40" />
55
<package id="NEST" version="1.4.0" targetFramework="net40" />
66
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net40" />

IntegrationEngine.Model/IntegrationEngine.Model.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
3535
<ItemGroup>
36-
<Reference Include="CronExpressionDescriptor">
37-
<HintPath>..\packages\CronExpressionDescriptor.1.12.0\lib\net35\CronExpressionDescriptor.dll</HintPath>
38-
</Reference>
3936
<Reference Include="System" />
4037
<Reference Include="System.Core" />
4138
<Reference Include="System.Xml.Linq" />
@@ -52,6 +49,9 @@
5249
<Reference Include="Nest">
5350
<HintPath>..\packages\NEST.1.4.0\lib\net45\Nest.dll</HintPath>
5451
</Reference>
52+
<Reference Include="CronExpressionDescriptor">
53+
<HintPath>..\packages\CronExpressionDescriptor.1.13.0\lib\net35\CronExpressionDescriptor.dll</HintPath>
54+
</Reference>
5555
</ItemGroup>
5656
<ItemGroup>
5757
<Compile Include="..\configuration\SharedAssemblyInfo.cs">

IntegrationEngine.Model/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CronExpressionDescriptor" version="1.12.0" targetFramework="net45" />
3+
<package id="CronExpressionDescriptor" version="1.13.0" targetFramework="net45" />
44
<package id="Elasticsearch.Net" version="1.4.0" targetFramework="net45" />
55
<package id="NEST" version="1.4.0" targetFramework="net45" />
66
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />

IntegrationEngine/App.Config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</dependentAssembly>
2323
<dependentAssembly>
2424
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
25-
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
26-
</dependentAssembly>
25+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
26+
</dependentAssembly>t
2727
</assemblyBinding>
2828
</runtime>
2929
</configuration>

IntegrationEngine/IntegrationEngine.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
<Reference Include="Common.Logging.NLog31">
6060
<HintPath>..\packages\Common.Logging.NLog31.3.0.0\lib\net40\Common.Logging.NLog31.dll</HintPath>
6161
</Reference>
62-
<Reference Include="CronExpressionDescriptor">
63-
<HintPath>..\packages\CronExpressionDescriptor.1.12.0\lib\net35\CronExpressionDescriptor.dll</HintPath>
64-
</Reference>
6562
<Reference Include="EntityFramework">
6663
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
6764
</Reference>
@@ -137,6 +134,9 @@
137134
<Reference Include="Nest">
138135
<HintPath>..\packages\NEST.1.4.0\lib\net45\Nest.dll</HintPath>
139136
</Reference>
137+
<Reference Include="CronExpressionDescriptor">
138+
<HintPath>..\packages\CronExpressionDescriptor.1.13.0\lib\net35\CronExpressionDescriptor.dll</HintPath>
139+
</Reference>
140140
</ItemGroup>
141141
<ItemGroup>
142142
<Compile Include="..\configuration\SharedAssemblyInfo.cs">

IntegrationEngine/package.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency id="Microsoft.Owin.Hosting" version="3.0.0" />
3636
<dependency id="NEST" version="1.4.0" />
3737
<dependency id="Newtonsoft.Json" version="6.0.8" />
38-
<dependency id="NLog" version="3.2.0.0" />
38+
<dependency id="NLog" version="3.1.0.0" />
3939
<dependency id="Owin" version="1.0" />
4040
<dependency id="Quartz" version="2.3.1" />
4141
<dependency id="RabbitMQ.Client" version="3.4.3" />

0 commit comments

Comments
 (0)