Merge pull request #17 from microting/master

Updates

Author: Gid733

eFormAPI/eFormAPI/Controllers/SettingsController.cs

@@ -67,13 +67,11 @@ public OperationDataResult<string> GetDefaultLocale()
         public OperationResult UpdateConnectionString(InitialSettingsModel initialSettingsModel)
         {
             if (!ModelState.IsValid) return new OperationResult(false, LocaleHelper.GetString("RequestFieldsAreNotFilled"));
-            var sdkConnectionString = "Data Source="
-                                      + initialSettingsModel.ConnectionStringSdk.Source + ";Initial Catalog="
+            var sdkConnectionString = initialSettingsModel.ConnectionStringSdk.Source + ";Initial Catalog="
                                       + initialSettingsModel.ConnectionStringSdk.Catalogue + ";"
                                       + initialSettingsModel.ConnectionStringSdk.Auth;
 
-            var mainConnectionString = "Data Source="
-                                       + initialSettingsModel.ConnectionStringMain.Source + ";Initial Catalog="
+            var mainConnectionString = initialSettingsModel.ConnectionStringMain.Source + ";Initial Catalog="
                                        + initialSettingsModel.ConnectionStringMain.Catalogue + ";"
                                        + initialSettingsModel.ConnectionStringMain.Auth;
             // Save SDK connection string

eFormAPI/eFormAPI/eFormAPI.Web.csproj

@@ -130,11 +130,11 @@
     <Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
     </Reference>
-    <Reference Include="Microting.eForm, Version=2.1.306.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eForm.2.1.306\lib\net45\Microting.eForm.dll</HintPath>
+    <Reference Include="Microting.eForm, Version=2.1.309.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eForm.2.1.309\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
-    <Reference Include="Microting.eFormApi.BasePn, Version=1.1.14.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microting.eFormApi.BasePn.1.1.14\lib\net46\Microting.eFormApi.BasePn.dll</HintPath>
+    <Reference Include="Microting.eFormApi.BasePn, Version=1.1.15.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microting.eFormApi.BasePn.1.1.15\lib\net46\Microting.eFormApi.BasePn.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>

eFormAPI/eFormAPI/packages.config

@@ -36,8 +36,8 @@
   <package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
-  <package id="Microting.eForm" version="2.1.306" targetFramework="net461" />
-  <package id="Microting.eFormApi.BasePn" version="1.1.14" targetFramework="net461" />
+  <package id="Microting.eForm" version="2.1.309" targetFramework="net461" />
+  <package id="Microting.eFormApi.BasePn" version="1.1.15" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net46" />
   <package id="MySql.Data" version="6.9.12" targetFramework="net461" />
   <package id="MySql.Data.Entity" version="6.9.12" targetFramework="net461" />

eform-client/e2e/dbData.vsts.ts

@@ -6,11 +6,11 @@ export default {
   lastNAme: 'Smith',
   dataSourceSDK: 'dataSourceSDKValue',
   initialCatalogueSDK: 'eformsdk-test',
-  authenticationTypeSDK: 'User ID=USER_NAME;Password=PASSWORD_VSTS',
+  authenticationTypeSDK: 'Persist Security Info=False;User ID=USER_NAME;Password=PASSWORD_VSTS;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;',
   token: 'abc1234567890abc1234567890abcdef',
   dataSourceMain: 'dataSourceSDKValue',
   initialCatalogueMain: 'eFormMain',
-  authenticationTypeMain: 'User ID=USER_NAME;Password=PASSWORD_VSTS',
+  authenticationTypeMain: 'Persist Security Info=False;User ID=USER_NAME;Password=PASSWORD_VSTS;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=False;Connection Timeout=30;',
   languageOptions: {
     english: 'English',
     danish: 'Danish'

eform-client/protractor.conf.vsts.js

@@ -53,7 +53,7 @@ exports.config = {
   useAllAngular2AppRoots: true,
   beforeLaunch: function () {
     require('ts-node').register({
-      project: 'eForm-frontend-angular-CI/drop/e2e'
+      project: 'eForm-frontend-angular-CI\\drop\\e2e'
     });
   },
   onPrepare: function () {