diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets new file mode 100644 index 00000000..98c71f92 --- /dev/null +++ b/.paket/Paket.Restore.targets @@ -0,0 +1,265 @@ + + + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + true + $(MSBuildThisFileDirectory) + $(MSBuildThisFileDirectory)..\ + $(PaketRootPath)paket-files\paket.restore.cached + $(PaketRootPath)paket.lock + /Library/Frameworks/Mono.framework/Commands/mono + mono + + $(PaketRootPath)paket.exe + $(PaketToolsPath)paket.exe + "$(PaketExePath)" + $(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)" + $(PaketRootPath)paket.bootstrapper.exe + $(PaketToolsPath)paket.bootstrapper.exe + "$(PaketBootStrapperExePath)" + $(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)" + + + + + true + true + + + + + + + true + $(NoWarn);NU1603 + + + + + /usr/bin/shasum $(PaketRestoreCacheFile) | /usr/bin/awk '{ print $1 }' + /usr/bin/shasum $(PaketLockFilePath) | /usr/bin/awk '{ print $1 }' + + + + + + + + + + + + + $([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)')) + $([System.IO.File]::ReadAllText('$(PaketLockFilePath)')) + true + false + true + + + + + + + + + $(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached + + $(MSBuildProjectFullPath).paket.references + + $(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references + + $(MSBuildProjectDirectory)\paket.references + $(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).$(TargetFramework).paket.resolved + true + references-file-or-cache-not-found + + + + + $([System.IO.File]::ReadAllText('$(PaketReferencesCachedFilePath)')) + $([System.IO.File]::ReadAllText('$(PaketOriginalReferencesFilePath)')) + references-file + false + + + + + false + + + + + true + target-framework '$(TargetFramework)' + + + + + + + + + + + + + + + + + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0]) + $([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1]) + + + %(PaketReferencesFileLinesInfo.PackageVersion) + + + + + $(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).paket.clitools + + + + + + + + + $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[0]) + $([System.String]::Copy('%(PaketCliToolFileLines.Identity)').Split(',')[1]) + + + %(PaketCliToolFileLinesInfo.PackageVersion) + + + + + $(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config + + + + + + + false + + + + + + <_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/> + + + + $(MSBuildProjectDirectory)/$(MSBuildProjectFile) + true + false + true + $(BaseIntermediateOutputPath)$(Configuration) + $(BaseIntermediateOutputPath) + + + + <_NuspecFiles Include="$(AdjustedNuspecOutputPath)\*.nuspec"/> + + + + + + + + + + + + + + + + diff --git a/CommandLine.nuspec b/CommandLine.nuspec index 4d4fde5a..b0cf1e8e 100644 --- a/CommandLine.nuspec +++ b/CommandLine.nuspec @@ -4,10 +4,10 @@ CommandLineParser $version$ Command Line Parser Library - Giacomo Stelluti Scala + gsscoder nemec ericnewton76 Terse syntax C# command line parser for .NET with F# support. The Command Line Parser Library offers to CLR applications a clean and concise API for manipulating command line arguments and related tasks. - Copyright (c) 2005 - 2017 Giacomo Stelluti Scala & Contributors + Copyright (c) 2005 - 2018 Giacomo Stelluti Scala & Contributors https://github.com/commandlineparser/commandline/blob/master/License.md https://github.com/commandlineparser/commandline Giacomo Stelluti Scala diff --git a/appveyor.yml b/appveyor.yml index 70e9da61..2e2d359c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,24 +9,20 @@ cache: - packages -> paket.dependencies init: - - ps: > + - ps: | git config --global core.autocrlf input if ($env:APPVEYOR_REPO_TAG -eq "true") - { - - Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME" - + $ver = $env:APPVEYOR_REPO_TAG_NAME + if($ver.StartsWith("v") -eq $true) { $ver = $version.Substring(1) } + Update-AppveyorBuild -Version $ver } - else - { $ver = $env:APPVEYOR_BUILD_VERSION $commit = $env:APPVEYOR_REPO_COMMIT.substring(0,7) Update-AppveyorBuild -Version "$ver-$commit" - } build_script: @@ -40,6 +36,11 @@ test: off #tests handled within FAKE artifacts: - path: '*.nupkg' name: NugetPackage + +on_failure: +- cmd: | + tree /f /a >files.lst + appveyor PushArtifact .\files.lst -DeploymentName "Failed Build File Listing" deploy: - provider: NuGet diff --git a/build.cmd b/build.cmd index b5a72cab..79fc041d 100644 --- a/build.cmd +++ b/build.cmd @@ -2,6 +2,11 @@ cls +echo. +echo SKIP_RESTORE=%SKIP_RESTORE% ^<^< Set to true if have already restored packages +if "%SKIP_RESTORE%" == "" choice /T 5 /D Y /M "Continue?" + +if "%SKIP_RESTORE%" == "true" goto :BUILD_NET .paket\paket.bootstrapper.exe if errorlevel 1 ( exit /b %errorlevel% @@ -12,7 +17,17 @@ if errorlevel 1 ( exit /b %errorlevel% ) +:BUILD_NET +echo. +echo Fake build.fsx .\packages\FAKE\tools\Fake %* +if "%SKIP_RESTORE%" == "true" goto :BUILD_NETSTD +echo. +echo dotnet restore dotnet restore + +:BUILD_NETSTD +echo. +echo dotnet build dotnet build --configuration Release --output build\netstandard1.5 --framework netstandard1.5 src\commandline \ No newline at end of file diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs index 25e1cd7d..078b4537 100644 --- a/src/SharedAssemblyInfo.cs +++ b/src/SharedAssemblyInfo.cs @@ -1,13 +1,13 @@ -// Copyright 2005-2015 Giacomo Stelluti Scala & Contributors. All rights reserved. See License.md in the project root for license information. +// Copyright 2005-2018 Giacomo Stelluti Scala & Contributors. All rights reserved. See License.md in the project root for license information. using System.Reflection; using System.Resources; [assembly: AssemblyProduct("Command Line Parser Library")] -[assembly: AssemblyCopyright("Copyright (c) 2005 - 2015 Giacomo Stelluti Scala")] +[assembly: AssemblyCopyright("Copyright (c) 2005 - 2018 Giacomo Stelluti Scala & Contributors")] [assembly: NeutralResourcesLanguage("en-US")] // versions are replaced during CI build -[assembly: AssemblyVersion("2.0.275.0")] -[assembly: AssemblyFileVersion("2.0.275.0")] -[assembly: AssemblyInformationalVersion("2.0.275-beta")] +[assembly: AssemblyVersion("2.2.0.0")] +[assembly: AssemblyFileVersion("2.2.0.0")] +[assembly: AssemblyInformationalVersion("2.2.0.0")]