Skip to content
Draft
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
8 changes: 8 additions & 0 deletions GitVersion.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
assembly-versioning-scheme: Major
mode: Mainline
increment: Patch
next-version: 1.2.0
branches:
master:
tag: alpha
prevent-increment-of-merged-branch-version: true
1 change: 1 addition & 0 deletions ServerHost.sln
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{64DBC33D
Build.cmd = Build.cmd
Build.sh = Build.sh
Clean.cmd = Clean.cmd
GitVersion.yml = GitVersion.yml
nuget-restore.cmd = nuget-restore.cmd
Test.cmd = Test.cmd
Test.runsettings = Test.runsettings
Expand Down
10 changes: 8 additions & 2 deletions ServerHost/ServerHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.1.18</Version>
<Version>$(NuGetVersion)</Version>
<Authors>Jorgen Thelin</Authors>
<Copyright>Copyright © Jorgen Thelin 2015-2018</Copyright>
<Description>ServerHost - A .NET Server Hosting utility library, including in-process server host testing.</Description>
Expand All @@ -21,7 +21,7 @@
<PackageTags>DotNet Server Host Testing AppDomain</PackageTags>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/jthelin/ServerHost.git</RepositoryUrl>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<AssemblyVersion>$(AssemblySemVer)</AssemblyVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TRAVIS)' == 'true' OR '$(OS)' != 'Windows_NT'">
Expand Down Expand Up @@ -51,6 +51,12 @@
<PackageReference Include="log4net" Version="2.0.8" />
</ItemGroup>

<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
<PackageReference Include="GitVersionTask" Version="4.0.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(Configuration)' == 'Release' ">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01">
<PrivateAssets>all</PrivateAssets>
Expand Down