From 063d75489f645b885c1a69261b1227d6c9fb341f Mon Sep 17 00:00:00 2001 From: lindexi Date: Fri, 26 Apr 2024 19:57:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E9=9B=86=E4=BF=A1=E6=81=AF=E5=8A=A0=E4=B8=8A=E4=BA=86?= =?UTF-8?q?=20git=20=E7=9A=84=20commit=20=E5=8F=B7=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=89=93=E5=8C=85=E8=BF=87=E4=BA=8E=E8=AF=A1=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DotNETBuild/Utils/AssemblyHelper.cs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/DotNETBuild/Utils/AssemblyHelper.cs b/DotNETBuild/Utils/AssemblyHelper.cs index b602c6a..526e09f 100644 --- a/DotNETBuild/Utils/AssemblyHelper.cs +++ b/DotNETBuild/Utils/AssemblyHelper.cs @@ -17,6 +17,25 @@ public static IAppConfigurator FillAssemblyInfo(this IAppConfigurator appConfigu { var compileConfiguration = appConfigurator.Of(); + // 优先从 AssemblyVersionAttribute 取出，解决 [dotnet 8 破坏性改动 在 AssemblyInformationalVersionAttribute 添加上 git 的 commit 号](https://blog.lindexi.com/post/dotnet-8-%E7%A0%B4%E5%9D%8F%E6%80%A7%E6%94%B9%E5%8A%A8-%E5%9C%A8-AssemblyInformationalVersionAttribute-%E6%B7%BB%E5%8A%A0%E4%B8%8A-git-%E7%9A%84-commit-%E5%8F%B7.html ) + // + if (string.IsNullOrEmpty(compileConfiguration.AppVersion)) + { + var assemblyVersionAttribute = assembly.GetCustomAttribute(); + if (assemblyVersionAttribute != null) + { + compileConfiguration.AppVersion = assemblyVersionAttribute.Version; + } + else + { + var assemblyFileVersionAttribute = assembly.GetCustomAttribute(); + if (assemblyFileVersionAttribute != null) + { + compileConfiguration.AppVersion = assemblyFileVersionAttribute.Version; + } + } + } + var assemblyInformationalVersionAttribute = assembly.GetCustomAttribute(); if (string.IsNullOrEmpty(compileConfiguration.AppVersion)) {