Always display the "tool version" textbox

iminashi · Dec 21, 2024 · c30517c · c30517c
1 parent 12c9e48
commit c30517c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/samples/DLCBuilder.Domain/AppVersion.fs b/samples/DLCBuilder.Domain/AppVersion.fs
@@ -8,3 +8,6 @@ let current =
 
 /// A three part version string prefixed with "v".
 let versionString = $"v{current.ToString(3)}"
+
+/// "DLC Builder vX.X.X"
+let programNameWithVersion = $"DLC Builder {versionString}"
diff --git a/samples/DLCBuilder.Domain/Building/BuildConfig.fs b/samples/DLCBuilder.Domain/Building/BuildConfig.fs
@@ -34,7 +34,7 @@ let create buildType config directoryForPhraseLevels project platforms =
         buildType = Test && not config.GenerateDD
 
     { Platforms = platforms
-      BuilderVersion = $"DLC Builder {AppVersion.versionString}"
+      BuilderVersion = AppVersion.programNameWithVersion
       Author = project.Author |> Option.defaultValue config.CharterName
       AppId = appId
       GenerateDD = not disableDDGeneration

diff --git a/samples/DLCBuilder/Overlays/AdditionalMetaDataEditor.fs b/samples/DLCBuilder/Overlays/AdditionalMetaDataEditor.fs
@@ -63,21 +63,21 @@ let view dispatch state =
                         ()
 
                     // Build Tool Version
-                    match state.ImportedBuildToolVersion with
-                    | Some version ->
-                        locText "BuildToolVersion" [
-                            Grid.row 2
-                            TextBlock.verticalAlignment VerticalAlignment.Center
-                        ]
+                    let version =
+                        state.ImportedBuildToolVersion
+                        |> Option.defaultValue AppVersion.programNameWithVersion
 
-                        FixedTextBox.create [
-                            Grid.row 2
-                            Grid.column 1
-                            FixedTextBox.text version
-                            FixedTextBox.isReadOnly true
-                        ]
-                    | None ->
-                        ()
+                    locText "BuildToolVersion" [
+                        Grid.row 2
+                        TextBlock.verticalAlignment VerticalAlignment.Center
+                    ]
+
+                    FixedTextBox.create [
+                        Grid.row 2
+                        Grid.column 1
+                        FixedTextBox.text version
+                        FixedTextBox.isReadOnly true
+                    ]
                 ]
             ]
         ]