Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NuSpec package license from url to expression #433

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#version should be only changed with RELEASE eminent, see RELEASE.md

version: 2.7.{build}
version: 2.7.84-beta-{build}

image: Visual Studio 2019

clone_depth: 1
pull_requests:
do_not_increment_build_number: true
do_not_increment_build_number: false

init:
- ps: |
Expand All @@ -15,8 +15,9 @@ init:
if ($env:APPVEYOR_REPO_TAG -eq "true") {
$ver = $env:APPVEYOR_REPO_TAG_NAME
if($ver.StartsWith("v") -eq $true) { $ver = $ver.Substring(1) }
Update-AppveyorBuild -Version $ver
}
Update-AppveyorBuild -Version $ver
}
- ps: Write-Host "APPVEYOR_BUILD_VERSION='$env:APPVEYOR_BUILD_VERSION'" -ForegroundColor Yellow

environment:
matrix:
Expand Down Expand Up @@ -57,3 +58,12 @@ deploy:
artifact: 'NuGetPackages'
on:
APPVEYOR_REPO_TAG: true

#myget
- provider: NuGet
server: https://www.myget.org/F/commandlineparser/api/v2/package
api_key:
secure: ltHh/DsAk+Y7qbJwzUO4+i1U+7uGTLVYXTdW0+Rk2z7jqj5DDNNlih9J8K7bU4bH
artifact: 'NuGetPackages'
symbol_server: https://www.myget.org/F/commandlineparser/symbols/api/v2/package

8 changes: 4 additions & 4 deletions src/CommandLine/CommandLine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
<AssemblyName>CommandLine</AssemblyName>
<OutputType>Library</OutputType>
<TargetFrameworks>netstandard2.0;net40;net45;net461</TargetFrameworks>
<DefineConstants>$(DefineConstants);CSX_EITHER_INTERNAL;CSX_REM_EITHER_BEYOND_2;CSX_ENUM_INTERNAL;ERRH_INTERNAL;ERRH_DISABLE_INLINE_METHODS;CSX_MAYBE_INTERNAL;CSX_REM_EITHER_FUNC;CSX_REM_CRYPTORAND</DefineConstants>
<DefineConstants>$(DefineConstants);CSX_EITHER_INTERNAL;CSX_REM_EITHER_BEYOND_2;CSX_ENUM_INTERNAL;ERRH_INTERNAL;CSX_MAYBE_INTERNAL;CSX_REM_EITHER_FUNC;CSX_REM_CRYPTORAND;ERRH_ADD_MAYBE_METHODS</DefineConstants>
<DefineConstants Condition="'$(BuildTarget)' != 'fsharp'">$(DefineConstants);SKIP_FSHARP</DefineConstants>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyOriginatorKeyFile>..\..\CommandLine.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PackageId Condition="'$(BuildTarget)' != 'fsharp'">CommandLineParser</PackageId>
<PackageId Condition="'$(BuildTarget)' == 'fsharp'">CommandLineParser.FSharp</PackageId>
<Authors>gsscoder;nemec;ericnewton76</Authors>
<Authors>gsscoder;nemec;ericnewton76;moh-hassan</Authors>
<Title>Command Line Parser Library</Title>
<Version Condition="'$(VersionSuffix)' != ''">$(VersionSuffix)</Version>
<Version Condition="'$(VersionSuffix)' == ''">0.0.0</Version>
<Description Condition="'$(BuildTarget)' != 'fsharp'">Terse syntax C# command line parser for .NET. For FSharp support see CommandLineParser.FSharp. The Command Line Parser Library offers to CLR applications a clean and concise API for manipulating command line arguments and related tasks.</Description>
<Description Condition="'$(BuildTarget)' == 'fsharp'">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.</Description>
<Copyright>Copyright (c) 2005 - 2018 Giacomo Stelluti Scala &amp; Contributors</Copyright>
<PackageLicenseFile>License.md</PackageLicenseFile>
<Copyright>Copyright (c) 2005 - 2020 Giacomo Stelluti Scala &amp; Contributors</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>CommandLine20.png</PackageIcon>
<PackageProjectUrl>https://github.com/commandlineparser/commandline</PackageProjectUrl>
<PackageTags>command line;commandline;argument;option;parser;parsing;library;syntax;shell</PackageTags>
Expand Down
6 changes: 3 additions & 3 deletions src/CommandLine/Core/InstanceBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ public static ParserResult<T> Build<T>(
var validationErrors = specPropsWithValue.Validate(SpecificationPropertyRules.Lookup(tokens));

var allErrors =
tokenizerResult.SuccessfulMessages()
tokenizerResult.SuccessMessages()
.Concat(missingValueErrors)
.Concat(optionSpecPropsResult.SuccessfulMessages())
.Concat(valueSpecPropsResult.SuccessfulMessages())
.Concat(optionSpecPropsResult.SuccessMessages())
.Concat(valueSpecPropsResult.SuccessMessages())
.Concat(validationErrors)
.Concat(setPropertyErrors)
.Memoize();
Expand Down
2 changes: 1 addition & 1 deletion src/CommandLine/Core/Tokenizer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public static Result<IEnumerable<Token>, Error> ExplodeOptionList(

var flattened = exploded.SelectMany(x => x);

return Result.Succeed(flattened, tokenizerResult.SuccessfulMessages());
return Result.Succeed(flattened, tokenizerResult.SuccessMessages());
}

public static IEnumerable<Token> Normalize(
Expand Down
4 changes: 2 additions & 2 deletions src/CommandLine/Infrastructure/CSharpx/Either.cs
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ public static void Match<TLeft, TRight>(this Either<TLeft, TRight> either, Actio
#endregion

/// <summary>
/// Equivalent to monadic <see cref="CSharpx.Either.Return{TLeft, TRight}"/> operation.
/// Equivalent to monadic <see cref="CSharpx.Either.Return{TRight}"/> operation.
/// Builds a <see cref="CSharpx.Right{TLeft, TRight}"/> value in case <paramref name="value"/> by default.
/// </summary>
public static Either<string, TRight> ToEither<TRight>(this TRight value)
Expand Down Expand Up @@ -312,4 +312,4 @@ public static bool IsRight<TLeft, TRight>(this Either<TLeft, TRight> either)
return either.Tag == EitherType.Right;
}
}
}
}
Loading