Permalink
Browse files

Merge pull request #1474 from libgit2/ethomson/version_number

Add preview information to version number
  • Loading branch information...
2 parents 3e9de2e + d46136a commit 49542c1605527393d1aaec2615a60192c1f9bf7f @ethomson ethomson committed on GitHub Jul 24, 2017
View
@@ -3,10 +3,10 @@
<OutputPath>$(MSBuildThisFileDirectory)bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
- <CodeGenerationRoslynVersion>0.4.9</CodeGenerationRoslynVersion>
+ <CodeGenerationRoslynVersion>0.4.11</CodeGenerationRoslynVersion>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Nerdbank.GitVersioning" Version="1.6.25" PrivateAssets="all" />
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.37-beta" PrivateAssets="all" />
</ItemGroup>
</Project>
@@ -30,7 +30,7 @@ public void CanRetrieveValidVersionString()
// git2hash: '06d772d' LibGit2 library hash.
// arch: 'x86' or 'x64' LibGit2 target.
// git2Features: 'Threads, Ssh' LibGit2 features compiled with.
- string regex = @"^(?<version>\d+\.\d+\.\d+(-\w+)?\+(g(?<git2SharpHash>[a-f0-9]{10})\.)?LibGit2-[a-f0-9]{7}) \((?<arch>\w+) - (?<git2Features>(?:\w*(?:, )*\w+)*)\)$";
+ string regex = @"^(?<version>\d+\.\d+\.\d+(-[\w\-\.]+)?\+(g(?<git2SharpHash>[a-f0-9]{10})\.)?LibGit2-[a-f0-9]{7}) \((?<arch>\w+) - (?<git2Features>(?:\w*(?:, )*\w+)*)\)$";
Assert.NotNull(versionInfo);
@@ -18,9 +18,9 @@
<ProjectReference Include="..\LibGit2Sharp\LibGit2Sharp.csproj" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Moq" Version="4.7.8" />
+ <PackageReference Include="Moq" Version="4.7.99" />
<PackageReference Include="xunit" Version="2.2.0" />
- <PackageReference Include="xunit.skippablefact" Version="1.3.1" />
+ <PackageReference Include="xunit.skippablefact" Version="1.3.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
<PackageReference Include="xunit.runner.console" Version="2.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
@@ -32,8 +32,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[1.0.185]" PrivateAssets="contentFiles" />
- <PackageReference Include="SourceLink.Create.GitHub" Version="2.0.2" PrivateAssets="all" />
- <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.0.2" />
+ <PackageReference Include="SourceLink.Create.GitHub" Version="2.1.2" PrivateAssets="all" />
+ <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.1.2" />
<PackageReference Include="CodeGeneration.Roslyn.BuildTime" Version="$(CodeGenerationRoslynVersion)" PrivateAssets="all" />
<DotNetCliToolReference Include="dotnet-codegen" Version="$(CodeGenerationRoslynVersion)" />
View
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
- "version": "0.25",
+ "version": "0.25.0-preview.{height}",
"publicReleaseRefSpec": [
"^refs/heads/master$", // we release out of master
"^refs/heads/v\\d+(?:\\.\\d+)?$" // we also release out of vNN branches

0 comments on commit 49542c1

Please sign in to comment.