Skip to content

Commit 9b6060a

Browse files
committed
Update a few package related configs
1 parent 78b562d commit 9b6060a

File tree

4 files changed

+28
-10
lines changed

4 files changed

+28
-10
lines changed

IntegrationEngine.Core/App.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<configSections>
4-
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
4+
55
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6-
</configSections>
6+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 --></configSections>
77
<entityFramework>
88
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
99
<parameters>

IntegrationEngine.Core/IntegrationEngine.Core.csproj

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<AssemblyName>IntegrationEngine.Core</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15+
<RestorePackages>true</RestorePackages>
1416
</PropertyGroup>
1517
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1618
<DebugSymbols>true</DebugSymbols>
@@ -33,15 +35,24 @@
3335
<Reference Include="Elasticsearch.Net">
3436
<HintPath>..\packages\Elasticsearch.Net.1.3.1\lib\Elasticsearch.Net.dll</HintPath>
3537
</Reference>
36-
<Reference Include="EntityFramework">
38+
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
39+
<SpecificVersion>False</SpecificVersion>
3740
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.dll</HintPath>
3841
</Reference>
39-
<Reference Include="EntityFramework.SqlServer">
42+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
43+
<SpecificVersion>False</SpecificVersion>
4044
<HintPath>..\packages\EntityFramework.6.1.2\lib\net45\EntityFramework.SqlServer.dll</HintPath>
4145
</Reference>
4246
<Reference Include="log4net">
4347
<HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
4448
</Reference>
49+
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
50+
<Private>True</Private>
51+
<HintPath>..\packages\MySql.Data.6.9.5\lib\net45\MySql.Data.dll</HintPath>
52+
</Reference>
53+
<Reference Include="MySql.Data.Entity.EF6, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
54+
<HintPath>..\packages\MySql.Data.Entity.6.9.5\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
55+
</Reference>
4556
<Reference Include="Nest">
4657
<HintPath>..\packages\NEST.1.3.1\lib\Nest.dll</HintPath>
4758
</Reference>
@@ -59,12 +70,6 @@
5970
<Reference Include="Microsoft.CSharp" />
6071
<Reference Include="System.Data" />
6172
<Reference Include="System.Xml" />
62-
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
63-
<HintPath>..\packages\MySql.Data.6.9.5\lib\net45\MySql.Data.dll</HintPath>
64-
</Reference>
65-
<Reference Include="MySql.Data.Entity.EF6, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
66-
<HintPath>..\packages\MySql.Data.Entity.6.9.5\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
67-
</Reference>
6873
</ItemGroup>
6974
<ItemGroup>
7075
<Compile Include="Configuration\Database.cs" />
@@ -104,6 +109,7 @@
104109
</ProjectReference>
105110
</ItemGroup>
106111
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
112+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
107113
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
108114
Other similar extension points exist, see Microsoft.Common.targets.
109115
<Target Name="BeforeBuild">

IntegrationEngine.Tests/IntegrationEngine.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<Link>IntegrationEngine.json</Link>
6161
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6262
</None>
63+
<None Include="app.config" />
6364
<None Include="packages.config" />
6465
</ItemGroup>
6566
<ItemGroup>

IntegrationEngine.Tests/app.config

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

0 commit comments

Comments
 (0)