Fix versioning (again)

Add vscode assets Change float parsing strategy (try to use UI culture)
kutukvpavel · Oct 1, 2023 · 040f793 · 040f793
1 parent 7ad8b20
commit 040f793
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,26 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            // Use IntelliSense to find out which attributes exist for C# debugging
+            // Use hover for the description of the existing attributes
+            // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md
+            "name": ".NET Core Launch (console)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            // If you have changed target frameworks, make sure to update the program path.
+            "program": "${workspaceFolder}/RRGControl/bin/Debug/net5.0/RRGControl.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/RRGControl",
+            // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
+            "console": "internalConsole",
+            "stopAtEntry": false
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach"
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/RRGControl.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/RRGControl.sln",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/RRGControl.sln"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/RRGControl/Adapters/Packet.cs b/RRGControl/Adapters/Packet.cs
@@ -58,7 +58,7 @@ public double ConvertValueToDouble()
             {
                 return v;
             }
-            return double.Parse(Value);
+            return double.Parse(Value, System.Globalization.CultureInfo.CurrentUICulture);
         }
         public string GetConvertedValue(MyModbus.RRGUnit u)
         {

diff --git a/RRGControl/RRGControl.csproj b/RRGControl/RRGControl.csproj
@@ -16,8 +16,8 @@
 	<PropertyGroup>
 		<Company>MDC</Company>
 		<Copyright>Copyright Kutukov Pavel © 2022-2023</Copyright>
-		<ProductVersion>0.3-c</ProductVersion>
-		<InformationalVersion>0.3-c</InformationalVersion>
+		<ProductVersion>0.5.1</ProductVersion>
+		<InformationalVersion>0.5.1</InformationalVersion>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 	  <Optimize>true</Optimize>

diff --git a/RRGControl/Views/AboutBox.axaml.cs b/RRGControl/Views/AboutBox.axaml.cs
@@ -13,7 +13,7 @@ public AboutBox()
             DataContext = this;
         }
 
-        private string AboutAuthor => @$"ÐÐÃ series mass flow controller software
+        private string AboutAuthor => @$"РРГ series mass flow controller software
 Version: {(Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), false)
             .FirstOrDefault() as AssemblyInformationalVersionAttribute)?.InformationalVersion}