Set version following SemVer scheme

mariomenjr · Jun 20, 2021 · 53dd98a · 53dd98a
1 parent 30c157b
commit 53dd98a
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 20 deletions.
diff --git a/Docker/docker-compose.yml b/Docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.1"
 services:
     identity:
         container_name: identity
-        image: identity:0.0.0.2
+        image: identity:0.1.1-alpha.1
         build:
             context: ./../
             dockerfile: Docker/${DOCKERFILE}

diff --git a/Identity/Identity.csproj b/Identity/Identity.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <AssemblyVersion>0.0.0.2</AssemblyVersion>
+    <AssemblyVersion>0.1.1.1</AssemblyVersion>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Authors>Mario Menjivar</Authors>
-    <Description>dentity Server 4 using MongoDB for Stores.</Description>
+    <Description>Identity Server 4 using MongoDB for Stores.</Description>
     <PackageProjectUrl>https://identity.mariomenjr.com/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/mariomenjr/identity</RepositoryUrl>
     <IsPackable>true</IsPackable>
-    <PackageVersion>0.0.0.2</PackageVersion>
+    <Version>0.1.1-alpha.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Identity/Startup.cs b/Identity/Startup.cs
@@ -15,12 +15,10 @@ namespace Identity
 {
     public class Startup
     {
-        private FileVersionInfo About { get; }
         private IConfiguration Configuration { get; }
 
         public Startup(IConfiguration configuration)
         {
-            this.About = FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location);
             this.Configuration = configuration;
         }
 
@@ -50,18 +48,9 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             {
                 endpoints.MapGet("/", async context =>
                 {
-                    string repoUrl = "https://github.com/mariomenjr/identity"; // Environment.GetEnvironmentVariable("REPO_URL");
                     await context.Response.WriteAsync(
-                        "<html><body>" + 
-                        string.Join(
-                            "<br />",
-                            new string[]
-                            {
-                                $"{this.About.ProductName}/{this.About.FileVersion} @ {DateTimeOffset.Now.ToString()}",
-                                $"Repo: <a href=\"{repoUrl}\">{repoUrl}</a>",
-                            }
-                        ) + 
-                        "</body></html>"
+
+                        Utils.About.GetHtmlWelcomePage()
                     );
                 });
             });

diff --git a/Identity/Utils/About.cs b/Identity/Utils/About.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+
+namespace Identity.Utils
+{
+    public static class About
+    {
+        public static string GetHtmlWelcomePage()
+        {
+            var body = string.Join(
+                "<br />",
+                new string[]
+                {
+                    $"{DateTimeOffset.Now.ToString()}/{IdentityInfo.Configuration}",
+                    "<br />",
+                    $"{IdentityInfo.Product}@v{IdentityInfo.InformationalVersion}",
+                    $" {IdentityInfo.Description}",
+                    $"<a href=\"{IdentityInfo.RepositoryUrl}\">{IdentityInfo.RepositoryUrl}</a>",
+                }
+            );
+
+            return $"<html><body>{body}</body></html>";
+        }
+
+        private static class IdentityInfo
+        {
+            public static string Product { get { return GetExecutingAssemblyAttribute<AssemblyProductAttribute>(a => a.Product); } }
+            public static string Description { get { return GetExecutingAssemblyAttribute<AssemblyDescriptionAttribute>(a => a.Description); } }
+            public static string Configuration { get { return GetExecutingAssemblyAttribute<AssemblyConfigurationAttribute>(a => a.Configuration); } }
+            public static string RepositoryUrl { get { return GetExecutingAssemblyAttribute<AssemblyMetadataAttribute>(a => a.Value); } }
+            public static string InformationalVersion { get { return GetExecutingAssemblyAttribute<AssemblyInformationalVersionAttribute>(a => a.InformationalVersion); } }
+            // public static Version Version { get { return Assembly.GetExecutingAssembly().GetName().Version; } }
+
+            private static string GetExecutingAssemblyAttribute<T>(Func<T, string> value) where T : Attribute
+            {
+                T attribute = (T)Attribute.GetCustomAttribute(Assembly.GetExecutingAssembly(), typeof(T));
+                return value.Invoke(attribute);
+            }
+        }
+    }
+
+
+}
diff --git a/README.md b/README.md
@@ -178,6 +178,4 @@ Currently, the appsettings.json is being tracked by Git. Be careful when making
 
 - Externalize IdentityResources
 - Implement secrets.json with Docker for MongoSettings (Ref: https://blog.matjanowski.pl/2017/11/18/managing-options-and-secrets-in-net-core-and-docker/)
-- Create permanent signing credential for Identity Server. Stop using `builder.AddDeveloperSigningCredential()`.
-
-> Version 0.0.0.2
+- Create permanent signing credential for Identity Server. Stop using `builder.AddDeveloperSigningCredential()`.