Updating:

- Microting.eForm to 2.1.74

Author: renemadsen

.gitignore

@@ -97,4 +97,6 @@ eFormAPI/Installation/MainInstaller/ApiFileList.wxs
 eFormAPI/eFormAPI/JasperExporter.jar
 eFormAPI/eFormAPI.Common/JasperExporter.jar
 eFormAPI/eFormApi.Integration.Tests/obj/*
-eFormAPI/eFormApi.Tests/obj/*
+eFormAPI/eFormApi.Tests/obj/*
+eFormAPI/eFormAPI/content/JasperExporter.jar
+eFormAPI/eFormAPI.Common/content/JasperExporter.jar

eFormAPI/eFormAPI.Common/eFormAPI.Common.csproj

@@ -74,8 +74,8 @@
       <HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microting.eForm, Version=2.1.72.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.2.1.72\lib\net45\Microting.eForm.dll</HintPath>
+    <Reference Include="Microting.eForm, Version=2.1.74.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\Microting.eForm.2.1.74\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll</HintPath>
@@ -161,7 +161,7 @@
     <Analyzer Include="..\packages\AWSSDK.SQS.3.3.3\analyzers\dotnet\cs\AWSSDK.SQS.CodeAnalysis.dll" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="JasperExporter.jar" />
+    <Content Include="content\JasperExporter.jar" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

eFormAPI/eFormAPI.Common/packages.config

@@ -7,7 +7,7 @@
   <package id="EntityFramework" version="6.1.3" targetFramework="net46" />
   <package id="EPPlus" version="4.1.1" targetFramework="net46" />
   <package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net46" />
-  <package id="Microting.eForm" version="2.1.72" targetFramework="net46" />
+  <package id="Microting.eForm" version="2.1.74" targetFramework="net46" />
   <package id="MySql.Data" version="6.9.11" targetFramework="net46" />
   <package id="MySql.Data.Entity" version="6.9.11" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />

eFormAPI/eFormAPI/eFormAPI.Web.csproj

@@ -127,8 +127,8 @@
     <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.72.0, Culture=neutral, processorArchitecture=AMD64">
-      <HintPath>..\packages\Microting.eForm.2.1.72\lib\net45\Microting.eForm.dll</HintPath>
+    <Reference Include="Microting.eForm, Version=2.1.74.0, Culture=neutral, processorArchitecture=AMD64">
+      <HintPath>..\packages\Microting.eForm.2.1.74\lib\net45\Microting.eForm.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll</HintPath>
@@ -294,10 +294,8 @@
     <Compile Include="Startup.cs" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="content\JasperExporter.jar" />
     <Content Include="Global.asax" />
-    <EmbeddedResource Include="JasperExporter.jar">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>

eFormAPI/eFormAPI/packages.config

@@ -38,7 +38,7 @@
   <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.72" targetFramework="net461" />
+  <package id="Microting.eForm" version="2.1.74" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net46" />
   <package id="MySql.Data" version="6.9.11" targetFramework="net461" />
   <package id="MySql.Data.Entity" version="6.9.11" targetFramework="net461" />