diff --git a/.gitignore b/.gitignore index 661e18d..9db493b 100644 --- a/.gitignore +++ b/.gitignore @@ -196,3 +196,5 @@ FakesAssemblies/ # Visual Studio 6 workspace options file *.opt + +tools/ diff --git a/GitVersion.yml b/GitVersion.yml new file mode 100644 index 0000000..68073a8 --- /dev/null +++ b/GitVersion.yml @@ -0,0 +1,2 @@ +mode: Mainline +increment: Patch \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml index ad5b79c..6b1466e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,13 +1,24 @@ +environment: + IGNORE_NORMALISATION_GIT_HEAD_MOVE: 1 + image: Visual Studio 2017 cache: - packages -> **\packages.config +install: + - choco install gitversion.portable -pre -y + +before_build: + - ps: C:\ProgramData\chocolatey\bin\gfv.exe $env:APPVEYOR_BUILD_FOLDER /l console /output buildserver /updateAssemblyInfo /nofetch + build_script: - - ./build.cmd /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" + - ps: ./build.ps1 test: off +skip_tags: true + artifacts: - path: ./msbuild.log - path: ./artifacts/*.nupkg @@ -17,3 +28,9 @@ deploy: name: NuGet on: branch: master + + - provider: Environment + name: GitHub + github_tag_name: v$(GitVersion_NuGetVersionV2) + on: + branch: master \ No newline at end of file diff --git a/build.cake b/build.cake new file mode 100644 index 0000000..453604d --- /dev/null +++ b/build.cake @@ -0,0 +1,77 @@ +#tool "nuget:?package=xunit.runner.console" + +var target = Argument("target", "Default"); +var configuration = Argument("configuration", "Release"); +var solution = "./Filter.sln"; +var publishDirectory = Directory("./artifacts"); + +Task("Clean") + .Does(() => + { + CleanDirectory(publishDirectory); + }); + +Task("Restore") + .IsDependentOn("Clean") + .Does(() => + { + NuGetRestore(solution); + }); + +Task("Build") + .IsDependentOn("Restore") + .Does(() => + { + MSBuild(solution, settings => + settings.SetConfiguration(configuration) + .WithProperty("TreatWarningsAsErrors", "False") + .SetVerbosity(Verbosity.Minimal) + .AddFileLogger()); + }); + +Task("Test") + .IsDependentOn("Build") + .Does(() => + { + XUnit2("./tests/**/bin/" + configuration + "/*.Tests.dll", new XUnit2Settings()); + }); + +Task("Publish") + .IsDependentOn("Test") + .Does(() => + { + NuGetPack("./src/Filter/Filter.csproj", new NuGetPackSettings + { + OutputDirectory = publishDirectory, + Version = EnvironmentVariable("GitVersion_NuGetVersionV2"), + Properties = new Dictionary + { + { "Configuration", configuration } + } + }); + + NuGetPack("./src/Range.Web.Http/Range.Web.Http.csproj", new NuGetPackSettings + { + OutputDirectory = publishDirectory, + Version = EnvironmentVariable("GitVersion_NuGetVersionV2"), + Properties = new Dictionary + { + { "Configuration", configuration } + } + }); + + NuGetPack("./src/Filter.Nest/Filter.Nest.csproj", new NuGetPackSettings + { + OutputDirectory = publishDirectory, + Version = EnvironmentVariable("GitVersion_NuGetVersionV2"), + Properties = new Dictionary + { + { "Configuration", configuration } + } + }); + }); + +Task("Default") + .IsDependentOn("Publish"); + +RunTarget(target); \ No newline at end of file diff --git a/build.cmd b/build.cmd deleted file mode 100755 index 5075bea..0000000 --- a/build.cmd +++ /dev/null @@ -1,45 +0,0 @@ -@echo Off -pushd %~dp0 -setlocal - -set CACHED_NUGET=%LOCALAPPDATA%\NuGet\NuGet.exe -if exist %CACHED_NUGET% goto CopyNuGet - -echo Downloading latest version of NuGet.exe... -if not exist %LOCALAPPDATA%\NuGet @mkdir %LOCALAPPDATA%\NuGet -@powershell -NoProfile -ExecutionPolicy Unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://www.nuget.org/nuget.exe' -OutFile '%CACHED_NUGET%'" - -:CopyNuGet -if exist .nuget\nuget.exe goto Build -if not exist .nuget @mkdir .nuget -@copy %CACHED_NUGET% .nuget\nuget.exe > nul - -:Build - -:: Find the most recent 32bit MSBuild.exe on the system. Also handle x86 operating systems, where %PROGRAMFILES(X86)% -:: is not defined. Always quote the %MSBUILD% value when setting the variable and never quote %MSBUILD% references. -set MSBUILD="%PROGRAMFILES(X86)%\MSBuild\14.0\Bin\MSBuild.exe" -if not exist %MSBUILD% @set MSBUILD="%PROGRAMFILES%\MSBuild\14.0\Bin\MSBuild.exe" -if not exist %MSBUILD% @set MSBUILD="%PROGRAMFILES(X86)%\MSBuild\12.0\Bin\MSBuild.exe" -if not exist %MSBUILD% @set MSBUILD="%PROGRAMFILES%\MSBuild\12.0\Bin\MSBuild.exe" -if not exist %MSBUILD% @set MSBUILD="%SYSTEMROOT%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" - -%MSBUILD% build\Build.msbuild /nologo /m /v:m /fl /flp:LogFile=msbuild.log;Verbosity=Detailed /nr:false %* - -if %ERRORLEVEL% neq 0 goto BuildFail -goto BuildSuccess - -:BuildFail -echo. -echo *** BUILD FAILED *** -goto End - -:BuildSuccess -echo. -echo *** BUILD SUCCEEDED *** -goto End - -:End -echo. -popd -exit /B %ERRORLEVEL% diff --git a/build.ps1 b/build.ps1 new file mode 100644 index 0000000..96774db --- /dev/null +++ b/build.ps1 @@ -0,0 +1,243 @@ +# Ref. https://raw.githubusercontent.com/cake-build/resources/480522f00dc9671225c0d32713d858dc5ac1d56e/build.ps1 +########################################################################## +# This is the Cake bootstrapper script for PowerShell. +# This file was downloaded from https://github.com/cake-build/resources +# Feel free to change this file to fit your needs. +########################################################################## + +<# + +.SYNOPSIS +This is a Powershell script to bootstrap a Cake build. + +.DESCRIPTION +This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) +and execute your Cake build script with the parameters you provide. + +.PARAMETER Script +The build script to execute. +.PARAMETER Target +The build script target to run. +.PARAMETER Configuration +The build configuration to use. +.PARAMETER Verbosity +Specifies the amount of information to be displayed. +.PARAMETER ShowDescription +Shows description about tasks. +.PARAMETER DryRun +Performs a dry run. +.PARAMETER SkipToolPackageRestore +Skips restoring of packages. +.PARAMETER ScriptArgs +Remaining arguments are added here. + +.LINK +https://cakebuild.net + +#> + +[CmdletBinding()] +Param( + [string]$Script = "build.cake", + [string]$Target, + [string]$Configuration, + [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] + [string]$Verbosity, + [switch]$ShowDescription, + [Alias("WhatIf", "Noop")] + [switch]$DryRun, + [switch]$SkipToolPackageRestore, + [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] + [string[]]$ScriptArgs +) + +# Attempt to set highest encryption available for SecurityProtocol. +# PowerShell will not set this by default (until maybe .NET 4.6.x). This +# will typically produce a message for PowerShell v2 (just an info +# message though) +try { + # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48) + # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't + # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is + # installed (.NET 4.5 is an in-place upgrade). + [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48 + } catch { + Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3' + } + +[Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null +function MD5HashFile([string] $filePath) +{ + if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) + { + return $null + } + + [System.IO.Stream] $file = $null; + [System.Security.Cryptography.MD5] $md5 = $null; + try + { + $md5 = [System.Security.Cryptography.MD5]::Create() + $file = [System.IO.File]::OpenRead($filePath) + return [System.BitConverter]::ToString($md5.ComputeHash($file)) + } + finally + { + if ($file -ne $null) + { + $file.Dispose() + } + } +} + +function GetProxyEnabledWebClient +{ + $wc = New-Object System.Net.WebClient + $proxy = [System.Net.WebRequest]::GetSystemWebProxy() + $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials + $wc.Proxy = $proxy + return $wc +} + +Write-Host "Preparing to run build script..." + +if(!$PSScriptRoot){ + $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent +} + +$TOOLS_DIR = Join-Path $PSScriptRoot "tools" +$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins" +$MODULES_DIR = Join-Path $TOOLS_DIR "Modules" +$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" +$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" +$NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" +$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" +$PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" +$ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" +$MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" + +# Make sure tools folder exists +if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { + Write-Verbose -Message "Creating tools directory..." + New-Item -Path $TOOLS_DIR -Type directory | out-null +} + +# Make sure that packages.config exist. +if (!(Test-Path $PACKAGES_CONFIG)) { + Write-Verbose -Message "Downloading packages.config..." + try { + $wc = GetProxyEnabledWebClient + $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) + } catch { + Throw "Could not download packages.config." + } +} + +# Try find NuGet.exe in path if not exists +if (!(Test-Path $NUGET_EXE)) { + Write-Verbose -Message "Trying to find nuget.exe in PATH..." + $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) } + $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 + if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { + Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." + $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName + } +} + +# Try download NuGet.exe if not exists +if (!(Test-Path $NUGET_EXE)) { + Write-Verbose -Message "Downloading NuGet.exe..." + try { + $wc = GetProxyEnabledWebClient + $wc.DownloadFile($NUGET_URL, $NUGET_EXE) + } catch { + Throw "Could not download NuGet.exe." + } +} + +# Save nuget.exe path to environment to be available to child processed +$ENV:NUGET_EXE = $NUGET_EXE + +# Restore tools from NuGet? +if(-Not $SkipToolPackageRestore.IsPresent) { + Push-Location + Set-Location $TOOLS_DIR + + # Check for changes in packages.config and remove installed tools if true. + [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG) + if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or + ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { + Write-Verbose -Message "Missing or changed package.config hash..." + Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery | + Remove-Item -Recurse + } + + Write-Verbose -Message "Restoring tools from NuGet..." + $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" + + if ($LASTEXITCODE -ne 0) { + Throw "An error occurred while restoring NuGet tools." + } + else + { + $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" + } + Write-Verbose -Message ($NuGetOutput | out-string) + + Pop-Location +} + +# Restore addins from NuGet +if (Test-Path $ADDINS_PACKAGES_CONFIG) { + Push-Location + Set-Location $ADDINS_DIR + + Write-Verbose -Message "Restoring addins from NuGet..." + $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" + + if ($LASTEXITCODE -ne 0) { + Throw "An error occurred while restoring NuGet addins." + } + + Write-Verbose -Message ($NuGetOutput | out-string) + + Pop-Location +} + +# Restore modules from NuGet +if (Test-Path $MODULES_PACKAGES_CONFIG) { + Push-Location + Set-Location $MODULES_DIR + + Write-Verbose -Message "Restoring modules from NuGet..." + $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" + + if ($LASTEXITCODE -ne 0) { + Throw "An error occurred while restoring NuGet modules." + } + + Write-Verbose -Message ($NuGetOutput | out-string) + + Pop-Location +} + +# Make sure that Cake has been installed. +if (!(Test-Path $CAKE_EXE)) { + Throw "Could not find Cake.exe at $CAKE_EXE" +} + + + +# Build Cake arguments +$cakeArguments = @("$Script"); +if ($Target) { $cakeArguments += "-target=$Target" } +if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } +if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" } +if ($ShowDescription) { $cakeArguments += "-showdescription" } +if ($DryRun) { $cakeArguments += "-dryrun" } +$cakeArguments += $ScriptArgs + +# Start Cake +Write-Host "Running build script..." +&$CAKE_EXE $cakeArguments +exit $LASTEXITCODE diff --git a/build.sh b/build.sh new file mode 100644 index 0000000..a44c3aa --- /dev/null +++ b/build.sh @@ -0,0 +1,118 @@ +#!/usr/bin/env bash + +# Ref. https://raw.githubusercontent.com/cake-build/resources/b114c0c2914623dbf7c8fea830364420c8fa77f7/build.sh +########################################################################## +# This is the Cake bootstrapper script for Linux and OS X. +# This file was downloaded from https://github.com/cake-build/resources +# Feel free to change this file to fit your needs. +########################################################################## + +# Define directories. +SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +TOOLS_DIR=$SCRIPT_DIR/tools +ADDINS_DIR=$TOOLS_DIR/Addins +MODULES_DIR=$TOOLS_DIR/Modules +NUGET_EXE=$TOOLS_DIR/nuget.exe +CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe +PACKAGES_CONFIG=$TOOLS_DIR/packages.config +PACKAGES_CONFIG_MD5=$TOOLS_DIR/packages.config.md5sum +ADDINS_PACKAGES_CONFIG=$ADDINS_DIR/packages.config +MODULES_PACKAGES_CONFIG=$MODULES_DIR/packages.config + +# Define md5sum or md5 depending on Linux/OSX +MD5_EXE= +if [[ "$(uname -s)" == "Darwin" ]]; then + MD5_EXE="md5 -r" +else + MD5_EXE="md5sum" +fi + +# Define default arguments. +SCRIPT="build.cake" +CAKE_ARGUMENTS=() + +# Parse arguments. +for i in "$@"; do + case $1 in + -s|--script) SCRIPT="$2"; shift ;; + --) shift; CAKE_ARGUMENTS+=("$@"); break ;; + *) CAKE_ARGUMENTS+=("$1") ;; + esac + shift +done + +# Make sure the tools folder exist. +if [ ! -d "$TOOLS_DIR" ]; then + mkdir "$TOOLS_DIR" +fi + +# Make sure that packages.config exist. +if [ ! -f "$TOOLS_DIR/packages.config" ]; then + echo "Downloading packages.config..." + curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages + if [ $? -ne 0 ]; then + echo "An error occurred while downloading packages.config." + exit 1 + fi +fi + +# Download NuGet if it does not exist. +if [ ! -f "$NUGET_EXE" ]; then + echo "Downloading NuGet..." + curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe + if [ $? -ne 0 ]; then + echo "An error occurred while downloading nuget.exe." + exit 1 + fi +fi + +# Restore tools from NuGet. +pushd "$TOOLS_DIR" >/dev/null +if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then + find . -type d ! -name . ! -name 'Cake.Bakery' | xargs rm -rf +fi + +mono "$NUGET_EXE" install -ExcludeVersion +if [ $? -ne 0 ]; then + echo "Could not restore NuGet tools." + exit 1 +fi + +$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5" + +popd >/dev/null + +# Restore addins from NuGet. +if [ -f "$ADDINS_PACKAGES_CONFIG" ]; then + pushd "$ADDINS_DIR" >/dev/null + + mono "$NUGET_EXE" install -ExcludeVersion + if [ $? -ne 0 ]; then + echo "Could not restore NuGet addins." + exit 1 + fi + + popd >/dev/null +fi + +# Restore modules from NuGet. +if [ -f "$MODULES_PACKAGES_CONFIG" ]; then + pushd "$MODULES_DIR" >/dev/null + + mono "$NUGET_EXE" install -ExcludeVersion + if [ $? -ne 0 ]; then + echo "Could not restore NuGet modules." + exit 1 + fi + + popd >/dev/null +fi + +# Make sure that Cake has been installed. +if [ ! -f "$CAKE_EXE" ]; then + echo "Could not find Cake.exe at '$CAKE_EXE'." + exit 1 +fi + +# Start Cake +exec mono "$CAKE_EXE" $SCRIPT "${CAKE_ARGUMENTS[@]}" \ No newline at end of file diff --git a/build/Build.Settings.targets b/build/Build.Settings.targets deleted file mode 100644 index c8da139..0000000 --- a/build/Build.Settings.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - $(MSBuildThisFileDirectory)Build.targets - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - diff --git a/build/Build.Version.targets b/build/Build.Version.targets deleted file mode 100644 index f8c0f30..0000000 --- a/build/Build.Version.targets +++ /dev/null @@ -1,36 +0,0 @@ - - - - 0 - 13 - 1 - - - - $(MajorVersion).$(MinorVersion) - $(MajorVersion).$(MinorVersion).$(PatchVersion) - - - - - - <_Parameter1>$(AssemblyVersion) - - - <_Parameter1>$(PackageVersion) - - - - - - - - - - - - GenerateAssemblyInfo; - $(BuildDependsOn); - - - diff --git a/build/Build.msbuild b/build/Build.msbuild deleted file mode 100644 index 1050215..0000000 --- a/build/Build.msbuild +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - Release - - true - - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\')) - $(RootPath).nuget\nuget.exe - $(RootPath)artifacts - - 0.0.0 - - - - - - Configuration=$(Configuration); - MvcBuildViews=true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(GitVersion_NuGetVersion) - 0.0.0 - - - - - - - - - - - - - - - - - diff --git a/build/Build.targets b/build/Build.targets deleted file mode 100644 index a8e027b..0000000 --- a/build/Build.targets +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/build/Xunit.targets b/build/Xunit.targets deleted file mode 100644 index b0c0502..0000000 --- a/build/Xunit.targets +++ /dev/null @@ -1,24 +0,0 @@ - - - - false - - - - - - - - - - - - - - - - diff --git a/samples/Range.Web.Http/Range.Web.Http.csproj b/samples/Range.Web.Http/Range.Web.Http.csproj index 039c71a..0d5bf26 100755 --- a/samples/Range.Web.Http/Range.Web.Http.csproj +++ b/samples/Range.Web.Http/Range.Web.Http.csproj @@ -13,13 +13,14 @@ Properties Range.Web.Http Range.Web.Http - v4.5 + v4.6.2 false true + latest true @@ -76,9 +77,6 @@ ..\..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.2\lib\net45\System.Web.Http.WebHost.dll - - - diff --git a/src/Filter.Nest/Filter.Nest.csproj b/src/Filter.Nest/Filter.Nest.csproj index 98ef8d2..66007e8 100755 --- a/src/Filter.Nest/Filter.Nest.csproj +++ b/src/Filter.Nest/Filter.Nest.csproj @@ -9,9 +9,10 @@ Properties RimDev.Filter.Nest RimDev.Filter.Nest - v4.5 + v4.6.2 512 + latest true @@ -31,12 +32,12 @@ 4 - - ..\..\packages\Elasticsearch.Net.2.4.5\lib\net45\Elasticsearch.Net.dll + + ..\..\packages\Elasticsearch.Net.6.3.0\lib\net461\Elasticsearch.Net.dll True - - ..\..\packages\NEST.2.4.5\lib\net45\Nest.dll + + ..\..\packages\NEST.6.3.0\lib\net461\Nest.dll True @@ -64,6 +65,12 @@ + + + {0e804077-79b6-4e0f-a4bb-ad5f6ec194b3} + Range + +