diff --git a/.gitignore b/.gitignore index a6c3ab6..a4e917b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,8 @@ *.vspscc .builds *.dotCover +obj +bin +packages/* + +Tools/nuget.exe diff --git a/Extension/MySql.csproj b/Extension/MySql.csproj index 84e769d..74e0539 100644 --- a/Extension/MySql.csproj +++ b/Extension/MySql.csproj @@ -1,4 +1,4 @@ - + Local @@ -95,21 +95,45 @@ prompt AllRules.ruleset + + bin\Release\ + false + 437256192 + false + + + TRACE + bin\Release\PhpNetMySql.xml + false + 4096 + false + + + true + false + false + false + 4 + none + prompt + AllRules.ruleset + - - False - ..\MySql.Data\MySql.Data.dll + + ..\packages\MySql.Data.6.9.8\lib\net40\MySql.Data.dll True - - False + + ..\packages\PhpNet.ClassLibrary.0.1\lib\net40\PhpNetClassLibrary.dll + True - - False + + ..\packages\PhpNet.Core.0.1\lib\net40\PhpNetCore.dll + True - False - C:\Windows\Microsoft.NET\assembly\GAC_MSIL\PhpNetCore.Parsers\v4.0_4.0.0.0__0a8e8c4c76728c71\PhpNetCore.Parsers.dll + ..\packages\PhpNet.Core.Parsers.0.1\lib\net40\PhpNetCore.Parsers.dll + True System @@ -146,7 +170,9 @@ + + @@ -176,22 +202,53 @@ + + + +
+ + + + + + + + + + - - - "$(SolutionDir)Tools\gacutil" /u $(TargetName) 1>nul + $(OutputPath)$(TargetName).xml + $(SolutionDir)Tools + $(ToolsDir) + http://nuget.org/nuget.exe + $(NuGetExeDir)\nuget.exe + $(ToolsDir)\gacutil + "$(NuGetExe)" + "$(GacUtilExe)" + -"$(SolutionDir)Tools\gacutil" -f -i "$(ProjectDir)\..\MySql.Data\MySql.Data.dll" -"$(SolutionDir)Tools\gacutil" -f -i "$(TargetPath)" + + + + + -if $(ConfigurationName) == Release ( - xcopy /q /y "$(ProjectDir)..\mysql.data\MySql.Data.dll" "$(SolutionDir)Deployment\Bin" 1>nul - xcopy /q /y "$(TargetDir)$(TargetName).*" "$(SolutionDir)Deployment\Bin" 1>nul -) + + + -if $(ConfigurationName) == Debug ( - xcopy /q /y "$(ProjectDir)..\mysql.data\MySql.Data.dll" "$(SolutionDir)Deployment\Debug" 1>nul - xcopy /q /y "$(TargetDir)$(TargetName).*" "$(SolutionDir)Deployment\Debug" 1>nul -) - - \ No newline at end of file + + + + + + + + $(OutputPath)..\$(Configuration)-NuGet + + + + + diff --git a/Extension/MySql.nuspec b/Extension/MySql.nuspec new file mode 100644 index 0000000..55b38fa --- /dev/null +++ b/Extension/MySql.nuspec @@ -0,0 +1,24 @@ + + + + PhpNet.Extension.MySql + 0.1 + Phalanger MySql Extension + The Phalanger Project + The Phalanger Project + https://raw.githubusercontent.com/DEVSENSE/PhalangerMySql/master/LICENSE.txt + https://github.com/DEVSENSE/PhalangerMySql + http://download-codeplex.sec.s-msft.com/Download?ProjectName=Phalanger&DownloadId=240061 + false + $description$ + Summary of changes made in this release of the package. + Copyright 2016 + PHP Phalanger Extension MySql Database + + + + + + + + \ No newline at end of file diff --git a/Extension/app.config b/Extension/app.config new file mode 100644 index 0000000..74c0d88 --- /dev/null +++ b/Extension/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Extension/packages.config b/Extension/packages.config new file mode 100644 index 0000000..5c6438c --- /dev/null +++ b/Extension/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/MySql.Data/MySql.Data.dll b/MySql.Data/MySql.Data.dll deleted file mode 100644 index 87aabe6..0000000 Binary files a/MySql.Data/MySql.Data.dll and /dev/null differ diff --git a/MySql.Data/README.txt b/MySql.Data/README.txt deleted file mode 100644 index ba8a898..0000000 --- a/MySql.Data/README.txt +++ /dev/null @@ -1 +0,0 @@ -MySql.Data.dll is obtained from http://dev.mysql.com/downloads/connector/net, .NET & Mono platform. \ No newline at end of file diff --git a/MySql.sln b/MySql.sln index b995cd5..a88a82a 100644 --- a/MySql.sln +++ b/MySql.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MySql", "Extension\MySql.csproj", "{D3C83649-9B7F-46BF-9984-FFDE06C7C2DD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PDOMySQL", "PDOMySQL\PDOMySQL.csproj", "{97CEC9F9-ED05-4093-BF1E-01FB75D7014C}" @@ -9,35 +11,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documents", "Documents", "{ ProjectSection(SolutionItems) = preProject LICENSE.txt = LICENSE.txt README.txt = README.txt - MySql.Data\README.txt = MySql.Data\README.txt EndProjectSection EndProject Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 3 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = https://team.corp.devsense.com:8443/tfs/projects - SccLocalPath0 = . - SccProjectUniqueName1 = Extension\\MySql.csproj - SccProjectName1 = Extension - SccLocalPath1 = Extension - SccProjectUniqueName2 = PDOMySQL\\PDOMySQL.csproj - SccProjectName2 = PDOMySQL - SccLocalPath2 = PDOMySQL - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + ReleaseGAC|Any CPU = ReleaseGAC|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {D3C83649-9B7F-46BF-9984-FFDE06C7C2DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D3C83649-9B7F-46BF-9984-FFDE06C7C2DD}.Debug|Any CPU.Build.0 = Debug|Any CPU {D3C83649-9B7F-46BF-9984-FFDE06C7C2DD}.Release|Any CPU.ActiveCfg = Release|Any CPU {D3C83649-9B7F-46BF-9984-FFDE06C7C2DD}.Release|Any CPU.Build.0 = Release|Any CPU + {D3C83649-9B7F-46BF-9984-FFDE06C7C2DD}.ReleaseGAC|Any CPU.ActiveCfg = ReleaseGAC|Any CPU + {D3C83649-9B7F-46BF-9984-FFDE06C7C2DD}.ReleaseGAC|Any CPU.Build.0 = ReleaseGAC|Any CPU {97CEC9F9-ED05-4093-BF1E-01FB75D7014C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {97CEC9F9-ED05-4093-BF1E-01FB75D7014C}.Debug|Any CPU.Build.0 = Debug|Any CPU {97CEC9F9-ED05-4093-BF1E-01FB75D7014C}.Release|Any CPU.ActiveCfg = Release|Any CPU {97CEC9F9-ED05-4093-BF1E-01FB75D7014C}.Release|Any CPU.Build.0 = Release|Any CPU + {97CEC9F9-ED05-4093-BF1E-01FB75D7014C}.ReleaseGAC|Any CPU.ActiveCfg = ReleaseGAC|Any CPU + {97CEC9F9-ED05-4093-BF1E-01FB75D7014C}.ReleaseGAC|Any CPU.Build.0 = ReleaseGAC|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/PDOMySQL/PDOMySQL.csproj b/PDOMySQL/PDOMySQL.csproj index d76808a..dc31908 100644 --- a/PDOMySQL/PDOMySQL.csproj +++ b/PDOMySQL/PDOMySQL.csproj @@ -36,6 +36,15 @@ 4 1591 + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + 1591 + true @@ -43,26 +52,25 @@ ..\Extension\Extensions.snk - - False - ..\MySql\MySql.Data\MySql.Data.dll + + ..\packages\MySql.Data.6.9.8\lib\net40\MySql.Data.dll True - False - C:\Windows\Microsoft.NET\assembly\GAC_MSIL\PhpNetClassLibrary\v4.0_4.0.0.0__4af37afe3cde05fb\PhpNetClassLibrary.dll + ..\packages\PhpNet.ClassLibrary.0.1\lib\net40\PhpNetClassLibrary.dll + True - False - C:\Windows\Microsoft.NET\assembly\GAC_MSIL\PhpNetCore\v4.0_4.0.0.0__0a8e8c4c76728c71\PhpNetCore.dll + ..\packages\PhpNet.Core.0.1\lib\net40\PhpNetCore.dll + True - False - C:\Windows\Microsoft.NET\assembly\GAC_MSIL\PhpNetCore.Parsers\v4.0_4.0.0.0__0a8e8c4c76728c71\PhpNetCore.Parsers.dll + ..\packages\PhpNet.Core.Parsers.0.1\lib\net40\PhpNetCore.Parsers.dll + True - False - C:\Windows\Microsoft.NET\assembly\GAC_MSIL\PhpNetPDO\v4.0_4.0.0.0__2771987119c16a03\PhpNetPDO.dll + ..\packages\PhpNet.Extension.PDO.0.1\lib\net40\PhpNetPDO.dll + True @@ -85,23 +93,55 @@ MySql + + + + + + +
+ + + + + + + + + - "$(SolutionDir)Tools\gacutil" /u $(TargetName) 1>nul -"$(SolutionDir)Tools\gacutil" -f -i "$(TargetPath)" - -if $(ConfigurationName) == Release ( -xcopy /q /y "$(TargetDir)$(TargetName).*" "$(SolutionDir)Deployment\bin" 1>nul -) -if $(ConfigurationName) == Debug ( -xcopy /q /y "$(TargetDir)$(TargetName).*" "$(SolutionDir)Deployment\Debug" 1>nul -) + $(SolutionDir)Tools + $(ToolsDir) + http://nuget.org/nuget.exe + $(NuGetExeDir)/nuget.exe + $(ToolsDir)/gacutil + "$(NuGetExe)" + "$(GacUtilExe)" - + + + + + + + + + + + + + + + + + + $(OutputPath)..\Release-NuGet + + + + \ No newline at end of file diff --git a/PDOMySQL/PDOMySQL.nuspec b/PDOMySQL/PDOMySQL.nuspec new file mode 100644 index 0000000..21a2ff2 --- /dev/null +++ b/PDOMySQL/PDOMySQL.nuspec @@ -0,0 +1,26 @@ + + + + PhpNet.Extension.PDOMySql + 0.1 + Phalanger MySql Extension + The Phalanger Project + The Phalanger Project + https://raw.githubusercontent.com/DEVSENSE/PhalangerMySql/master/LICENSE.txt + https://github.com/DEVSENSE/PhalangerMySql + http://download-codeplex.sec.s-msft.com/Download?ProjectName=Phalanger&DownloadId=240061 + false + $description$ + Summary of changes made in this release of the package. + Copyright 2016 + PHP Phalanger Extension Data Objects PDO MySql Database + + + + + + + + + + \ No newline at end of file diff --git a/PDOMySQL/app.config b/PDOMySQL/app.config new file mode 100644 index 0000000..74c0d88 --- /dev/null +++ b/PDOMySQL/app.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/PDOMySQL/packages.config b/PDOMySQL/packages.config new file mode 100644 index 0000000..88d703d --- /dev/null +++ b/PDOMySQL/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/mysql.data/MySql.Data.dll b/mysql.data/MySql.Data.dll deleted file mode 100644 index 87aabe6..0000000 Binary files a/mysql.data/MySql.Data.dll and /dev/null differ