Skip to content

Commit edb3d71

Browse files
committed
Updating to version 2.1.61 of the SDK.
1 parent 9a7b1fa commit edb3d71

File tree

8 files changed

+74
-20
lines changed

8 files changed

+74
-20
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,3 +96,5 @@ 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/*

eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj

Lines changed: 20 additions & 2 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>
@@ -56,8 +74,8 @@
5674
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
5775
<Private>True</Private>
5876
</Reference>
59-
<Reference Include="Microting.eForm, Version=2.1.55.0, Culture=neutral, PublicKeyToken=null">
60-
<HintPath>..\packages\Microting.eForm.2.1.55\lib\net45\Microting.eForm.dll</HintPath>
77+
<Reference Include="Microting.eForm, Version=2.1.61.0, Culture=neutral, processorArchitecture=AMD64">
78+
<HintPath>..\packages\Microting.eForm.2.1.61\lib\net45\Microting.eForm.dll</HintPath>
6179
</Reference>
6280
<Reference Include="MySql.Data, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
6381
<HintPath>..\packages\MySql.Data.6.9.10\lib\net45\MySql.Data.dll</HintPath>

eFormAPI/eFormAPI.Common/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="EntityFramework" version="6.1.3" targetFramework="net46" />
88
<package id="EPPlus" version="4.1.1" targetFramework="net46" />
99
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net46" />
10-
<package id="Microting.eForm" version="2.1.55" targetFramework="net46" />
10+
<package id="Microting.eForm" version="2.1.61" targetFramework="net46" />
1111
<package id="MySql.Data" version="6.9.10" targetFramework="net46" />
1212
<package id="MySql.Data.Entity" version="6.9.10" targetFramework="net46" />
1313
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />

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/eFormAPI.Web.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@
127127
<Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
128128
<HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
129129
</Reference>
130-
<Reference Include="Microting.eForm, Version=2.1.55.0, Culture=neutral, PublicKeyToken=null">
131-
<HintPath>..\packages\Microting.eForm.2.1.55\lib\net45\Microting.eForm.dll</HintPath>
130+
<Reference Include="Microting.eForm, Version=2.1.61.0, Culture=neutral, processorArchitecture=AMD64">
131+
<HintPath>..\packages\Microting.eForm.2.1.61\lib\net45\Microting.eForm.dll</HintPath>
132132
</Reference>
133133
<Reference Include="MySql.Data, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
134134
<HintPath>..\packages\MySql.Data.6.9.10\lib\net45\MySql.Data.dll</HintPath>

eFormAPI/eFormAPI/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
3939
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
4040
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
41-
<package id="Microting.eForm" version="2.1.55" targetFramework="net46" />
41+
<package id="Microting.eForm" version="2.1.61" targetFramework="net461" />
4242
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
4343
<package id="MySql.Data" version="6.9.10" targetFramework="net46" />
4444
<package id="MySql.Data.Entity" version="6.9.10" targetFramework="net46" />

eFormAPI/eFormApi.Integration.Tests/eFormApi.Integration.Tests.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,24 @@
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
37+
<DebugSymbols>true</DebugSymbols>
38+
<OutputPath>bin\x64\Debug\</OutputPath>
39+
<DefineConstants>DEBUG;TRACE</DefineConstants>
40+
<DebugType>full</DebugType>
41+
<PlatformTarget>x64</PlatformTarget>
42+
<ErrorReport>prompt</ErrorReport>
43+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
46+
<OutputPath>bin\x64\Release\</OutputPath>
47+
<DefineConstants>TRACE</DefineConstants>
48+
<Optimize>true</Optimize>
49+
<DebugType>pdbonly</DebugType>
50+
<PlatformTarget>x64</PlatformTarget>
51+
<ErrorReport>prompt</ErrorReport>
52+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
53+
</PropertyGroup>
3654
<ItemGroup>
3755
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
3856
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>

eFormAPI/eFormApi.Tests/eFormApi.Tests.csproj

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,24 @@
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
36+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
37+
<DebugSymbols>true</DebugSymbols>
38+
<OutputPath>bin\x64\Debug\</OutputPath>
39+
<DefineConstants>DEBUG;TRACE</DefineConstants>
40+
<DebugType>full</DebugType>
41+
<PlatformTarget>x64</PlatformTarget>
42+
<ErrorReport>prompt</ErrorReport>
43+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
46+
<OutputPath>bin\x64\Release\</OutputPath>
47+
<DefineConstants>TRACE</DefineConstants>
48+
<Optimize>true</Optimize>
49+
<DebugType>pdbonly</DebugType>
50+
<PlatformTarget>x64</PlatformTarget>
51+
<ErrorReport>prompt</ErrorReport>
52+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
53+
</PropertyGroup>
3654
<ItemGroup>
3755
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
3856
<HintPath>..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>

0 commit comments

Comments
 (0)