From d5f6ab2b89f61af843eb3bab8af0eb90ffea483c Mon Sep 17 00:00:00 2001 From: Caelan Sayler Date: Sat, 23 Apr 2022 11:37:37 +0100 Subject: [PATCH] Revert "Fix nuget version hash to match github" This reverts commit 60d1e51d0e1abe37d321459ee0a0fe7a37828323. --- pack.ps1 | 2 +- version.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pack.ps1 b/pack.ps1 index ff9096f1..f53e8860 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -7,7 +7,7 @@ $ErrorActionPreference = "Stop" # get current git version Write-Host "Retrieving current version from nbgv" -ForegroundColor Magenta $gitVerJson = (&nbgv get-version -f json) | ConvertFrom-Json -$version = $gitVerJson.SemVer1 +$version = $gitVerJson.NuGetPackageVersion $public = $gitVerJson.PublicRelease # build nuget package diff --git a/version.json b/version.json index 591d367b..21d6e068 100644 --- a/version.json +++ b/version.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", "version": "2.9", - "gitCommitIdShortFixedLength": 7, + "gitCommitIdShortFixedLength": 6, "publicReleaseRefSpec": [ "^refs/heads/master$" ]