v2.5.5

xunit · Dec 9, 2023 · 28b46ff · 28b46ff
1 parent 409be7a
commit 28b46ff
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/Versions.props b/Versions.props
@@ -9,8 +9,8 @@
     <NerdbankGitVersioningVersion>3.6.133</NerdbankGitVersioningVersion>
     <NSubstituteVersion>5.1.0</NSubstituteVersion>
     <TunnelVisionLabsReferenceAssemblyAnnotatorVersion>1.0.0-alpha.160</TunnelVisionLabsReferenceAssemblyAnnotatorVersion>
-    <XunitAnalyzersVersion>1.7.0-pre.10</XunitAnalyzersVersion>
-    <XunitVersion>2.6.3-pre.3</XunitVersion>
+    <XunitAnalyzersVersion>1.7.0</XunitAnalyzersVersion>
+    <XunitVersion>2.6.3</XunitVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj b/src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj
@@ -36,22 +36,20 @@
   </ItemGroup>
 
   <!-- Supplement Nerdbank.GitVersioning version calculations -->
-  <Target Name="UpdateAssemblyVersionInfo" BeforeTargets="GenerateAssemblyVersionInfo" DependsOnTargets="GetBuildVersion">
+  <Target Name="UpdateAssemblyVersionInfo" BeforeTargets="GenerateAssemblyNBGVVersionInfo" DependsOnTargets="GetBuildVersion">
     <PropertyGroup>
-      <!-- Local builds should have a '-dev' suffix on the build number -->
-      <PrereleaseSuffix Condition=" '$(GITHUB_ACTIONS)' != 'true' ">-dev</PrereleaseSuffix>
       <!-- AssemblyVersion and AssemblyFileVersion should be x.y.z.0 -->
       <AssemblyVersion>$(BuildVersionSimple)</AssemblyVersion>
       <AssemblyFileVersion>$(BuildVersionSimple)</AssemblyFileVersion>
       <!-- Always put the Git hash in the informational version, even for non-pre-release versions -->
-      <AssemblyInformationalVersion>$(BuildVersionSimple)$(PrereleaseVersion)$(PrereleaseSuffix)+$(GitCommitIdShort)</AssemblyInformationalVersion>
+      <AssemblyInformationalVersion>$(BuildVersionSimple)$(PrereleaseVersion)+$(GitCommitIdShort)</AssemblyInformationalVersion>
     </PropertyGroup>
   </Target>
 
   <Target Name="UpdateNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
     <PropertyGroup>
-      <!-- Local builds should have a '-dev' suffix on the build number -->
-      <PrereleaseSuffix Condition=" '$(GITHUB_ACTIONS)' != 'true' ">-dev</PrereleaseSuffix>
+      <!-- Never put the Git hash in the package version -->
+      <PackageVersion>$(BuildVersionSimple)$(PrereleaseVersion)</PackageVersion>
       <!-- Pass through values we don't know ahead of time for any hand-crafted .nuspec files -->
       <NuspecProperties>
         Configuration=$(Configuration);

diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.5.5-pre.{height}",
+  "version": "2.5.5",
   "nuGetPackageVersion": {
     "semVer": 2.0
   },