1 files changed, 18 insertions, 24 deletions

diff --git a/src/modules/dotnet.rs b/src/modules/dotnet.rs
index 3234114e5..09bee872d 100644
--- a/src/modules/dotnet.rs
+++ b/src/modules/dotnet.rs
@@ -2,7 +2,6 @@ use quick_xml::events::Event;
 use quick_xml::Reader;
 use std::ffi::OsStr;
 use std::iter::Iterator;
-use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::str;
 
@@ -12,6 +11,7 @@ use crate::formatter::StringFormatter;
 use crate::utils;
 
 type JValue = serde_json::Value;
+use crate::formatter::VersionFormatter;
 
 const GLOBAL_JSON_FILE: &str = "global.json";
 const PROJECT_JSON_FILE: &str = "project.json";
@@ -64,7 +64,12 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
                     } else {
                         get_version_from_cli(context)
                     };
-                    version.map(|v| Ok(v.0))
+                    VersionFormatter::format_module_version(
+                        module.get_name(),
+                        &version?,
+                        config.version_format,
+                    )
+                    .map(Ok)
                 }
                 "tfm" => find_current_tfm(&dotnet_files).map(Ok),
                 _ => None,
@@ -134,7 +139,7 @@ fn estimate_dotnet_version(
     files: &[DotNetFile],
     current_dir: &Path,
     repo_root: Option<&Path>,
-) -> Option<Version> {
+) -> Option<String> {
     let get_file_of_type = |t: FileType| files.iter().find(|f| f.file_type == t);
 
     // It's important to check for a global.json or a solution file first,
@@ -169,7 +174,7 @@ fn estimate_dotnet_version(
 ///       (Unless there is a git repository, and the parent is above the root of that repository)
 ///     - The root of the git repository
 ///       (If there is one)
-fn try_find_nearby_global_json(current_dir: &Path, repo_root: Option<&Path>) -> Option<Version> {
+fn try_find_nearby_global_json(current_dir: &Path, repo_root: Option<&Path>) -> Option<String> {
     let current_dir_is_repo_root = repo_root.map(|r| r == current_dir).unwrap_or(false);
     let parent_dir = if current_dir_is_repo_root {
         // Don't scan the parent directory if it's above the root of a git repository
@@ -196,7 +201,7 @@ fn try_find_nearby_global_json(current_dir: &Path, repo_root: Option<&Path>) ->
         .find_map(|d| check_directory_for_global_json(d))
 }
 
-fn check_directory_for_global_json(path: &Path) -> Option<Version> {
+fn check_directory_for_global_json(path: &Path) -> Option<String> {
     let global_json_path = path.join(GLOBAL_JSON_FILE);
     log::debug!(
         "Checking if global.json exists at: {}",
@@ -209,7 +214,7 @@ fn check_directory_for_global_json(path: &Path) -> Option<Version> {
     }
 }
 
-fn get_pinned_sdk_version_from_file(path: &Path) -> Option<Version> {
+fn get_pinned_sdk_version_from_file(path: &Path) -> Option<String> {
     let json_text = crate::utils::read_file(path).ok()?;
     log::debug!(
         "Checking if .NET SDK version is pinned in: {}",
@@ -218,7 +223,7 @@ fn get_pinned_sdk_version_from_file(path: &Path) -> Option<Version> {
     get_pinned_sdk_version(&json_text)
 }
 
-fn get_pinned_sdk_version(json: &str) -> Option<Version> {
+fn get_pinned_sdk_version(json: &str) -> Option<String> {
     let parsed_json: JValue = serde_json::from_str(json).ok()?;
 
     match parsed_json {
@@ -230,9 +235,8 @@ fn get_pinned_sdk_version(json: &str) -> Option<Version> {
                     match version {
                         JValue::String(version_string) => {
                             let mut buffer = String::with_capacity(version_string.len() + 1);
-                            buffer.push('v');
                             buffer.push_str(version_string);
-                            Some(Version(buffer))
+                            Some(buffer)
                         }
                         _ => None,
                     }
@@ -282,12 +286,12 @@ fn map_str_to_lower(value: Option<&OsStr>) -> Option<String> {
     Some(value?.to_str()?.to_ascii_lowercase())
 }
 
-fn get_version_from_cli(context: &Context) -> Option<Version> {
+fn get_version_from_cli(context: &Context) -> Option<String> {
     let version_output = context.exec_cmd("dotnet", &["--version"])?;
-    Some(Version(format!("v{}", version_output.stdout.trim())))
+    Some(format!("v{}", version_output.stdout.trim()))
 }
 
-fn get_latest_sdk_from_cli(context: &Context) -> Option<Version> {
+fn get_latest_sdk_from_cli(context: &Context) -> Option<String> {
     match context.exec_cmd("dotnet", &["--list-sdks"]) {
         Some(sdks_output) => {
             fn parse_failed<T>() -> Option<T> {
@@ -305,9 +309,8 @@ fn get_latest_sdk_from_cli(context: &Context) -> Option<Version> {
             if take_until > 1 {
                 let version = &latest_sdk[..take_until];
                 let mut buffer = String::with_capacity(version.len() + 1);
-                buffer.push('v');
                 buffer.push_str(version);
-                Some(Version(buffer))
+                Some(buffer)
             } else {
                 parse_failed()
             }
@@ -338,15 +341,6 @@ enum FileType {
     MsBuildFile,
 }
 
-struct Version(String);
-
-impl Deref for Version {
-    type Target = String;
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -613,7 +607,7 @@ mod tests {
     "#;
 
         let version = get_pinned_sdk_version(json_text).unwrap();
-        assert_eq!("v1.2.3", version.0);
+        assert_eq!("1.2.3", version);
     }
 
     #[test]