...cont

michaelmairegger · Jan 13, 2025 · 5eb18d7 · 5eb18d7
1 parent f91b8f7
commit 5eb18d7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/build/Build.cs b/build/Build.cs
@@ -2,6 +2,7 @@
 using static Nuke.Common.Tools.DotNet.DotNetTasks;
 using Nuke.Common.CI.GitHubActions;
 using Nuke.Common.Tools.DotNet;
+using Nuke.Common.Tools.GitVersion;
 using Nuke.Common.Tools.NerdbankGitVersioning;
 using Serilog;
 
@@ -21,7 +22,8 @@ class Build : NukeBuild
     [Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
     private readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
 
-    [NerdbankGitVersioning]
+    [Required]
+    [NerdbankGitVersioning(UpdateBuildNumber = true)]
     readonly NerdbankGitVersioning NerdbankVersioning;
 
     [Parameter] [Secret] readonly string NuGetApiKey;
@@ -36,7 +38,6 @@ class Build : NukeBuild
     Target Restore => t => t
         .Executes(() =>
         {
-            Log.Warning("NerdbankVersioning = {Value}", NerdbankVersioning.SimpleVersion);
             DotNetRestore();
         });
 
@@ -66,6 +67,7 @@ class Build : NukeBuild
         {
             DotNetPack(
                 c => c.EnableNoBuild()
+                    .SetVersion(NerdbankVersioning.SimpleVersion)
                     .SetConfiguration(Configuration)
             );
         });

diff --git a/build/build.csproj b/build/build.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>
@@ -11,8 +11,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.7.115" />
     <PackageReference Include="Nuke.Common" Version="9.0.3" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageDownload Include="nbgv" Version="[3.7.115]" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -31,14 +31,11 @@
     <WarningsAsErrors Label="Package X has a known critical severity vulnerability">$(WarningsAsErrors);NU1904</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Label="Source commit tagging" Condition="'$(Configuration)' != 'Release'">
-    <!-- Note: This prevents rebuilding all projects because of a commit, since build steps injects version information into projects. -->
-<!--    <NBGV_GitEngine>Disabled</NBGV_GitEngine>-->
     <EnableSourceLink>false</EnableSourceLink>
     <!-- prevents generation of $(ProjectName).sourcelink.json -->
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" PrivateAssets="all" />
-<!--    <GlobalPackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" Version="$(NerdbankGitVersioningVersion)" />-->
     <GlobalPackageReference Include="WpfAnalyzers" Condition="'$(UseWpf)' == 'true'" Version="$(WpfAnalyzersVersion)" />
   </ItemGroup>
   <ItemGroup>