Skip to content

Commit

Permalink
Merge pull request #44 from SixLabors/remove-content-files
Browse files Browse the repository at this point in the history
update to prevent stylecop.json being included in package
  • Loading branch information
tocsoft authored Sep 16, 2017
2 parents ae783a1 + 1981f36 commit f19fb4d
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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: []
3 changes: 1 addition & 2 deletions src/SixLabors.Fonts/SixLabors.Fonts.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,14 @@

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

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0002" />
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0003" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
Expand Down

0 comments on commit f19fb4d

Please sign in to comment.