fixes an issue when existing package reference was not found in cspro…

…j file
ix-ax · Oct 5, 2023 · 9be0ec0 · 9be0ec0
1 parent 41bce43
commit 9be0ec0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/CsProject.cs
@@ -254,15 +254,14 @@ private static bool PackageReferenceExists(string projectFilePath, string packag
         var package
             = PackageReference.GetVersionFromCentralPackageManagement(projectFilePath)?
                 .FirstOrDefault(p => p.include == packageName);
-
 
-        // Using XPath to search for the PackageReference with a specific Include attribute and Version child element
-
-        return  xDocument.XPathSelectElements(
-                    $"//PackageReference[@Include='{packageName}']/Version[text()='{version}']").Any()
-                || 
-                (xDocument.XPathSelectElements(
+        var hasWithVersion = xDocument.XPathSelectElements($"//PackageReference[@Include='{packageName}' and @Version='{version}']").Any();
+
+        var hasVersionInCentralPackageManagement = (xDocument.XPathSelectElements(
             $"//PackageReference[@Include='{packageName}']").Any() && package != null && package?.version == version);
+
+        return hasWithVersion || hasVersionInCentralPackageManagement;
+
     }
 
     private static void AddNuGetPackageReference(string projectPath, string packageName, string version = null)

diff --git a/src/AXSharp.compiler/src/ixc/Properties/launchSettings.json b/src/AXSharp.compiler/src/ixc/Properties/launchSettings.json
@@ -21,8 +21,12 @@
       "workingDirectory": "C:\\W\\Develop\\gh\\ix-ax\\axsharp\\src\\AXSharp.connectors\\tests\\ax-test-project\\"
     },
     "app-withref": {
-      "commandName": "Project",      
-      "workingDirectory": "c:\\W\\Develop\\gh\\ix-ax\\axopen\\src\\.application\\app\\"
+      "commandName": "Project",
+      "workingDirectory": "c:\\W\\Develop\\gh\\ix-ax\\axopen.templates\\templates.simple\\app\\"
+    },
+    "app-withref-cpm": {
+      "commandName": "Project",
+      "workingDirectory": "c:\\W\\Develop\\gh\\ix-ax\\axopen\\src\\templates.simple\\app\\"
     }
   }
 }