Merge pull request #766 from santhoshb-msft/main

Simplified logic to show three part version, removing the revision
Azure · Oct 3, 2024 · 3658c32 · 3658c32
2 parents 97978e9 + edd53ff
commit 3658c32
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 29 deletions.
diff --git a/src/AdminSite/Startup.cs b/src/AdminSite/Startup.cs
@@ -141,14 +141,11 @@ public void ConfigureServices(IServiceCollection services)
             .AddSingleton<SaaSApiClientConfiguration>(config)
             .AddSingleton<KnownUsersModel>(knownUsers);
 
-        // Read the versionInfo and Add to services
-        var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
-        services.AddSingleton<IAppVersionService>(new AppVersionService(versionInfo));
-
+        // Add the assembly version
+        services.AddSingleton<IAppVersionService>(new AppVersionService(Assembly.GetExecutingAssembly()?.GetName()?.Version));
 
         services
-            .AddScoped<ApplicationConfigService>()
-        ;
+            .AddScoped<ApplicationConfigService>();
 
         services
             .AddDbContext<SaasKitContext>(options => options.UseSqlServer(this.Configuration.GetConnectionString("DefaultConnection")));

diff --git a/src/CustomerSite/Startup.cs b/src/CustomerSite/Startup.cs
@@ -119,9 +119,8 @@ public void ConfigureServices(IServiceCollection services)
             .AddSingleton<SaaSApiClientConfiguration>(config)
             .AddSingleton<ValidateJwtToken>();
 
-        // Read the versionInfo and Add to services
-        var versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
-        services.AddSingleton<IAppVersionService>(new AppVersionService(versionInfo));
+        // Add the assembly version
+        services.AddSingleton<IAppVersionService>(new AppVersionService(Assembly.GetExecutingAssembly()?.GetName()?.Version));
 
         services
             .AddDbContext<SaasKitContext>(options => options.UseSqlServer(this.Configuration.GetConnectionString("DefaultConnection")));

diff --git a/src/Services/Contracts/IAppVersionService.cs b/src/Services/Contracts/IAppVersionService.cs
@@ -8,11 +8,4 @@ namespace Marketplace.SaaS.Accelerator.Services.Services;
 public interface IAppVersionService
 {
     string Version { get; }
-
-    int? ProductMajorPart { get; }
-
-    int? ProductMinorPart { get; }
-
-    int? ProductBuildPart { get; }
-
 }
diff --git a/src/Services/Services/AppVersionService.cs b/src/Services/Services/AppVersionService.cs
@@ -1,4 +1,5 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -13,20 +14,18 @@ public class AppVersionService : IAppVersionService
 
     public string Version { get; }
 
-    public int? ProductMajorPart { get; }
-
-    public int? ProductMinorPart { get; }
-
-    public int? ProductBuildPart { get; }
-
     /// <summary>
     /// Sets the Application Version.
     /// </summary>
-    public AppVersionService(FileVersionInfo version)
+    public AppVersionService(Version version)
     {
-        Version = version.ProductVersion;
-        ProductMajorPart = version.ProductMajorPart;
-        ProductMinorPart = version.ProductMinorPart;
-        ProductBuildPart = version.ProductBuildPart;
+        if (version != null)
+        {
+            Version = $"{version?.Major}.{version?.Minor}.{version?.Build}";
+        }
+        else
+        {
+            Version = "1.0.0";
+        }
     }
-}
+}