Update GenBuildInfo to latest

Timthreetwelve · Sep 12, 2022 · 521e939 · 521e939
1 parent cd90fbf
commit 521e939
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/HWiNFOVSBViewer/HWiNFOVSBViewer.csproj b/HWiNFOVSBViewer/HWiNFOVSBViewer.csproj
@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="powershell -NoProfile -File &quot;$(ProjectDir)Powershell\GenBuildInfo.ps1&quot;" />
+    <Exec Command="powershell -NoProfile -File &quot;$(ProjectDir)Powershell\GenBuildInfo.ps1&quot; -assemblyName $(AssemblyName) -assemblyVersion $(AssemblyVersion)" />
   </Target>
 
 </Project>
diff --git a/HWiNFOVSBViewer/Pages/Page3.xaml b/HWiNFOVSBViewer/Pages/Page3.xaml
@@ -148,9 +148,9 @@
                         Grid.Column="0"
                         Text="Build Date" />
                     <TextBlock
+                        x:Name="txtBuildDate"
                         Grid.Row="2"
-                        Grid.Column="1"
-                        Text="{Binding Source={x:Static local:BuildInfo.BuildDateObj}, StringFormat=f}" />
+                        Grid.Column="1"/>
                 </Grid>
             </materialDesign:Card>
         </ScrollViewer>

diff --git a/HWiNFOVSBViewer/Pages/Page3.xaml.cs b/HWiNFOVSBViewer/Pages/Page3.xaml.cs
@@ -10,6 +10,8 @@ public partial class Page3 : UserControl
     public Page3()
     {
         InitializeComponent();
+
+        txtBuildDate.Text = $"{BuildInfo.BuildDateUtc:f}  (UTC)";
     }
 
     #region License click

diff --git a/HWiNFOVSBViewer/Powershell/GenBuildInfo.ps1 b/HWiNFOVSBViewer/Powershell/GenBuildInfo.ps1
@@ -1,7 +1,18 @@
-param($outputFile="BuildInfo.cs")
+Param(
+    [Parameter(Mandatory = $true)] [string] $assemblyName,
+    [Parameter(Mandatory = $true)] [string] $assemblyVersion,
+    [Parameter(Mandatory = $false)] [string] $outputFile="BuildInfo.cs"
+)
+Write-Host "GenBuildInfo: Assembly name parameter: $assemblyName"
+Write-Host "GenBuildInfo: Assembly version parameter: $assemblyVersion"
+
+$nowUTC = (Get-Date).ToUniversalTime()
+
+$commitID = git rev-parse --short HEAD
+if ($commitID.Length -lt 1 ) {
+    $commitID = "n/a"
+}
 
-$buildDate = Get-Date
-$gitOutput = git rev-parse --short HEAD
 $class =
 "// Copyright(c) Tim Kennedy. All Rights Reserved. Licensed under the MIT License.
 //
@@ -10,19 +21,19 @@ $class =
 
 using System;
 
-namespace HWiNFOVSBViewer
+namespace $assemblyName
 {
     public static class BuildInfo
     {
-        public const string CommitIDString = `"$gitOutput`";
+        public const string CommitIDString = `"$commitID`";
 
-        public const string BuildDateString = `"$buildDate`";
+        public const string BuildDateString = `"$nowUTC`";
 
-        public static readonly DateTime BuildDateObj = DateTime.Parse(BuildDateString);
+        public static readonly DateTime BuildDateUtc = DateTime.SpecifyKind(DateTime.Parse(BuildDateString), DateTimeKind.Utc);
     }
 }"
 
 Set-Content -Path $outputFile -Value $class
 
 $fullName = Get-Item $outputFile
-Write-Host "GenBuildInfo completed. Output written to $fullName"
+Write-Host "GenBuildInfo: Output written to $fullName"