Skip to content

Commit 5ca2ea3

Browse files
renemadsenrenemadsen
committed
Fixing the missing jar file problem.
Updating to version 2.1.65 of the SDK Updating to version 6.9.11 of MySql.Data and MySql.Data.Entity.
1 parent d62f196 commit 5ca2ea3

File tree

7 files changed

+23
-23
lines changed

7 files changed

+23
-23
lines changed

‎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/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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@
7474
<HintPath>..\packages\Microsoft.Office.Interop.Excel.15.0.4795.1000\lib\net20\Microsoft.Office.Interop.Excel.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
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>
77+
<Reference Include="Microting.eForm, Version=2.1.65.0, Culture=neutral, processorArchitecture=AMD64">
78+
<HintPath>..\packages\Microting.eForm.2.1.65\lib\net45\Microting.eForm.dll</HintPath>
7979
</Reference>
80-
<Reference Include="MySql.Data, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
81-
<HintPath>..\packages\MySql.Data.6.9.10\lib\net45\MySql.Data.dll</HintPath>
80+
<Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
81+
<HintPath>..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll</HintPath>
8282
</Reference>
83-
<Reference Include="MySql.Data.Entity.EF6, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
84-
<HintPath>..\packages\MySql.Data.Entity.6.9.10\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
83+
<Reference Include="MySql.Data.Entity.EF6, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
84+
<HintPath>..\packages\MySql.Data.Entity.6.9.11\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
8585
</Reference>
8686
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
8787
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

‎eFormAPI/eFormAPI.Common/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
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.61" targetFramework="net46" />
11-
<package id="MySql.Data" version="6.9.10" targetFramework="net46" />
12-
<package id="MySql.Data.Entity" version="6.9.10" targetFramework="net46" />
10+
<package id="Microting.eForm" version="2.1.65" targetFramework="net46" />
11+
<package id="MySql.Data" version="6.9.11" targetFramework="net46" />
12+
<package id="MySql.Data.Entity" version="6.9.11" targetFramework="net46" />
1313
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
1414
<package id="Rebus" version="4.2.1" targetFramework="net46" />
1515
<package id="Rebus.Castle.Windsor" version="4.0.0" targetFramework="net46" />

‎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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,14 @@
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.61.0, Culture=neutral, processorArchitecture=AMD64">
131-
<HintPath>..\packages\Microting.eForm.2.1.61\lib\net45\Microting.eForm.dll</HintPath>
130+
<Reference Include="Microting.eForm, Version=2.1.65.0, Culture=neutral, processorArchitecture=AMD64">
131+
<HintPath>..\packages\Microting.eForm.2.1.65\lib\net45\Microting.eForm.dll</HintPath>
132132
</Reference>
133-
<Reference Include="MySql.Data, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
134-
<HintPath>..\packages\MySql.Data.6.9.10\lib\net45\MySql.Data.dll</HintPath>
133+
<Reference Include="MySql.Data, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
134+
<HintPath>..\packages\MySql.Data.6.9.11\lib\net45\MySql.Data.dll</HintPath>
135135
</Reference>
136-
<Reference Include="MySql.Data.Entity.EF6, Version=6.9.10.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
137-
<HintPath>..\packages\MySql.Data.Entity.6.9.10\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
136+
<Reference Include="MySql.Data.Entity.EF6, Version=6.9.11.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
137+
<HintPath>..\packages\MySql.Data.Entity.6.9.11\lib\net45\MySql.Data.Entity.EF6.dll</HintPath>
138138
</Reference>
139139
<Reference Include="Newtonsoft.Json">
140140
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

‎eFormAPI/eFormAPI/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
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.61" targetFramework="net461" />
41+
<package id="Microting.eForm" version="2.1.65" targetFramework="net461" />
4242
<package id="Modernizr" version="2.8.3" targetFramework="net46" />
43-
<package id="MySql.Data" version="6.9.10" targetFramework="net46" />
44-
<package id="MySql.Data.Entity" version="6.9.10" targetFramework="net46" />
43+
<package id="MySql.Data" version="6.9.11" targetFramework="net461" />
44+
<package id="MySql.Data.Entity" version="6.9.11" targetFramework="net461" />
4545
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
4646
<package id="NLog" version="4.4.11" targetFramework="net46" />
4747
<package id="NLog.Config" version="4.4.11" targetFramework="net46" />

0 commit comments

Comments
 (0)