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

Commit

Permalink
Merge pull request #25 from SixLabors/fix-content-inpacakge
Browse files Browse the repository at this point in the history
Fix content inpacakge
  • Loading branch information
tocsoft authored Sep 16, 2017
2 parents 26d7abf + 371f264 commit 082135e
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 3 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: []
2 changes: 1 addition & 1 deletion src/SixLabors.Shapes.Text/SixLabors.Shapes.Text.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0001" />
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0002" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SixLabors.Shapes/SixLabors.Shapes.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Its a fully manged netstandard library so should work everywhere.</Description>
<Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0002" />
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0003" />
<PackageReference Include="System.Buffers" Version="4.4.0" />
</ItemGroup>

Expand Down

0 comments on commit 082135e

Please sign in to comment.