Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
3a9a7d7
Add GitInfo.txt
fgreinacher Oct 14, 2018
0152dbf
Add GitInfo
fgreinacher Oct 14, 2018
ab11093
Remove versioning from appveyor.yml
fgreinacher Oct 14, 2018
e72d9f1
Suppress docmentation warnings
fgreinacher Oct 14, 2018
c21f260
Try fix versioning order
fgreinacher Oct 14, 2018
b697019
Try Nerdbank.GitVersioning
fgreinacher Oct 14, 2018
8b08c3d
Fix version.json
fgreinacher Oct 14, 2018
b7ca941
Disable shallow cloning in travis.yml
fgreinacher Oct 14, 2018
1913c38
Publish build number to CI systems
fgreinacher Oct 14, 2018
f4c6e2a
Add Nerdbank.GitVersioning to S.IO.A.TestinHelpers
fgreinacher Oct 14, 2018
ca3576c
Move version.json to root
fgreinacher Oct 14, 2018
5d13d47
Drop commit id for builds from master
fgreinacher Oct 14, 2018
18182f4
Add GitInfo.txt
fgreinacher Oct 14, 2018
d311d42
Add GitInfo
fgreinacher Oct 14, 2018
abefef5
Suppress docmentation warnings
fgreinacher Oct 14, 2018
3866785
Try fix versioning order
fgreinacher Oct 14, 2018
5abbc87
Try Nerdbank.GitVersioning
fgreinacher Oct 14, 2018
cf1ee92
Fix version.json
fgreinacher Oct 14, 2018
3185d72
Publish build number to CI systems
fgreinacher Oct 14, 2018
7af6107
move version.json
fgreinacher Oct 17, 2018
9ebb131
Drop commit id for builds from master
fgreinacher Oct 14, 2018
a8ff848
Make assembly version MAJOR.0.0.0
fgreinacher Oct 17, 2018
97c861c
Fix merge problem
fgreinacher Oct 17, 2018
e050e59
Add GitHub release logic
fgreinacher Oct 17, 2018
cf17189
Add auth token for GitHub release
fgreinacher Oct 17, 2018
71de272
Fix whitespace
fgreinacher Oct 17, 2018
a61ab6b
Mark GitHub releases as prelease by default
fgreinacher Oct 18, 2018
f8d8ad8
Add contributor guide
fgreinacher Oct 18, 2018
51256c6
Add link to NBGV
fgreinacher Oct 18, 2018
e75ccba
Merge branch 'master' into gitinfo
fgreinacher Oct 25, 2018
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
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ script:
- dotnet build System.IO.Abstractions --framework netstandard1.4
- dotnet build System.IO.Abstractions.TestingHelpers --framework netstandard1.4
- dotnet test System.IO.Abstractions.TestingHelpers.Tests --framework netcoreapp2.0
git:
depth: false
18 changes: 18 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Contributor guide

## Versioning

This library uses [Nerdbank.GitVersioning](https://github.com/AArnott/Nerdbank.GitVersioning) for generating stable and reproducible version numbers.

The so-called base version is manually maintained in [the version config](version.json). Every build calculates its final version number based on the base version and the number of changes that occured since the last change to the version config.

The base version represents the _next_ version that we will released. During development it contains a prerelease suffix, like `-beta` which is appended to the generated NuGet packages.

Every successful commit on `master` deploys packages to `nuget.org` and a creates GitHub release. As long as we have the prelease suffix both will be marked as such.

### Release workflow

1. Remove prelease suffix from `version.json`.
1. Wait for the completion of the deployment.
1. Remove the prerelease flag from the newly created GitHub release.
1. Increment the version number in `version.json` and again add the prelease suffix (usually `beta` is fine).
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<PropertyGroup>
<TargetFrameworks>net40;netstandard1.4;netstandard2.0;</TargetFrameworks>
<PackageId>System.IO.Abstractions.TestingHelpers</PackageId>
<Version>0.0.0.1</Version>
<Description>A set of pre-built mocks to help when testing file system interactions.</Description>
<Company />
<Product>System.IO.Abstractions</Product>
Expand Down Expand Up @@ -36,4 +35,12 @@
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.5.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

</Project>
14 changes: 11 additions & 3 deletions System.IO.Abstractions/System.IO.Abstractions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFrameworks>net40;netstandard1.4;netstandard2.0;</TargetFrameworks>
<Version>0.0.0.1</Version>
<Authors>Tatham Oddie</Authors>
<Company />
<Description>A set of abstractions to help make file system interactions testable.</Description>
Expand All @@ -11,7 +10,8 @@
<PackageLicenseUrl>https://github.com/System-IO-Abstractions/System.IO.Abstractions/blob/master/LICENSE</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/System-IO-Abstractions/System.IO.Abstractions</PackageProjectUrl>
<PackageTags>testing</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>$(NoWarn);CS1591;CS1574</NoWarn>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -27,7 +27,7 @@
<Version>4.5.0</Version>
</PackageReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4'">
<PackageReference Include="System.IO.FileSystem.AccessControl">
<Version>4.5.0</Version>
Expand All @@ -47,4 +47,12 @@
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>

</Project>
22 changes: 11 additions & 11 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,6 @@ branches:
only:
- master

version: 2.1.0.{build}

pull_requests:
do_not_increment_build_number: true

dotnet_csproj:
patch: true
file: '**\*.csproj'
version: '{version}'
package_version: '{version}'

environment:
INHERITDOC_VERSION: 1.2.2.1
TEMP_DIR: c:\temp
Expand All @@ -46,3 +35,14 @@ deploy:
artifact: /.*\.nupkg/
on:
branch: master

- provider: GitHub
tag: v$(GitBuildVersion)
prerelease: true
artifact: /.*\.nupkg/
auth_token:
secure: 4ejpp3dzvpOwfD7TOcypCsT0z8j+qYiihiZszS3uVI78vZpAtM+P+A8NK2JZmYMo
on:
branch: master


16 changes: 16 additions & 0 deletions version.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "2.2-beta",
"assemblyVersion": {
"precision": "major"
},
"publicReleaseRefSpec": [
"^refs/heads/master$"
],
"cloudBuild": {
"buildNumber": {
"enabled": true,
"setVersionVariables": true
}
}
}