Fixup the mechanism used to determine current assembly folder

davewalker5 · Apr 11, 2023 · 8de5cb4 · 8de5cb4
1 parent 3af4ba4
commit 8de5cb4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/TelloCommander/CommandDictionaries/CommandDictionary.cs b/src/TelloCommander/CommandDictionaries/CommandDictionary.cs
@@ -205,8 +205,7 @@ private static string GetVersionFromFilename(string filename)
         private static string GetAssemblyLocation()
         {
             string codeBase = Assembly.GetExecutingAssembly().Location;
-            UriBuilder builder = new UriBuilder(codeBase);
-            string location = Path.GetDirectoryName(Uri.UnescapeDataString(builder.Path));
+            string location = Path.GetDirectoryName(codeBase);
             return location;
         }
 

diff --git a/src/TelloCommander/Commander/DroneCommander.cs b/src/TelloCommander/Commander/DroneCommander.cs
@@ -263,8 +263,7 @@ private string GetFullScriptPath(string file)
                 {
                     // Get the folder containing the current assembly
                     string codeBase = Assembly.GetExecutingAssembly().Location;
-                    UriBuilder builder = new UriBuilder(codeBase);
-                    string folder = Path.GetDirectoryName(Uri.UnescapeDataString(builder.Path));
+                    string folder = Path.GetDirectoryName(codeBase);
 
                     // Combine with the specified file to give the full path
                     fullPath = Path.Combine(folder, file);

diff --git a/src/TelloCommander/TelloCommander.csproj b/src/TelloCommander/TelloCommander.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <PackageId>TelloCommander</PackageId>
-    <ReleaseVersion>1.0.0.7</ReleaseVersion>
-    <PackageVersion>1.0.0.7</PackageVersion>
+    <ReleaseVersion>1.0.0.8</ReleaseVersion>
+    <PackageVersion>1.0.0.8</PackageVersion>
     <Authors>Dave Walker</Authors>
     <Copyright>Copyright (c) 2020, 2021, 2023 Dave Walker</Copyright>
     <Owners>Dave Walker</Owners>