Skip to content

Commit c391226

Browse files
renemadsenrenemadsen
authored
Merge branch 'master' into master
2 parents 9dbb326 + 9b28e6b commit c391226

File tree

23 files changed

+136
-31
lines changed

23 files changed

+136
-31
lines changed

‎.DS_Store‎

4 KB
Binary file not shown.

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,7 @@ eFormAPI/Installation/MainInstaller/ApiFileList.wxs
9696
/eformAPI/eFormApi.Integration.Tests/bin/*
9797
eFormAPI/eFormAPI/JasperExporter.jar
9898
eFormAPI/eFormAPI.Common/JasperExporter.jar
99+
eFormAPI/eFormApi.Integration.Tests/obj/*
100+
eFormAPI/eFormApi.Tests/obj/*
101+
eFormAPI/eFormAPI/content/JasperExporter.jar
102+
eFormAPI/eFormAPI.Common/content/JasperExporter.jar

‎README.md‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
# 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)
2+
C# Build Status:
3+
![C# build status](https://microtingas2017.visualstudio.com/_apis/public/build/definitions/5f551ab2-01ab-4204-8efa-06be93328bc1/4/badge)
4+
5+
Angular 2 build status
6+
![Angular2 status](https://microtingas2017.visualstudio.com/_apis/public/build/definitions/5f551ab2-01ab-4204-8efa-06be93328bc1/5/badge)
7+
8+
Node Dependencies
9+
![Node Dependencies](https://david-dm.org/microting/eform-angular-frontend/eform-client.svg)
610

711
An Angular2 Frontend for integrating with the Microting eForm API v1.
812

‎eFormAPI/Installation/MainInstaller/Transform.xslt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</xsl:copy>
1212
</xsl:template>
1313

14-
<xsl:key name="files-search" match="wix:Component[not(contains(wix:File/@Source, '.config')) and not(contains(wix:File/@Source, '.asax')) and not(contains(wix:File/@Source, '.dll'))]" use="@Id"/>
14+
<xsl:key name="files-search" match="wix:Component[not(contains(wix:File/@Source, '.config')) and not(contains(wix:File/@Source, '.asax')) and not(contains(wix:File/@Source, '.dll')) and not(contains(wix:File/@Source, '.jar'))]" use="@Id"/>
1515
<xsl:key name="files-search" match="wix:Component[contains(wix:File/@Source, '.cs')]" use="@Id"/>
1616
<xsl:key name="files-search" match="wix:Component[contains(wix:File/@Source,'Web.Release.config')]" use="@Id"/>
1717
<xsl:key name="files-search" match="wix:Component[contains(wix:File/@Source,'Web.Debug.config')]" use="@Id"/>

‎eFormAPI/TestSettings.runsettings‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<TargetFrameworkVersion>Framework40</TargetFrameworkVersion>
1515

1616
<!-- Path to Test Adapters -->
17-
<TestAdaptersPaths>%SystemDrive%\Temp\foo;%SystemDrive%\Temp\bar</TestAdaptersPaths>
1817
</RunConfiguration>
1918

2019
<!-- Configurations for data collectors -->

‎eFormAPI/eFormAPI.Common/App.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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" />
11-
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider></providers>
11+
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider></providers>
1212
</entityFramework>
1313
<runtime>
1414
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -21,6 +21,6 @@
2121
<system.data>
2222
<DbProviderFactories>
2323
<remove invariant="MySql.Data.MySqlClient" />
24-
<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.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
24+
<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.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
2525
</DbProviderFactories>
2626
</system.data></configuration>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,24 @@
2929
<ErrorReport>prompt</ErrorReport>
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
33+
<DebugSymbols>true</DebugSymbols>
34+
<OutputPath>bin\x64\Debug\</OutputPath>
35+
<DefineConstants>DEBUG;TRACE</DefineConstants>
36+
<DebugType>full</DebugType>
37+
<PlatformTarget>x64</PlatformTarget>
38+
<ErrorReport>prompt</ErrorReport>
39+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
40+
</PropertyGroup>
41+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
42+
<OutputPath>bin\x64\Release\</OutputPath>
43+
<DefineConstants>TRACE</DefineConstants>
44+
<Optimize>true</Optimize>
45+
<DebugType>pdbonly</DebugType>
46+
<PlatformTarget>x64</PlatformTarget>
47+
<ErrorReport>prompt</ErrorReport>
48+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
49+
</PropertyGroup>
3250
<ItemGroup>
3351
<Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
3452
<HintPath>..\packages\AWSSDK.Core.3.3.18.1\lib\net45\AWSSDK.Core.dll</HintPath>

‎eFormAPI/eFormAPI.sln‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ Global
6464
{54404CF9-A407-4F55-BC26-B243099E29A8}.Release|x86.ActiveCfg = Release|Any CPU
6565
{54404CF9-A407-4F55-BC26-B243099E29A8}.Release|x86.Build.0 = Release|Any CPU
6666
{515EE205-5349-449E-BE13-F83DA5B601B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67-
{515EE205-5349-449E-BE13-F83DA5B601B9}.Debug|x64.ActiveCfg = Debug|Any CPU
68-
{515EE205-5349-449E-BE13-F83DA5B601B9}.Debug|x64.Build.0 = Debug|Any CPU
67+
{515EE205-5349-449E-BE13-F83DA5B601B9}.Debug|x64.ActiveCfg = Debug|x64
68+
{515EE205-5349-449E-BE13-F83DA5B601B9}.Debug|x64.Build.0 = Debug|x64
6969
{515EE205-5349-449E-BE13-F83DA5B601B9}.Debug|x86.ActiveCfg = Debug|Any CPU
7070
{515EE205-5349-449E-BE13-F83DA5B601B9}.Debug|x86.Build.0 = Debug|Any CPU
7171
{515EE205-5349-449E-BE13-F83DA5B601B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
7272
{515EE205-5349-449E-BE13-F83DA5B601B9}.Release|Any CPU.Build.0 = Release|Any CPU
73-
{515EE205-5349-449E-BE13-F83DA5B601B9}.Release|x64.ActiveCfg = Release|Any CPU
74-
{515EE205-5349-449E-BE13-F83DA5B601B9}.Release|x64.Build.0 = Release|Any CPU
73+
{515EE205-5349-449E-BE13-F83DA5B601B9}.Release|x64.ActiveCfg = Release|x64
74+
{515EE205-5349-449E-BE13-F83DA5B601B9}.Release|x64.Build.0 = Release|x64
7575
{515EE205-5349-449E-BE13-F83DA5B601B9}.Release|x86.ActiveCfg = Release|Any CPU
7676
{515EE205-5349-449E-BE13-F83DA5B601B9}.Release|x86.Build.0 = Release|Any CPU
7777
{768280FF-C359-4E58-8B5C-1F682B41CC24}.Debug|Any CPU.ActiveCfg = Debug|x86
@@ -106,7 +106,6 @@ Global
106106
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
107107
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
108108
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|x64.ActiveCfg = Debug|x64
109-
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|x64.Build.0 = Debug|x64
110109
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|x86.ActiveCfg = Debug|Any CPU
111110
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Debug|x86.Build.0 = Debug|Any CPU
112111
{2B167169-F122-4F1F-9881-0DC8C07585B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -118,7 +117,6 @@ Global
118117
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
119118
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|Any CPU.Build.0 = Debug|Any CPU
120119
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|x64.ActiveCfg = Debug|x64
121-
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|x64.Build.0 = Debug|x64
122120
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|x86.ActiveCfg = Debug|Any CPU
123121
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Debug|x86.Build.0 = Debug|Any CPU
124122
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -129,26 +127,26 @@ Global
129127
{FF3054DF-B9E9-49A9-9BCE-384C2E657262}.Release|x86.Build.0 = Release|Any CPU
130128
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
131129
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|Any CPU.Build.0 = Debug|Any CPU
132-
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|x64.ActiveCfg = Debug|Any CPU
133-
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|x64.Build.0 = Debug|Any CPU
130+
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|x64.ActiveCfg = Debug|x64
131+
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|x64.Build.0 = Debug|x64
134132
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|x86.ActiveCfg = Debug|Any CPU
135133
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Debug|x86.Build.0 = Debug|Any CPU
136134
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Release|Any CPU.ActiveCfg = Release|Any CPU
137135
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Release|Any CPU.Build.0 = Release|Any CPU
138-
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Release|x64.ActiveCfg = Release|Any CPU
139-
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Release|x64.Build.0 = Release|Any CPU
136+
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Release|x64.ActiveCfg = Release|x64
137+
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Release|x64.Build.0 = Release|x64
140138
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Release|x86.ActiveCfg = Release|Any CPU
141139
{12D13BC6-8F04-4409-941C-DCFB60B00D05}.Release|x86.Build.0 = Release|Any CPU
142140
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
143141
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|Any CPU.Build.0 = Debug|Any CPU
144-
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|x64.ActiveCfg = Debug|Any CPU
145-
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|x64.Build.0 = Debug|Any CPU
142+
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|x64.ActiveCfg = Debug|x64
143+
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|x64.Build.0 = Debug|x64
146144
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|x86.ActiveCfg = Debug|Any CPU
147145
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Debug|x86.Build.0 = Debug|Any CPU
148146
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Release|Any CPU.ActiveCfg = Release|Any CPU
149147
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Release|Any CPU.Build.0 = Release|Any CPU
150-
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Release|x64.ActiveCfg = Release|Any CPU
151-
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Release|x64.Build.0 = Release|Any CPU
148+
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Release|x64.ActiveCfg = Release|x64
149+
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Release|x64.Build.0 = Release|x64
152150
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Release|x86.ActiveCfg = Release|Any CPU
153151
{CC6EA000-5ADF-47B3-8182-DFF8A932830C}.Release|x86.Build.0 = Release|Any CPU
154152
EndGlobalSection

‎eFormAPI/eFormAPI/Web.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,14 +122,14 @@
122122
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
123123
<providers>
124124
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
125-
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider></providers>
125+
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider></providers>
126126
</entityFramework>
127127
<system.codedom>
128128
<compilers />
129129
</system.codedom>
130130
<system.data>
131131
<DbProviderFactories>
132132
<remove invariant="MySql.Data.MySqlClient" />
133-
<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.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
133+
<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.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
134134
</DbProviderFactories>
135135
</system.data></configuration>

‎eFormAPI/eFormAPI/eFormAPI.Web.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,9 @@
295295
</ItemGroup>
296296
<ItemGroup>
297297
<Content Include="Global.asax" />
298-
<Content Include="JasperExporter.jar" />
298+
<Content Include="JasperExporter.jar">
299+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
300+
</Content>
299301
<Content Include="Web.config">
300302
<SubType>Designer</SubType>
301303
</Content>

0 commit comments

Comments
 (0)