Skip to content

Commit efd2687

Browse files
renemadsenrenemadsen
authored
Merge pull request #112 from Gid733/master
Moved base plugin to main solution
2 parents ebea657 + 6b73385 commit efd2687

File tree

15 files changed

+59
-64
lines changed

15 files changed

+59
-64
lines changed

eFormAPI/Plugins/EformBase.Pn/App.config renamed to eFormAPI/EformBase.Pn/App.config

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
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.SqlConnectionFactory, EntityFramework" />
99
<providers>
1010
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
1111
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider></providers>
1212
</entityFramework>
13-
<system.data>
14-
<DbProviderFactories>
15-
<remove invariant="MySql.Data.MySqlClient" />
16-
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
17-
</DbProviderFactories>
18-
</system.data>
13+
1914
<runtime>
2015
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
2116
<dependentAssembly>
@@ -28,4 +23,9 @@
2823
</dependentAssembly>
2924
</assemblyBinding>
3025
</runtime>
31-
</configuration>
26+
<system.data>
27+
<DbProviderFactories>
28+
<remove invariant="MySql.Data.MySqlClient" />
29+
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
30+
</DbProviderFactories>
31+
</system.data></configuration>

eFormAPI/Plugins/EformBase.Pn/Consts/EformRoles.cs renamed to eFormAPI/EformBase.Pn/Consts/EformRoles.cs

File renamed without changes.

eFormAPI/Plugins/EformBase.Pn/Infrastructure/EFormCoreHelper.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/EFormCoreHelper.cs

File renamed without changes.

eFormAPI/Plugins/EformBase.Pn/Infrastructure/Handlers/GenerateJasperFilesHandler.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Handlers/GenerateJasperFilesHandler.cs

File renamed without changes.

eFormAPI/Plugins/EformBase.Pn/Infrastructure/Installers/RebusHandlerInstaller.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Installers/RebusHandlerInstaller.cs

File renamed without changes.

eFormAPI/Plugins/EformBase.Pn/Infrastructure/Installers/RebusInstaller.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Installers/RebusInstaller.cs

File renamed without changes.

eFormAPI/Plugins/EformBase.Pn/Infrastructure/Messages/GenerateJasperFiles.cs renamed to eFormAPI/EformBase.Pn/Infrastructure/Messages/GenerateJasperFiles.cs

File renamed without changes.

eFormAPI/Plugins/EformBase.Pn/Properties/AssemblyInfo.cs renamed to eFormAPI/EformBase.Pn/Properties/AssemblyInfo.cs

File renamed without changes.

eFormAPI/Plugins/EformBase.Pn/EformBase.Pn.csproj renamed to eFormAPI/EformBase.Pn/eFormApi.BasePn.csproj

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,81 +16,81 @@
1616
<DebugSymbols>true</DebugSymbols>
1717
<DebugType>full</DebugType>
1818
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
19+
<OutputPath>Plugins\EformBase\</OutputPath>
2020
<DefineConstants>DEBUG;TRACE</DefineConstants>
2121
<ErrorReport>prompt</ErrorReport>
2222
<WarningLevel>4</WarningLevel>
2323
</PropertyGroup>
2424
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2525
<DebugType>pdbonly</DebugType>
2626
<Optimize>true</Optimize>
27-
<OutputPath>..\..\eFormAPI\Plugins\EformBase\</OutputPath>
27+
<OutputPath>Plugins\EformBase\</OutputPath>
2828
<DefineConstants>TRACE</DefineConstants>
2929
<ErrorReport>prompt</ErrorReport>
3030
<WarningLevel>4</WarningLevel>
3131
<PlatformTarget>x64</PlatformTarget>
3232
</PropertyGroup>
3333
<ItemGroup>
3434
<Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
35-
<HintPath>packages\AWSSDK.Core.3.3.22\lib\net45\AWSSDK.Core.dll</HintPath>
35+
<HintPath>..\packages\AWSSDK.Core.3.3.22.5\lib\net45\AWSSDK.Core.dll</HintPath>
3636
</Reference>
3737
<Reference Include="AWSSDK.SQS, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
38-
<HintPath>packages\AWSSDK.SQS.3.3.3.6\lib\net45\AWSSDK.SQS.dll</HintPath>
38+
<HintPath>..\packages\AWSSDK.SQS.3.3.3.7\lib\net45\AWSSDK.SQS.dll</HintPath>
3939
</Reference>
4040
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
41-
<HintPath>packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
41+
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
4242
</Reference>
4343
<Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
44-
<HintPath>packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
44+
<HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
4545
</Reference>
4646
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
47-
<HintPath>packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
47+
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
4848
</Reference>
4949
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
50-
<HintPath>packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
50+
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
5151
</Reference>
5252
<Reference Include="EPPlus, Version=4.5.1.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
53-
<HintPath>packages\EPPlus.4.5.1\lib\net40\EPPlus.dll</HintPath>
53+
<HintPath>..\packages\EPPlus.4.5.1\lib\net40\EPPlus.dll</HintPath>
5454
</Reference>
5555
<Reference Include="Microting.eForm, Version=2.1.220.0, Culture=neutral, processorArchitecture=AMD64">
56-
<HintPath>packages\Microting.eForm.2.1.220\lib\net45\Microting.eForm.dll</HintPath>
56+
<HintPath>..\packages\Microting.eForm.2.1.220\lib\net45\Microting.eForm.dll</HintPath>
5757
</Reference>
5858
<Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
59-
<HintPath>packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>
59+
<HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>
6060
</Reference>
6161
<Reference Include="MySql.Data.Entity.EF6, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
62-
<HintPath>packages\MySql.Data.Entity.6.9.12\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
62+
<HintPath>..\packages\MySql.Data.Entity.6.9.12\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
65-
<HintPath>packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
65+
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
6666
</Reference>
6767
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
68-
<HintPath>packages\NLog.4.3.11\lib\net45\NLog.dll</HintPath>
68+
<HintPath>..\packages\NLog.4.3.11\lib\net45\NLog.dll</HintPath>
6969
</Reference>
7070
<Reference Include="PresentationCore" />
7171
<Reference Include="Rebus, Version=4.2.1.0, Culture=neutral, processorArchitecture=MSIL">
72-
<HintPath>packages\Rebus.4.2.1\lib\net45\Rebus.dll</HintPath>
72+
<HintPath>..\packages\Rebus.4.2.1\lib\net45\Rebus.dll</HintPath>
7373
</Reference>
7474
<Reference Include="Rebus.CastleWindsor, Version=4.1.0.0, Culture=neutral, processorArchitecture=MSIL">
75-
<HintPath>packages\Rebus.Castle.Windsor.4.1.0\lib\net45\Rebus.CastleWindsor.dll</HintPath>
75+
<HintPath>..\packages\Rebus.Castle.Windsor.4.1.0\lib\net45\Rebus.CastleWindsor.dll</HintPath>
7676
</Reference>
7777
<Reference Include="Rebus.SqlServer, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>packages\Rebus.SqlServer.4.0.0\lib\net45\Rebus.SqlServer.dll</HintPath>
78+
<HintPath>..\packages\Rebus.SqlServer.4.0.0\lib\net45\Rebus.SqlServer.dll</HintPath>
7979
</Reference>
8080
<Reference Include="System" />
8181
<Reference Include="System.ComponentModel.DataAnnotations" />
8282
<Reference Include="System.Configuration" />
8383
<Reference Include="System.Core" />
8484
<Reference Include="System.Drawing" />
8585
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86-
<HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
86+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
8787
</Reference>
8888
<Reference Include="System.Runtime.Remoting" />
8989
<Reference Include="System.Security" />
9090
<Reference Include="System.Transactions" />
9191
<Reference Include="System.Web" />
9292
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
93-
<HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
93+
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
9494
</Reference>
9595
<Reference Include="System.Xml.Linq" />
9696
<Reference Include="System.Data.DataSetExtensions" />
@@ -112,14 +112,14 @@
112112
<None Include="App.config" />
113113
<None Include="packages.config" />
114114
</ItemGroup>
115-
<ItemGroup>
116-
<Analyzer Include="packages\AWSSDK.SQS.3.3.3.6\analyzers\dotnet\cs\AWSSDK.SQS.CodeAnalysis.dll" />
117-
</ItemGroup>
118115
<ItemGroup>
119116
<Content Include="JasperExporter.jar" />
120117
</ItemGroup>
121118
<ItemGroup>
122119
<Folder Include="Controllers\" />
123120
</ItemGroup>
121+
<ItemGroup>
122+
<Analyzer Include="..\packages\AWSSDK.SQS.3.3.3.7\analyzers\dotnet\cs\AWSSDK.SQS.CodeAnalysis.dll" />
123+
</ItemGroup>
124124
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
125125
</Project>

eFormAPI/Plugins/EformBase.Pn/packages.config renamed to eFormAPI/EformBase.Pn/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="AWSSDK.Core" version="3.3.22" targetFramework="net46" />
4-
<package id="AWSSDK.SQS" version="3.3.3.6" targetFramework="net46" />
3+
<package id="AWSSDK.Core" version="3.3.22.5" targetFramework="net46" />
4+
<package id="AWSSDK.SQS" version="3.3.3.7" targetFramework="net46" />
55
<package id="Castle.Core" version="4.2.1" targetFramework="net46" />
66
<package id="Castle.Windsor" version="4.1.0" targetFramework="net46" />
77
<package id="EntityFramework" version="6.2.0" targetFramework="net46" />

0 commit comments

Comments
 (0)