Merge pull request #5 from checkmarx-ltd/Version_90.0_Fix_55025

Fix sub folders issue, customer ticket number 55025, and bug number 2…

Author: cx-margarita-levitm

CxViewerAction/Helpers/LoginHelper.cs

@@ -381,15 +381,19 @@ public static bool DolLogin(LoginData login, CxWebServiceClient client)
 
 			if (oidcLoginResult.IsSuccessful)
 			{
-				cxRestApi = new CxRESTApi(login);
+                //Add logs for print Server url and AccessToken
+                Logger.Create().Debug("Server URL: " + login.ServerBaseUri);
+                cxRestApi = new CxRESTApi(login);
 				string accessToken = cxRestApi.Login(oidcLoginResult.Code);
 				cxRestApi.GetPermissions(accessToken);
                 loginSucceeded = true;
-
+                Logger.Create().Debug("Succeeded to login. ");
             }
 			else
 			{
-				_oidcLoginHelper.CloseLoginWindow();
+                Logger.Create().Debug("Server URL: " + login.ServerBaseUri);
+                _oidcLoginHelper.CloseLoginWindow();
+                Logger.Create().Debug("Failed to login. ");
 			}
             return loginSucceeded;
 

CxViewerAction/Helpers/ZipHelper.cs

@@ -123,7 +123,7 @@ private static byte[] Compress(Project[] projects, string sExcludeFile, string s
 
                             int subProjects = projects.Where(p2 => p.RootPath.Contains(p2.RootPath)).Count();
 
-                            if (subProjects == 1 && dirMatch.IsMatch(Path.GetFileName(p.RootPath))) //If the project is not a subProject and not excluded
+                            if (subProjects >= 1 && dirMatch.IsMatch(Path.GetFileName(p.RootPath))) //If the project is not a subProject and not excluded
                             {
                                 foreach (string filePath in p.FilePathList) // scan only the file selected
                                 {

CxViewerVSIX/CxViewerPackage.cs

@@ -35,7 +35,7 @@ namespace CxViewerVSIX
     /// </remarks>
     /// 
     [PackageRegistration(UseManagedResourcesOnly = true)]
-    [InstalledProductRegistration("#110", "#112", "9.00.6", IconResourceID = 400)] // Info on this package for Help/About
+    [InstalledProductRegistration("#110", "#112", "9.00.7", 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.6" Language="en-US" />
+        <Identity Id="ae98c9e5-8e14-4c92-b45a-c4fd24a49123" Publisher="Checkmarx" Version="9.00.7" 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.6.vsix")])
-                    kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.6.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.7.vsix")])
+                    kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.7.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
                 }
             }
         }