Skip to content
This repository has been archived by the owner on Feb 22, 2020. It is now read-only.

Commit

Permalink
Merge pull request #8 from SixLabors/remove-json-as-content
Browse files Browse the repository at this point in the history
prevent stylecop.json form being included in package
  • Loading branch information
tocsoft authored Sep 16, 2017
2 parents 304f7cf + ce05dea commit f68740f
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ install:

before_build:
- cmd: dotnet --version
- ps: gitversion /l console /output buildserver
- ps: c:\ProgramData\chocolatey\lib\gitversion.portable\tools\gitversion.exe /l console /output buildserver

build_script:
- cmd: build.cmd
Expand Down
18 changes: 18 additions & 0 deletions gitversion.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,23 @@ branches:
increment: Minor
prevent-increment-of-merged-branch-version: false
track-merge-target: true
pull-request:
regex: (pull|pull\-requests|pr)[/-]
mode: ContinuousDelivery
tag: PullRequest
increment: Inherit
prevent-increment-of-merged-branch-version: false
tag-number-pattern: '[/-](?<number>\d+)[-/]'
track-merge-target: false
tracks-release-branches: false
is-release-branch: false
otherbranches:
regex: '.*'
mode: ContinuousDeployment
tag: ci
increment: Patch
prevent-increment-of-merged-branch-version: false
track-merge-target: true
is-release-branch: false
ignore:
sha: []
1 change: 0 additions & 1 deletion src/SixLabors.Core/SixLabors.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

<ItemGroup>
<AdditionalFiles Include="..\..\stylecop.json" />
<Content Include="..\..\stylecop.json" Link="stylecop.json" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit f68740f

Please sign in to comment.