Reference MySql.Data via NuGet.

This commit is contained in:
Greg Edwards 2015-02-14 20:24:46 -05:00
parent 51d13b4a86
commit e87f0ebf06
15 changed files with 74 additions and 33 deletions

1
.gitignore vendored
View File

@ -7,6 +7,7 @@
[Dd]ebug/
[Rr]elease/
[Bb]in/
[Pp]ackages/
*.Publish.xml
.DS_Store
._.DS_Store

View File

@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<connectionStrings>
<add name="pkmnFoundationsConnectionString"
connectionString="Server=10.211.55.2;Database=gts;User ID=gts;Password=gts;Pooling=true;charset=utf8"
providerName="MySql.Data.MySqlClient" />
<add name="pkmnFoundationsConnectionString" connectionString="Server=10.211.55.2;Database=gts;User ID=gts;Password=gts;Pooling=true;charset=utf8" providerName="MySql.Data.MySqlClient" />
</connectionStrings>
<appSettings>
<add key="pkmnFoundationsBoxUpload4Dir" value="C:\Users\Greg\SkyDrive\Battle Videos G4"/>
<add key="pkmnFoundationsBoxUpload4Dir" value="C:\Users\Greg\SkyDrive\Battle Videos G4" />
</appSettings>
</configuration>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<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.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data></configuration>

View File

@ -34,8 +34,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="mysql.data">
<HintPath>..\library\lib\mysql.data.dll</HintPath>
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.9.5\lib\net40\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
@ -57,6 +58,7 @@
<None Include="Box Upload Xor Pad.bin">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\library\Library.csproj">

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MySql.Data" version="6.9.5" targetFramework="net40-Client" />
</packages>

View File

@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<connectionStrings>
<add name="pkmnFoundationsConnectionString"
connectionString="Server=10.211.55.2;Database=gts;User ID=gts;Password=gts;Pooling=true;charset=utf8"
providerName="MySql.Data.MySqlClient" />
<add name="pkmnFoundationsConnectionString" connectionString="Server=10.211.55.2;Database=gts;User ID=gts;Password=gts;Pooling=true;charset=utf8" providerName="MySql.Data.MySqlClient" />
</connectionStrings>
<appSettings>
<add key="pkmnFoundationsBoxUpload5Dir" value="C:\Users\Greg\SkyDrive\Battle Videos G5"/>
<add key="pkmnFoundationsBoxUpload5Dir" value="C:\Users\Greg\SkyDrive\Battle Videos G5" />
</appSettings>
</configuration>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<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.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data></configuration>

View File

@ -34,8 +34,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="mysql.data">
<HintPath>..\library\lib\mysql.data.dll</HintPath>
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.9.5\lib\net40\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
@ -60,6 +61,7 @@
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MySql.Data" version="6.9.5" targetFramework="net40-Client" />
</packages>

View File

@ -56,9 +56,6 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="mysql.data">
<HintPath>..\library\lib\mysql.data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Core" />

View File

@ -33,8 +33,9 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="mysql.data">
<HintPath>lib\mysql.data.dll</HintPath>
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.9.5\lib\net20\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
@ -105,7 +106,10 @@
<Compile Include="Support\TrendyPhrase5.cs" />
<Compile Include="Support\TrendyPhraseBase.cs" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

9
library/app.config Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<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.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data>
</configuration>

Binary file not shown.

4
library/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MySql.Data" version="6.9.5" targetFramework="net35" />
</packages>

View File

@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
For more information on how to configure your ASP.NET application, please visit
@ -7,9 +7,7 @@
<configuration>
<connectionStrings>
<add name="pkmnFoundationsConnectionString"
connectionString="Server=10.211.55.2;Database=gts;User ID=gts;Password=gts;Pooling=true;charset=utf8"
providerName="MySql.Data.MySqlClient" />
<add name="pkmnFoundationsConnectionString" connectionString="Server=10.211.55.2;Database=gts;User ID=gts;Password=gts;Pooling=true;charset=utf8" providerName="MySql.Data.MySqlClient" />
</connectionStrings>
<system.web>
@ -22,19 +20,19 @@
<membership>
<providers>
<clear/>
<clear />
</providers>
</membership>
<profile>
<providers>
<clear/>
<clear />
</providers>
</profile>
<roleManager enabled="false">
<providers>
<clear/>
<clear />
</providers>
</roleManager>
@ -43,7 +41,12 @@
</system.web>
<system.webServer>
<modules runAllManagedModulesForAllRequests="true"/>
<modules runAllManagedModulesForAllRequests="true" />
<httpErrors existingResponse="PassThrough"></httpErrors>
</system.webServer>
</configuration>
<system.data>
<DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" />
<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.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
</DbProviderFactories>
</system.data></configuration>

4
web/packages.config Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MySql.Data" version="6.9.5" targetFramework="net40" />
</packages>

View File

@ -40,9 +40,9 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="mysql.data, Version=6.8.3.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<Reference Include="MySql.Data, Version=6.9.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\library\lib\mysql.data.dll</HintPath>
<HintPath>..\packages\MySql.Data.6.9.5\lib\net40\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
@ -3470,6 +3470,7 @@
<None Include="admin\Web.Release.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<Content Include="packages.config" />
<None Include="Properties\PublishProfiles\pkmnclassic.net.pubxml" />
<None Include="Web.config">
<SubType>Designer</SubType>