diff --git a/.travis.yml b/.travis.yml index eae2df2e..5bc7696c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,26 +1,18 @@ language: csharp -sudo: required +sudo: false dist: trusty -addons: - apt: - packages: - - gettext - - libcurl4-openssl-dev - - libicu-dev - - libssl-dev - - libunwind8 - - zlib1g env: global: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -mono: - - 4.0.5 +mono: none os: - linux -# - osx -# osx_image: xcode7.1 -# before_install: -# - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi + - osx +osx_image: xcode8.2 +before_install: + - if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/; fi +before_script: + - chmod +x ./build.sh script: - - ./build.sh --quiet verify \ No newline at end of file + - ./build.sh \ No newline at end of file diff --git a/Dommel.sln b/Dommel.sln index 7ac45bc8..366af5ee 100644 --- a/Dommel.sln +++ b/Dommel.sln @@ -1,16 +1,11 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26114.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{29200F34-D24D-4E3F-979A-CB6F2CA7C0F0}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{52003D59-962F-488A-A712-85CB866D6ADF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Dommel", "src\Dommel\Dommel.xproj", "{9D3463BE-F1A3-4B31-A63F-6A84F36E3108}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dommel", "src\Dommel\Dommel.csproj", "{9D3463BE-F1A3-4B31-A63F-6A84F36E3108}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/appveyor.yml b/appveyor.yml index dec7b849..aa0a0e5a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,10 +1,11 @@ init: - git config --global core.autocrlf true build_script: - - build.cmd --quiet verify + - ps: .\build.ps1 clone_depth: 1 test: off deploy: off environment: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 \ No newline at end of file + DOTNET_CLI_TELEMETRY_OPTOUT: 1 +os: Visual Studio 2017 \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index 24ca167c..30cbe3ee 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,6 +1,6 @@ $ErrorActionPreference = "Stop" -function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries) +function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries) { while($true) { @@ -19,7 +19,7 @@ function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $ret Start-Sleep -Seconds 10 } - else + else { $exception = $_.Exception throw $exception @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/8fbf3a9151eb555cedbfe8be8df9082a64c2fecb.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP @@ -43,18 +43,18 @@ $buildFolder = ".build" $buildFile="$buildFolder\KoreBuild.ps1" if (!(Test-Path $buildFolder)) { - Write-Host "Downloading KoreBuild from $koreBuildZip" - + Write-Host "Downloading KoreBuild from $koreBuildZip" + $tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid() New-Item -Path "$tempFolder" -Type directory | Out-Null $localZipFile="$tempFolder\korebuild.zip" - + DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6 Add-Type -AssemblyName System.IO.Compression.FileSystem [System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder) - + New-Item -Path "$buildFolder" -Type directory | Out-Null copy-item "$tempFolder\**\build\*" $buildFolder -Recurse @@ -64,4 +64,4 @@ if (!(Test-Path $buildFolder)) { } } -&"$buildFile" $args \ No newline at end of file +&"$buildFile" @args \ No newline at end of file diff --git a/build.sh b/build.sh index fea9ac64..82f12252 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/rel/1.1.0.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/8fbf3a9151eb555cedbfe8be8df9082a64c2fecb.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi @@ -12,12 +12,12 @@ buildFile="$buildFolder/KoreBuild.sh" if test ! -d $buildFolder; then echo "Downloading KoreBuild from $koreBuildZip" - - tempFolder="/tmp/KoreBuild-$(uuidgen)" + + tempFolder="/tmp/KoreBuild-$(uuidgen)" mkdir $tempFolder - + localZipFile="$tempFolder/korebuild.zip" - + retries=6 until (wget -O $localZipFile $koreBuildZip 2>/dev/null || curl -o $localZipFile --location $koreBuildZip 2>/dev/null) do @@ -29,17 +29,17 @@ if test ! -d $buildFolder; then echo "Waiting 10 seconds before retrying. Retries left: $retries" sleep 10s done - + unzip -q -d $tempFolder $localZipFile - + mkdir $buildFolder cp -r $tempFolder/**/build/** $buildFolder - + chmod +x $buildFile - + # Cleanup - if test ! -d $tempFolder; then - rm -rf $tempFolder + if test -d $tempFolder; then + rm -rf $tempFolder fi fi diff --git a/global.json b/global.json deleted file mode 100644 index a40f26f6..00000000 --- a/global.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "projects": [ "src" ] -} diff --git a/src/Dommel/Dommel.csproj b/src/Dommel/Dommel.csproj new file mode 100644 index 00000000..e5a65a83 --- /dev/null +++ b/src/Dommel/Dommel.csproj @@ -0,0 +1,29 @@ + + + Simple CRUD operations for Dapper. + Copyright © Henk Mollema 2017 + Dommel + 1.8.1 + Henk Mollema + net45;net451;netstandard1.3 + true + dommel;crud;dapper;database;orm + https://github.com/henkmollema/Dommel + https://github.com/henkmollema/Dommel/blob/master/LICENSE + git + https://github.com/henkmollema/Dommel + 1.6.0 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Dommel/Dommel.xproj b/src/Dommel/Dommel.xproj deleted file mode 100644 index e189cc39..00000000 --- a/src/Dommel/Dommel.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25123 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9d3463be-f1a3-4b31-a63f-6a84f36e3108 - Dommel - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/Dommel/project.json b/src/Dommel/project.json deleted file mode 100644 index a296c3f5..00000000 --- a/src/Dommel/project.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": "1.8.0", - "title": "Dommel", - "description": "Simple CRUD operations for Dapper.", - "authors": [ "Henk Mollema" ], - "copyright": "Copyright © Henk Mollema 2017", - "packOptions": { - "owners": [ "Henk Mollema" ], - "summary": "Simple CRUD operations for Dapper.", - "tags": [ "dommel", "crud", "dapper", "database", "orm" ], - "projectUrl": "https://github.com/henkmollema/Dommel", - "licenseUrl": "http://opensource.org/licenses/MIT", - "repository": { - "type": "git", - "url": "https://github.com/henkmollema/Dommel" - } - }, - - "dependencies": { - "Dapper": "1.50.2" - }, - - "frameworks": { - "net45": { - "frameworkAssemblies": { - "System.ComponentModel.DataAnnotations": "4.0.0.0", - "System.Data": "4.0.0.0" - } - }, - "net451": { - "frameworkAssemblies": { - "System.ComponentModel.DataAnnotations": "4.0.0.0", - "System.Data": "4.0.0.0" - } - }, - "netstandard1.3": { - "buildOptions": { - "define": [ "COREFX" ] - }, - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.ComponentModel.Annotations": "4.1.0" - } - } - }, - - "buildOptions": { - "xmlDoc": true - } -}