Skip to content

Commit 71facab

Browse files
ethanhannethanhann
committed
Merge branch 'develop'
2 parents 1b20457 + 86c3db1 commit 71facab

File tree

86 files changed

+1110
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1110
-760
lines changed

‎IntegrationEngine.Client.Tests/IntegrationEngine.Client.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
<Reference Include="BeekmanLabs.UnitTesting">
3838
<HintPath>..\packages\BeekmanLabs.UnitTesting.0.0.0\lib\net45\BeekmanLabs.UnitTesting.dll</HintPath>
3939
</Reference>
40-
<Reference Include="Moq">
41-
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
42-
</Reference>
4340
<Reference Include="RestSharp">
4441
<HintPath>..\packages\RestSharp.105.0.1\lib\net4\RestSharp.dll</HintPath>
4542
</Reference>
4643
<Reference Include="Newtonsoft.Json">
4744
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
4845
</Reference>
46+
<Reference Include="Moq">
47+
<HintPath>..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
48+
</Reference>
4949
</ItemGroup>
5050
<ItemGroup>
5151
<Compile Include="Properties\AssemblyInfo.cs" />

‎IntegrationEngine.Client.Tests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="BeekmanLabs.UnitTesting" version="0.0.0" targetFramework="net45" />
4-
<package id="Moq" version="4.2.1409.1722" targetFramework="net45" />
4+
<package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
55
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
66
<package id="NUnit" version="2.6.4" targetFramework="net45" />
77
<package id="RestSharp" version="105.0.1" targetFramework="net45" />

‎IntegrationEngine.Client/package.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<iconUrl>http://inengine.net/images/inengine-logo-32.png</iconUrl>
1212
<releaseNotes>http://inengine.net/change-log.html</releaseNotes>
1313
<requireLicenseAcceptance>true</requireLicenseAcceptance>
14-
<description>Client of IntegrationServer, an asynchronous job scheduling server.</description>
14+
<description>Client of InEngine.NET, an asynchronous job scheduling server.</description>
1515
<copyright>Copyright 2015</copyright>
1616
<tags>Integration Scheduling Server RabbitMQ Elasticsearch Quartz.NET</tags>
1717
<references>

‎IntegrationEngine.ConsoleHost/App.config‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎IntegrationEngine.ConsoleHost/IntegrationJobs/SampleSqlReport/SampleSqlReportJobWithIntegrationPoints.cs‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎IntegrationEngine.ConsoleHost/packages.config‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎IntegrationEngine.Core.Tests/IntegrationEngine.Core.Tests.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,9 @@
3737
<Reference Include="BeekmanLabs.UnitTesting">
3838
<HintPath>..\packages\BeekmanLabs.UnitTesting.0.0.0\lib\net45\BeekmanLabs.UnitTesting.dll</HintPath>
3939
</Reference>
40-
<Reference Include="Moq">
41-
<HintPath>..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll</HintPath>
42-
</Reference>
43-
<Reference Include="Elasticsearch.Net">
44-
<HintPath>..\packages\Elasticsearch.Net.1.4.0\lib\net45\Elasticsearch.Net.dll</HintPath>
45-
</Reference>
4640
<Reference Include="Newtonsoft.Json">
4741
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
4842
</Reference>
49-
<Reference Include="Nest">
50-
<HintPath>..\packages\NEST.1.4.0\lib\net45\Nest.dll</HintPath>
51-
</Reference>
5243
<Reference Include="Common.Logging.Core">
5344
<HintPath>..\packages\Common.Logging.Core.3.0.0\lib\net40\Common.Logging.Core.dll</HintPath>
5445
</Reference>
@@ -58,6 +49,15 @@
5849
<Reference Include="RabbitMQ.Client">
5950
<HintPath>..\packages\RabbitMQ.Client.3.4.3\lib\net35\RabbitMQ.Client.dll</HintPath>
6051
</Reference>
52+
<Reference Include="Elasticsearch.Net">
53+
<HintPath>..\packages\Elasticsearch.Net.1.4.1\lib\net45\Elasticsearch.Net.dll</HintPath>
54+
</Reference>
55+
<Reference Include="Nest">
56+
<HintPath>..\packages\NEST.1.4.1\lib\net45\Nest.dll</HintPath>
57+
</Reference>
58+
<Reference Include="Moq">
59+
<HintPath>..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>
60+
</Reference>
6161
</ItemGroup>
6262
<ItemGroup>
6363
<Compile Include="MessageQueue\RabbitMQClientTest.cs" />

‎IntegrationEngine.Core.Tests/app.config‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-3.2.0.0" newVersion="3.2.0.0" />
8-
</dependentAssembly>
9-
</assemblyBinding>
10-
</runtime>
11-
</configuration>
3+
</configuration>

‎IntegrationEngine.Core.Tests/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<package id="BeekmanLabs.UnitTesting" version="0.0.0" targetFramework="net45" />
44
<package id="Common.Logging" version="3.0.0" targetFramework="net45" />
55
<package id="Common.Logging.Core" version="3.0.0" targetFramework="net45" />
6-
<package id="Elasticsearch.Net" version="1.4.0" targetFramework="net45" />
7-
<package id="Moq" version="4.2.1409.1722" targetFramework="net45" />
8-
<package id="NEST" version="1.4.0" targetFramework="net45" />
6+
<package id="Elasticsearch.Net" version="1.4.1" targetFramework="net45" />
7+
<package id="Moq" version="4.2.1502.0911" targetFramework="net45" />
8+
<package id="NEST" version="1.4.1" targetFramework="net45" />
99
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
1010
<package id="NUnit" version="2.6.4" targetFramework="net45" />
1111
<package id="RabbitMQ.Client" version="3.4.3" targetFramework="net45" />

‎IntegrationEngine.Core.net40/IntegrationEngine.Core.net40.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@
4141
<Reference Include="Common.Logging.NLog31">
4242
<HintPath>..\packages\Common.Logging.NLog31.3.0.0\lib\net40\Common.Logging.NLog31.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Elasticsearch.Net">
45-
<HintPath>..\packages\Elasticsearch.Net.1.3.1\lib\Elasticsearch.Net.dll</HintPath>
46-
</Reference>
4744
<Reference Include="EntityFramework">
4845
<HintPath>..\packages\EntityFramework.6.1.2\lib\net40\EntityFramework.dll</HintPath>
4946
</Reference>
@@ -56,12 +53,6 @@
5653
<Reference Include="MySql.Data.Entity.EF6">
5754
<HintPath>..\packages\MySql.Data.Entity.6.9.5\lib\net40\MySql.Data.Entity.EF6.dll</HintPath>
5855
</Reference>
59-
<Reference Include="Nest">
60-
<HintPath>..\packages\NEST.1.3.1\lib\Nest.dll</HintPath>
61-
</Reference>
62-
<Reference Include="NLog">
63-
<HintPath>..\packages\NLog.3.1.0.0\lib\net40\NLog.dll</HintPath>
64-
</Reference>
6556
<Reference Include="RabbitMQ.Client">
6657
<HintPath>..\packages\RabbitMQ.Client.3.4.3\lib\net35\RabbitMQ.Client.dll</HintPath>
6758
</Reference>
@@ -86,6 +77,15 @@
8677
<Reference Include="Newtonsoft.Json">
8778
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
8879
</Reference>
80+
<Reference Include="Elasticsearch.Net">
81+
<HintPath>..\packages\Elasticsearch.Net.1.4.1\lib\Elasticsearch.Net.dll</HintPath>
82+
</Reference>
83+
<Reference Include="Nest">
84+
<HintPath>..\packages\NEST.1.4.1\lib\Nest.dll</HintPath>
85+
</Reference>
86+
<Reference Include="NLog">
87+
<HintPath>..\packages\NLog.3.1.0.0\lib\net40\NLog.dll</HintPath>
88+
</Reference>
8989
</ItemGroup>
9090
<ItemGroup>
9191
<Compile Include="..\configuration\SharedAssemblyInfo.cs">
@@ -256,4 +256,4 @@
256256
<Target Name="AfterBuild">
257257
</Target>
258258
-->
259-
</Project>
259+
</Project>

0 commit comments

Comments
 (0)