Skip to content

Commit 0879c95

Browse files
author
ohumeniuk
committed
2 parents 385d1ed + 5f08a7f commit 0879c95

File tree

9 files changed

+103
-80
lines changed

9 files changed

+103
-80
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ before_script:
1919
- sleep 3
2020
- fluxbox > /dev/null 2>&1 &
2121
script:
22-
- travis_retry nuget restore -source "https://www.nuget.org/api/v2" ./eFormAPI/eFormAPI.sln
23-
- xbuild ./eFormAPI/eFormAPI.sln
2422
- cd eform-client && npm install
2523
after_success:
2624
- echo dotnet test and npm test succeeded

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# eform-angular-frontend [![Build Status](https://travis-ci.org/microting/eform-angular-frontend.svg?branch=master)](https://travis-ci.org/microting/eform-angular-frontend) [![Coverage Status](https://coveralls.io/repos/github/microting/eform-angular-frontend/badge.svg?branch=master)](https://coveralls.io/github/microting/eform-angular-frontend?branch=master)
1+
# eform-angular-frontend
2+
[![Node Build Status](https://travis-ci.org/microting/eform-angular-frontend.svg?branch=master)](https://travis-ci.org/microting/eform-angular-frontend)
3+
[![Node Coverage Status](https://coveralls.io/repos/github/microting/eform-angular-frontend/badge.svg?branch=master)](https://coveralls.io/github/microting/eform-angular-frontend?branch=master)
4+
![C# Build status](https://microtingas.visualstudio.com/_apis/public/build/definitions/a4743aa9-9116-44c0-8fbc-1145414eaf07/7/badge)
5+
![Node Dependencies](https://david-dm.org/microting/eform-angular-frontend.svg)
26

37
A Angular2 Frontend for integrating with the Microting eForm API v1.
48

‎docs/install.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
1. Install Internet Information Services if not already installed.
5252
1. Press the Windows Key and type Windows Features, select the first entry "Turn Windows Feature On of Off"
5353
2. Check "Internet Information Services" and click OK
54+
3. Check .NET Extensibility 4.6
55+
3. Check APS.NET 4.6
56+
3. Check ISAPI Extensions
57+
3. Check ISAPI Filters
5458
2. Copy compiled files to forlder in server
5559
![web server](file_6.png "web server")
5660
3. Open Internet Information Services (IIS) Manager

‎eFormAPI/Installation/MainInstaller/MainInstaller.wixproj‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,11 +14,13 @@
1414
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
1515
<DefineConstants>Debug</DefineConstants>
1616
<SuppressAllWarnings>False</SuppressAllWarnings>
17+
<SuppressValidation>True</SuppressValidation>
1718
<Pedantic>True</Pedantic>
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
2021
<OutputPath>..\Bundle\</OutputPath>
2122
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
23+
<SuppressValidation>true</SuppressValidation>
2224
</PropertyGroup>
2325
<ItemGroup>
2426
<Compile Include="DomainNameDlg.wxs" />
@@ -61,6 +63,19 @@
6163
<PropertyGroup>
6264
<PostBuildEvent>"$(ProjectDir)BuildedCustomActions\AllowMultipleVersions.exe" "$(TargetPath)"</PostBuildEvent>
6365
</PropertyGroup>
66+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
67+
<DefineConstants>Debug</DefineConstants>
68+
<SuppressAllWarnings>False</SuppressAllWarnings>
69+
<SuppressValidation>True</SuppressValidation>
70+
<Pedantic>True</Pedantic>
71+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
72+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
73+
</PropertyGroup>
74+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
75+
<SuppressValidation>true</SuppressValidation>
76+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
77+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
78+
</PropertyGroup>
6479
<!--
6580
To modify your build process, add your task inside one of the targets below and uncomment it.
6681
Other similar extension points exist, see Wix.targets.

‎eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<DefineConstants>DEBUG;TRACE</DefineConstants>
2121
<ErrorReport>prompt</ErrorReport>
2222
<WarningLevel>4</WarningLevel>
23+
<PlatformTarget>x64</PlatformTarget>
2324
</PropertyGroup>
2425
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2526
<DebugType>pdbonly</DebugType>
@@ -48,29 +49,29 @@
4849
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
4950
</PropertyGroup>
5051
<ItemGroup>
51-
<Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604">
52-
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\AWSSDK.Core.dll</HintPath>
52+
<Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Microting.eForm.1.6.4.2\lib\AWSSDK.Core.dll</HintPath>
5354
</Reference>
54-
<Reference Include="AWSSDK.SQS, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604">
55-
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\AWSSDK.SQS.dll</HintPath>
55+
<Reference Include="AWSSDK.SQS, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Microting.eForm.1.6.4.2\lib\AWSSDK.SQS.dll</HintPath>
5657
</Reference>
57-
<Reference Include="eFormCommunicator, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
58-
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormCommunicator.dll</HintPath>
58+
<Reference Include="eFormCommunicator, Version=1.6.4.1, Culture=neutral, processorArchitecture=AMD64">
59+
<HintPath>..\packages\Microting.eForm.1.6.4.2\lib\eFormCommunicator.dll</HintPath>
5960
</Reference>
60-
<Reference Include="eFormCore, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
61-
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormCore.dll</HintPath>
61+
<Reference Include="eFormCore, Version=1.6.4.1, Culture=neutral, processorArchitecture=AMD64">
62+
<HintPath>..\packages\Microting.eForm.1.6.4.2\lib\eFormCore.dll</HintPath>
6263
</Reference>
63-
<Reference Include="eFormData, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
64-
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormData.dll</HintPath>
64+
<Reference Include="eFormData, Version=1.6.4.1, Culture=neutral, processorArchitecture=AMD64">
65+
<HintPath>..\packages\Microting.eForm.1.6.4.2\lib\eFormData.dll</HintPath>
6566
</Reference>
66-
<Reference Include="eFormShared, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
67-
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormShared.dll</HintPath>
67+
<Reference Include="eFormShared, Version=1.6.4.1, Culture=neutral, processorArchitecture=AMD64">
68+
<HintPath>..\packages\Microting.eForm.1.6.4.2\lib\eFormShared.dll</HintPath>
6869
</Reference>
69-
<Reference Include="eFormSqlController, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
70-
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormSqlController.dll</HintPath>
70+
<Reference Include="eFormSqlController, Version=1.6.4.1, Culture=neutral, processorArchitecture=AMD64">
71+
<HintPath>..\packages\Microting.eForm.1.6.4.2\lib\eFormSqlController.dll</HintPath>
7172
</Reference>
72-
<Reference Include="eFormSubscriber, Version=1.6.3.5, Culture=neutral, PublicKeyToken=null">
73-
<HintPath>..\packages\Microting.eForm.1.6.3.5\lib\eFormSubscriber.dll</HintPath>
73+
<Reference Include="eFormSubscriber, Version=1.6.4.1, Culture=neutral, processorArchitecture=AMD64">
74+
<HintPath>..\packages\Microting.eForm.1.6.4.2\lib\eFormSubscriber.dll</HintPath>
7475
</Reference>
7576
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
7677
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>

‎eFormAPI/eFormAPI.Common/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="EntityFramework" version="6.1.3" targetFramework="net46" />
44
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net46" />
5-
<package id="Microting.eForm" version="1.6.3.5" targetFramework="net46" />
5+
<package id="Microting.eForm" version="1.6.4.2" targetFramework="net46" />
66
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
77
</packages>

‎eFormAPI/eFormAPI/Web.config‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
For more information on how to configure your ASP.NET application, please visit
44
https://go.microsoft.com/fwlink/?LinkId=301879
55
-->
66
<configuration>
77
<configSections>
88
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
9-
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
9+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
1010
</configSections>
1111
<appSettings>
1212
<add key="webpages:Version" value="3.0.0.0" />
@@ -40,87 +40,87 @@
4040
</system.Web>
4141
-->
4242
<system.web>
43-
<compilation debug="true" targetFramework="4.6.1"/>
44-
<httpRuntime targetFramework="4.6"/>
45-
<httpModules/>
43+
<compilation debug="true" targetFramework="4.6.1" />
44+
<httpRuntime targetFramework="4.6" />
45+
<httpModules />
4646
</system.web>
4747
<system.webServer>
4848
<handlers>
49-
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
50-
<remove name="OPTIONSVerbHandler"/>
51-
<remove name="TRACEVerbHandler"/>
52-
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
49+
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
50+
<remove name="OPTIONSVerbHandler" />
51+
<remove name="TRACEVerbHandler" />
52+
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
5353
</handlers>
54-
<validation validateIntegratedModeConfiguration="false"/>
55-
<modules/>
54+
<validation validateIntegratedModeConfiguration="false" />
55+
<modules />
5656
</system.webServer>
5757
<runtime>
5858
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5959
<dependentAssembly>
60-
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
61-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
60+
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
61+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
6262
</dependentAssembly>
6363
<dependentAssembly>
64-
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
65-
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
64+
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
65+
<bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
6666
</dependentAssembly>
6767
<dependentAssembly>
68-
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
69-
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
68+
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
69+
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
7070
</dependentAssembly>
7171
<dependentAssembly>
72-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
73-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
72+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
73+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
7474
</dependentAssembly>
7575
<dependentAssembly>
76-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
77-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
76+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
77+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
7878
</dependentAssembly>
7979
<dependentAssembly>
80-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
81-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
80+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
81+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
8282
</dependentAssembly>
8383
<dependentAssembly>
84-
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral"/>
85-
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
84+
<assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" />
85+
<bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
8686
</dependentAssembly>
8787
<dependentAssembly>
88-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
89-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
88+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
89+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
9090
</dependentAssembly>
9191
<dependentAssembly>
92-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
93-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
92+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
93+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
9494
</dependentAssembly>
9595
<dependentAssembly>
96-
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
97-
<bindingRedirect oldVersion="0.0.0.0-4.6.0.0" newVersion="4.6.0.0"/>
96+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
97+
<bindingRedirect oldVersion="0.0.0.0-4.6.0.0" newVersion="4.6.0.0" />
9898
</dependentAssembly>
9999
<dependentAssembly>
100-
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
101-
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
100+
<assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
101+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
102102
</dependentAssembly>
103103
<dependentAssembly>
104-
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
105-
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
104+
<assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
105+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
106106
</dependentAssembly>
107107
<dependentAssembly>
108-
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
109-
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
108+
<assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
109+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
110110
</dependentAssembly>
111111
<dependentAssembly>
112-
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
113-
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0"/>
112+
<assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
113+
<bindingRedirect oldVersion="0.0.0.0-3.1.0.0" newVersion="3.1.0.0" />
114114
</dependentAssembly>
115115
</assemblyBinding>
116116
</runtime>
117117
<entityFramework>
118-
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework"/>
118+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
119119
<providers>
120-
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
120+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
121121
</providers>
122122
</entityFramework>
123123
<system.codedom>
124-
<compilers/>
124+
<compilers />
125125
</system.codedom>
126126
</configuration>

0 commit comments

Comments
 (0)