Fix build version metadata generation

microsoft · Aug 13, 2024 · da8d2ef · da8d2ef
1 parent 328d3e9
commit da8d2ef
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 18 deletions.
diff --git a/CromwellOnAzure.sln b/CromwellOnAzure.sln
@@ -7,7 +7,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		after.CromwellOnAzure.sln.targets = after.CromwellOnAzure.sln.targets
 		CodeCoverage.runsettings = CodeCoverage.runsettings
-		src\CommonAssemblyInfo.cs = src\CommonAssemblyInfo.cs
+		src\CommonAssemblyInfo.props = src\CommonAssemblyInfo.props
+		src\Directory.Build.props = src\Directory.Build.props
 		src\Dockerfile-TriggerService = src\Dockerfile-TriggerService
 	EndProjectSection
 EndProject

diff --git a/src/Common/Common.csproj b/src/Common/Common.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <AssemblyTitle>$(Product) common library</AssemblyTitle>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
diff --git a/src/CommonAssemblyInfo.props b/src/CommonAssemblyInfo.props
@@ -0,0 +1,9 @@
+<Project>
+  <PropertyGroup>
+    <AssemblyVersion>0.0.0.0</AssemblyVersion>
+    <Company>Microsoft Corporation</Company>
+    <Product>Cromwell on Azure</Product>
+    <Copyright>Copyright © Microsoft Corporation</Copyright>
+    <VersionPrefix>$([System.Version]::Parse($(AssemblyVersion)).Major).$([System.Version]::Parse($(AssemblyVersion)).Minor).$([System.Version]::Parse($(AssemblyVersion)).Build)</VersionPrefix>
+  </PropertyGroup>
+</Project>
diff --git a/src/CromwellApiClient/CromwellApiClient.csproj b/src/CromwellApiClient/CromwellApiClient.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+    <AssemblyTitle>$(Product) Cromwell API client</AssemblyTitle>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+    <Import Project="$(MSBuildThisFileDirectory)CommonAssemblyInfo.props"/>
+</Project>
diff --git a/src/TriggerService/TriggerService.cs b/src/TriggerService/TriggerService.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using System.Reflection;
 using System.Threading.Tasks;
 using Azure.Identity;
 using Azure.ResourceManager;
@@ -28,6 +29,7 @@ public TriggerService()
 
         public static async Task Main()
         {
+            Console.WriteLine($"TriggerService Build: {Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion}");
             AzureCloudConfig azureCloudConfig = null;
 
             await Host.CreateDefaultBuilder()

diff --git a/src/TriggerService/TriggerService.csproj b/src/TriggerService/TriggerService.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
+    <AssemblyTitle>$(Product) Trigger Service</AssemblyTitle>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/deploy-cromwell-on-azure/deploy-cromwell-on-azure.csproj b/src/deploy-cromwell-on-azure/deploy-cromwell-on-azure.csproj
@@ -8,6 +8,7 @@
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>true</SelfContained>
     <IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
+    <AssemblyTitle>$(Product) deployment utility</AssemblyTitle>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/ga4gh-tes b/src/ga4gh-tes