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

Switch to using PackageLicenseExpression #915

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ environment:
- BUILD_TARGET: fsharp

build_script:
- cmd: dotnet build src/CommandLine/ -c Release --version-suffix %APPVEYOR_BUILD_VERSION% /p:BuildTarget=%BUILD_TARGET%
- cmd: dotnet build src/CommandLine/ -c Release --version-suffix %APPVEYOR_BUILD_VERSION% /p:BuildTarget=%BUILD_TARGET% /p:ContinuousIntegrationBuild=True

test_script:
- cmd: dotnet test tests/CommandLine.Tests/ /p:BuildTarget=%BUILD_TARGET%

after_test:
- cmd: dotnet pack src/CommandLine/ -c Release --version-suffix %APPVEYOR_BUILD_VERSION% /p:BuildTarget=%BUILD_TARGET%
- cmd: dotnet pack src/CommandLine/ -c Release --version-suffix %APPVEYOR_BUILD_VERSION% /p:BuildTarget=%BUILD_TARGET% /p:ContinuousIntegrationBuild=True

artifacts:
- path: 'src/CommandLine/bin/Release/*.nupkg'
Expand Down
17 changes: 8 additions & 9 deletions src/CommandLine/CommandLine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<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 - 2020 Giacomo Stelluti Scala &amp; Contributors</Copyright>
<PackageLicenseFile>License.md</PackageLicenseFile>
<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 All @@ -27,30 +27,29 @@
<LangVersion>8.0</LangVersion>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
</PropertyGroup>

<ItemGroup Condition="'$(BuildTarget)' != 'fsharp'">
<Compile Remove="Infrastructure\FSharpOptionHelper.cs" />
</ItemGroup>

<ItemGroup>
<Content Include="..\..\README.md" Link="README.md">
<Pack>true</Pack>
<PackagePath>README.md</PackagePath>
</Content>
<Content Include="..\..\README.md" Link="README.md" Pack="true" PackagePath="README.md" />
<Content Include="..\..\License.md" Link="License.md" Pack="true" PackagePath="License.md" />
<Content Include="..\..\art\CommandLine20.png" Pack="true" PackagePath="$(PackageIconPackageIcon)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net40' and '$(BuildTarget)' == 'fsharp'">
<PackageReference Include="FSharp.Core" Version="4.5.1" Condition="'$(BuildTarget)' == 'fsharp'" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net40' and '$(BuildTarget)' == 'fsharp'">
<PackageReference Include="FSharp.Core" Version="4.0.0.1" Condition="'$(BuildTarget)' == 'fsharp'" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\License.md" Pack="true" PackagePath="$(PackageLicenseFile)" />
<None Include="..\..\art\CommandLine20.png" Pack="true" PackagePath="$(PackageIcon)" />
</ItemGroup>

<ItemGroup>
<Folder Include="Infrastructure\CSharpx\" />
</ItemGroup>

</Project>