Merge pull request #5 from CxRepositories/bug_fixes

Fixing multiple bugs: VS plugin 9.0 - bind state AB#681 and switching…

Author: majdmah

CxViewerAction/Helpers/BindProjectHelper.cs

@@ -69,6 +69,7 @@ internal static ProjectScanStatuses BindProject(Entities.Project project)
                 else if (status == ProjectScanStatuses.CanceledByUser)
                 {
                     //Do nothing...
+                    CommonData.IsProjectBound = false;
                 }
                 else
                 {

CxViewerAction/MenuLogic/BindProjectLogic.cs

@@ -28,12 +28,14 @@ public ActionStatus Act()
                 Entities.Project project = CommonActionsInstance.getInstance().GetSelectedProject();
                 CommonData.ProjectName = project.ProjectName;
                 CommonData.ProjectRootPath = project.RootPath;
-                if (!setBindProject(true))
+                DoRetrieveResults(project);
+                if (CommonData.IsProjectBound)
                 {
-                    return ActionStatus.Failed;
+                    if (!setBindProject(true))
+                    {
+                        return ActionStatus.Failed;
+                    }
                 }
-                CommonData.IsProjectBound = true;
-                DoRetrieveResults(project);
                 CommonData.IsWorkingOffline = false;
                 return ActionStatus.Success;
             }

CxViewerAction/MenuLogic/ScanLogic.cs

@@ -55,6 +55,10 @@ public ActionStatus Act()
                     CommonData.IsProjectBound = bindPro.IsBound;
                     CommonData.IsProjectPublic = bindPro.IsPublic;
                 }
+                else
+                {
+                    CommonData.IsProjectBound = false;
+                }
             }
             CommonActionsInstance.getInstance().BuildFileMapping();
             CommonActionsInstance.getInstance().ExecuteSystemCommand("File.SaveAll", string.Empty);

CxViewerVSIX/CxViewerPackage.cs

@@ -34,7 +34,7 @@ namespace CxViewerVSIX
     /// </para>
     /// </remarks>
     [PackageRegistration(UseManagedResourcesOnly = true)]
-    [InstalledProductRegistration("#110", "#112", "9.00.3", IconResourceID = 400)] // Info on this package for Help/About
+    [InstalledProductRegistration("#110", "#112", "9.00.4", IconResourceID = 400)] // Info on this package for Help/About
     [ProvideMenuResource("Menus.ctmenu", 1)]
     //[ProvideAutoLoad("ADFC4E64-0397-11D1-9F4E-00A0C911004F")]
     [Guid(CxViewerPackage.PackageGuidString)]

CxViewerVSIX/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ae98c9e5-8e14-4c92-b45a-c4fd24a49123" Publisher="Checkmarx" Version="9.00.3" Language="en-US" />
+        <Identity Id="ae98c9e5-8e14-4c92-b45a-c4fd24a49123" Publisher="Checkmarx" Version="9.00.4" Language="en-US" />
         <DisplayName>CxViewer</DisplayName>
         <Description xml:space="preserve" >Checkmarx Visual Studio Plugin</Description>
         <MoreInfo>http://www.checkmarx.com</MoreInfo>

Jenkinsfile

@@ -38,8 +38,8 @@ pipeline {
             agent { node { label vmName } }
             steps {
                 script {
-		    fileOperations([folderRenameOperation(source: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX.vsix", destination: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.3.vsix")])
-                    kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.3.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
+		    fileOperations([folderRenameOperation(source: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX.vsix", destination: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.4.vsix")])
+                    kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.4.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
                 }
             }
         }