This repository has been archived by the owner on Nov 3, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 35
Issue #9 - Extending the IDbExecutor interface #10
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <solution> | ||
| <add key="disableSourceControlIntegration" value="true" /> | ||
| </solution> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <solution> | ||
| <add key="disableSourceControlIntegration" value="true" /> | ||
| </solution> | ||
| </configuration> | ||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,151 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
|
|
||
| <!-- #### NOTE #### --> | ||
| <!-- To build with Mono's xbuild on bash, you must execute [`sudo install-nuget.sh`](https://gist.github.com/2595337) first. --> | ||
|
|
||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir> | ||
|
|
||
| <!-- Windows specific commands --> | ||
| <PackagesConfig Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig> | ||
| <PackagesDir Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir> | ||
| <LocatorCommand Condition=" '$(OS)' == 'Windows_NT'">where</LocatorCommand> | ||
|
|
||
| <!-- We need to launch nuget.exe with the mono command if we're not on windows --> | ||
| <PackagesConfig Condition=" '$(OS)' != 'Windows_NT' ">packages.config</PackagesConfig> | ||
| <PackagesDir Condition=" '$(OS)' != 'Windows_NT'">$(SolutionDir)packages</PackagesDir> | ||
| <LocatorCommand Condition=" '$(OS)' != 'Windows_NT'">which</LocatorCommand> | ||
|
|
||
| <!-- NuGet command --> | ||
| <NuGetCommand>nuget</NuGetCommand> | ||
|
|
||
| <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir> | ||
|
|
||
| <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config --> | ||
| <PackageSources>""</PackageSources> | ||
|
|
||
| <!-- Enable the restore command to run before builds --> | ||
| <RestorePackages Condition="$(RestorePackages) == ''">false</RestorePackages> | ||
|
|
||
| <!-- Commands --> | ||
| <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source $(PackageSources) -o "$(PackagesDir)"</RestoreCommand> | ||
|
|
||
| <!-- Make the build depend on restore packages --> | ||
| <BuildDependsOn Condition="$(RestorePackages) == 'true'"> | ||
| RestorePackages; | ||
| $(BuildDependsOn); | ||
| </BuildDependsOn> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="CheckPrerequisites"> | ||
| <!-- Try to locate `nuget`. --> | ||
| <Exec Command="$(LocatorCommand) $(NuGetCommand)" IgnoreExitCode="True"> | ||
| <Output TaskParameter="ExitCode" PropertyName="NuGetExeExitCode"/> | ||
| </Exec> | ||
| <!-- Raise an error if `nuget` wasn't located. --> | ||
| <Error Text="Failed to locate `nuget`; please make sure your PATH environment variable includes a path to `nuget`." Condition="'$(NuGetExeExitCode)' != '' and '$(NuGetExeExitCode)' != '0'" /> | ||
| </Target> | ||
|
|
||
| <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites"> | ||
| <Exec Command="$(RestoreCommand)" | ||
| Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" /> | ||
|
|
||
| <Exec Command="$(RestoreCommand)" | ||
| LogStandardErrorAsError="true" | ||
| Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" /> | ||
| </Target> | ||
| </Project> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <PropertyGroup> | ||
| <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir> | ||
|
|
||
| <!-- Enable the restore command to run before builds --> | ||
| <RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages> | ||
|
|
||
| <!-- Property that enables building a package from a project --> | ||
| <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage> | ||
|
|
||
| <!-- Determines if package restore consent is required to restore packages --> | ||
| <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent> | ||
|
|
||
| <!-- Download NuGet.exe if it does not already exist --> | ||
| <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(PackageSources)' == '' "> | ||
| <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used --> | ||
| <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list --> | ||
| <!-- | ||
| <PackageSource Include="https://www.nuget.org/api/v2/" /> | ||
| <PackageSource Include="https://my-nuget-source/nuget/" /> | ||
| --> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'"> | ||
| <!-- Windows specific commands --> | ||
| <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'"> | ||
| <!-- We need to launch nuget.exe with the mono command if we're not on windows --> | ||
| <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PackagesProjectConfig>packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig> | ||
| </PropertyGroup> | ||
|
|
||
| <Choose> | ||
| <When Condition="Exists('$(PackagesProjectConfig)')"> | ||
| <PropertyGroup> | ||
| <PackagesConfig>$(PackagesProjectConfig)</PackagesConfig> | ||
| </PropertyGroup> | ||
| </When> | ||
| <When Condition="Exists('packages.config')"> | ||
| <PropertyGroup> | ||
| <PackagesConfig>packages.config</PackagesConfig> | ||
| </PropertyGroup> | ||
| </When> | ||
| </Choose> | ||
|
|
||
| <PropertyGroup> | ||
| <!-- NuGet command --> | ||
| <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath> | ||
| <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources> | ||
|
|
||
| <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand> | ||
| <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand> | ||
|
|
||
| <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir> | ||
|
|
||
| <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch> | ||
| <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch> | ||
|
|
||
| <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir> | ||
| <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir> | ||
|
|
||
| <!-- Commands --> | ||
| <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand> | ||
| <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" -symbols</BuildCommand> | ||
|
|
||
| <!-- We need to ensure packages are restored prior to assembly resolve --> | ||
| <BuildDependsOn Condition="$(RestorePackages) == 'true'"> | ||
| RestorePackages; | ||
| $(BuildDependsOn); | ||
| </BuildDependsOn> | ||
|
|
||
| <!-- Make the build depend on restore packages --> | ||
| <BuildDependsOn Condition="$(BuildPackage) == 'true'"> | ||
| $(BuildDependsOn); | ||
| BuildPackage; | ||
| </BuildDependsOn> | ||
| </PropertyGroup> | ||
|
|
||
| <Target Name="CheckPrerequisites"> | ||
| <!-- Raise an error if we're unable to locate nuget.exe --> | ||
| <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" /> | ||
| <!-- | ||
| Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once. | ||
| This effectively acts as a lock that makes sure that the download operation will only happen once and all | ||
| parallel builds will have to wait for it to complete. | ||
| --> | ||
| <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" /> | ||
| </Target> | ||
|
|
||
| <Target Name="_DownloadNuGet"> | ||
| <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" /> | ||
| </Target> | ||
|
|
||
| <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites"> | ||
| <Exec Command="$(RestoreCommand)" | ||
| Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" /> | ||
|
|
||
| <Exec Command="$(RestoreCommand)" | ||
| LogStandardErrorAsError="true" | ||
| Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" /> | ||
| </Target> | ||
|
|
||
| <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites"> | ||
| <Exec Command="$(BuildCommand)" | ||
| Condition=" '$(OS)' != 'Windows_NT' " /> | ||
|
|
||
| <Exec Command="$(BuildCommand)" | ||
| LogStandardErrorAsError="true" | ||
| Condition=" '$(OS)' == 'Windows_NT' " /> | ||
| </Target> | ||
|
|
||
| <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll"> | ||
| <ParameterGroup> | ||
| <OutputFilename ParameterType="System.String" Required="true" /> | ||
| </ParameterGroup> | ||
| <Task> | ||
| <Reference Include="System.Core" /> | ||
| <Using Namespace="System" /> | ||
| <Using Namespace="System.IO" /> | ||
| <Using Namespace="System.Net" /> | ||
| <Using Namespace="Microsoft.Build.Framework" /> | ||
| <Using Namespace="Microsoft.Build.Utilities" /> | ||
| <Code Type="Fragment" Language="cs"> | ||
| <![CDATA[ | ||
| try { | ||
| OutputFilename = Path.GetFullPath(OutputFilename); | ||
|
|
||
| Log.LogMessage("Downloading latest version of NuGet.exe..."); | ||
| WebClient webClient = new WebClient(); | ||
| webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename); | ||
|
|
||
| return true; | ||
| } | ||
| catch (Exception ex) { | ||
| Log.LogErrorFromException(ex); | ||
| return false; | ||
| } | ||
| ]]> | ||
| </Code> | ||
| </Task> | ||
| </UsingTask> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,38 @@ | ||
| | ||
| Microsoft Visual Studio Solution File, Format Version 11.00 | ||
| # Visual Studio 2010 | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1B3ADF38-DC0C-4F69-854C-5333D9B1D4EB}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| Build-Package.ps1 = Build-Package.ps1 | ||
| Build-Solution.ps1 = Build-Solution.ps1 | ||
| DapperWrapper.msbuild = DapperWrapper.msbuild | ||
| LICENSE.txt = LICENSE.txt | ||
| .nuget\NuGet.Config = .nuget\NuGet.Config | ||
| .nuget\NuGet.targets = .nuget\NuGet.targets | ||
| README.markdown = README.markdown | ||
| EndProjectSection | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DapperWrapper", "DapperWrapper\DapperWrapper.csproj", "{0E94BB6B-8213-4B74-B362-A84D42B1AE5D}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Release|Any CPU = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {0E94BB6B-8213-4B74-B362-A84D42B1AE5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {0E94BB6B-8213-4B74-B362-A84D42B1AE5D}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {0E94BB6B-8213-4B74-B362-A84D42B1AE5D}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {0E94BB6B-8213-4B74-B362-A84D42B1AE5D}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| EndGlobal | ||
| | ||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio 2013 | ||
| VisualStudioVersion = 12.0.30110.0 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{1B3ADF38-DC0C-4F69-854C-5333D9B1D4EB}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| Build-Package.ps1 = Build-Package.ps1 | ||
| Build-Solution.ps1 = Build-Solution.ps1 | ||
| DapperWrapper.msbuild = DapperWrapper.msbuild | ||
| LICENSE.txt = LICENSE.txt | ||
| README.markdown = README.markdown | ||
| EndProjectSection | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DapperWrapper", "DapperWrapper\DapperWrapper.csproj", "{0E94BB6B-8213-4B74-B362-A84D42B1AE5D}" | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{9CB68EF8-6A18-424A-923B-36A39FAF5B00}" | ||
| ProjectSection(SolutionItems) = preProject | ||
| .nuget\NuGet.Config = .nuget\NuGet.Config | ||
| .nuget\NuGet.exe = .nuget\NuGet.exe | ||
| .nuget\NuGet.targets = .nuget\NuGet.targets | ||
| EndProjectSection | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Release|Any CPU = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {0E94BB6B-8213-4B74-B362-A84D42B1AE5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {0E94BB6B-8213-4B74-B362-A84D42B1AE5D}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {0E94BB6B-8213-4B74-B362-A84D42B1AE5D}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {0E94BB6B-8213-4B74-B362-A84D42B1AE5D}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is what I get for not having a
.gitattributesfile in this repo 😢. I'll fix this up after I merge it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I couldn't build the sln when i first cloned it. So i enabled NuGet package restore which put the nuget.exe in and (i think) updated one or both (existing) nuget.config/.targets files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm with you. But this file didn't actually change; it's only showing as changed because of line endings, because I haven't put a .gitattributes file in.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh Ha yeah. I miss read - thinking it said git IGNORE.
FML + git EOF crazyness.