Skip to content

Commit 859f804

Browse files
Gid733Gid733
authored
Merge pull request #20 from microting/master
Updates
2 parents 9f313e9 + c44e94d commit 859f804

File tree

4 files changed

+49
-13
lines changed

4 files changed

+49
-13
lines changed

‎eFormAPI/Installation/CustomActions/CustomAction.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,11 @@ public static ActionResult UpdateCA(Session session)
338338
{
339339
DeleteDirectory(Path.Combine(uiIisDir, "node_modules"));
340340
} catch { }
341+
try
342+
{
343+
File.Delete(uiIisDir + "\\package-lock.json");
344+
} catch { }
345+
341346
try
342347
{
343348
DeleteDirectory(Path.Combine(uiIisDir, "dist"));

‎eFormAPI/eFormAPI/Web.config‎

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
-->
4949
<system.web>
5050
<compilation debug="true" targetFramework="4.6.1" />
51-
<httpRuntime targetFramework="4.6" maxRequestLength="1024000" />
51+
<httpRuntime targetFramework="4.6.1" maxRequestLength="1024000" />
5252
<httpModules />
5353
</system.web>
5454
<system.webServer>
@@ -135,6 +135,42 @@
135135
<assemblyIdentity name="MySql.Data.Entity.EF6" publicKeyToken="c5687fc88969c44d" culture="neutral" />
136136
<bindingRedirect oldVersion="0.0.0.0-6.9.12.0" newVersion="6.9.12.0" />
137137
</dependentAssembly>
138+
<dependentAssembly>
139+
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
140+
<bindingRedirect oldVersion="0.0.0.0-6.9.12.0" newVersion="6.9.12.0" />
141+
</dependentAssembly>
142+
<dependentAssembly>
143+
<assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
144+
<bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
145+
</dependentAssembly>
146+
<dependentAssembly>
147+
<assemblyIdentity name="Microsoft.EntityFrameworkCore" publicKeyToken="adb9793829ddae60" culture="neutral" />
148+
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
149+
</dependentAssembly>
150+
<dependentAssembly>
151+
<assemblyIdentity name="Microsoft.EntityFrameworkCore.Relational" publicKeyToken="adb9793829ddae60" culture="neutral" />
152+
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
153+
</dependentAssembly>
154+
<dependentAssembly>
155+
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
156+
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
157+
</dependentAssembly>
158+
<dependentAssembly>
159+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
160+
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
161+
</dependentAssembly>
162+
<dependentAssembly>
163+
<assemblyIdentity name="Remotion.Linq" publicKeyToken="fee00910d6e5f53b" culture="neutral" />
164+
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
165+
</dependentAssembly>
166+
<dependentAssembly>
167+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
168+
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
169+
</dependentAssembly>
170+
<dependentAssembly>
171+
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
172+
<bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
173+
</dependentAssembly>
138174
</assemblyBinding>
139175
</runtime>
140176
<entityFramework>
@@ -148,9 +184,4 @@
148184
<compilers />
149185
</system.codedom>
150186

151-
<system.data>
152-
<DbProviderFactories>
153-
<remove invariant="MySql.Data.MySqlClient" />
154-
<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.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
155-
</DbProviderFactories>
156-
</system.data></configuration>
187+
</configuration>

‎eFormAPI/eFormAPI/eFormAPI.Web.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@
130130
<Reference Include="Microsoft.Owin.Security.OAuth, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
131131
<HintPath>..\packages\Microsoft.Owin.Security.OAuth.3.1.0\lib\net45\Microsoft.Owin.Security.OAuth.dll</HintPath>
132132
</Reference>
133-
<Reference Include="Microting.eForm, Version=2.1.309.0, Culture=neutral, processorArchitecture=MSIL">
134-
<HintPath>..\packages\Microting.eForm.2.1.309\lib\net45\Microting.eForm.dll</HintPath>
133+
<Reference Include="Microting.eForm, Version=2.1.326.0, Culture=neutral, processorArchitecture=MSIL">
134+
<HintPath>..\packages\Microting.eForm.2.1.326\lib\net45\Microting.eForm.dll</HintPath>
135135
</Reference>
136-
<Reference Include="Microting.eFormApi.BasePn, Version=1.1.15.0, Culture=neutral, processorArchitecture=MSIL">
137-
<HintPath>..\packages\Microting.eFormApi.BasePn.1.1.15\lib\net46\Microting.eFormApi.BasePn.dll</HintPath>
136+
<Reference Include="Microting.eFormApi.BasePn, Version=1.1.16.0, Culture=neutral, processorArchitecture=MSIL">
137+
<HintPath>..\packages\Microting.eFormApi.BasePn.1.1.16\lib\net46\Microting.eFormApi.BasePn.dll</HintPath>
138138
</Reference>
139139
<Reference Include="MySql.Data, Version=6.9.12.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
140140
<HintPath>..\packages\MySql.Data.6.9.12\lib\net45\MySql.Data.dll</HintPath>

‎eFormAPI/eFormAPI/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<package id="Microsoft.Owin.Security.Cookies" version="3.1.0" targetFramework="net46" />
3737
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net46" />
3838
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net46" />
39-
<package id="Microting.eForm" version="2.1.309" targetFramework="net461" />
40-
<package id="Microting.eFormApi.BasePn" version="1.1.15" targetFramework="net461" />
39+
<package id="Microting.eForm" version="2.1.326" targetFramework="net461" />
40+
<package id="Microting.eFormApi.BasePn" version="1.1.16" targetFramework="net461" />
4141
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
4242
<package id="MySql.Data" version="6.9.12" targetFramework="net461" />
4343
<package id="MySql.Data.Entity" version="6.9.12" targetFramework="net461" />

0 commit comments

Comments
 (0)