Skip to content

Commit 648f343

Browse files
Merge pull request #3 from checkmarx-ltd/AddVS_2019
Add support to VS2019 folder and fix 'add commit' history
2 parents 885a62a + 22a1ba9 commit 648f343

5 files changed

Lines changed: 8 additions & 5 deletions

File tree

CxViewerAction/Helpers/ChangeResultHelper.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ public static ProjectScanStatuses EditRemark(long resultId, long pathId, string
3737
else {
3838
loginResult.AuthenticationData = loginData;
3939
loginResult.IsSuccesfull = true;
40-
return ProjectScanStatuses.Success;
40+
return EditRemark(loginResult, resultId, pathId, remark);
41+
42+
// return ProjectScanStatuses.Success;
4143
}
4244

4345
return ProjectScanStatuses.CanceledByUser;

CxViewerAction/Helpers/LoginHelper.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public static string FullConfigPath
6464
case "12.0": studioYear = "2013"; break;
6565
case "14.0": studioYear = "2015"; break;
6666
case "15.0": studioYear = "2017"; break;
67+
case "16.0": studioYear = "2019"; break;
6768
}
6869
string addinTargetPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), string.Format(@"Visual Studio {0}\Settings", studioYear)); //\CxExtention
6970
return Path.Combine(addinTargetPath, FileName);

CxViewerVSIX/CxViewerPackage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace CxViewerVSIX
3434
/// </para>
3535
/// </remarks>
3636
[PackageRegistration(UseManagedResourcesOnly = true)]
37-
[InstalledProductRegistration("#110", "#112", "9.00.5", IconResourceID = 400)] // Info on this package for Help/About
37+
[InstalledProductRegistration("#110", "#112", "9.00.6", IconResourceID = 400)] // Info on this package for Help/About
3838
[ProvideMenuResource("Menus.ctmenu", 1)]
3939
//[ProvideAutoLoad("ADFC4E64-0397-11D1-9F4E-00A0C911004F")]
4040
[Guid(CxViewerPackage.PackageGuidString)]

CxViewerVSIX/source.extension.vsixmanifest

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<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">
33
<Metadata>
4-
<Identity Id="ae98c9e5-8e14-4c92-b45a-c4fd24a49123" Publisher="Checkmarx" Version="9.00.5" Language="en-US" />
4+
<Identity Id="ae98c9e5-8e14-4c92-b45a-c4fd24a49123" Publisher="Checkmarx" Version="9.00.6" Language="en-US" />
55
<DisplayName>CxViewer</DisplayName>
66
<Description xml:space="preserve" >Checkmarx Visual Studio Plugin</Description>
77
<MoreInfo>http://www.checkmarx.com</MoreInfo>

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ pipeline {
3838
agent { node { label vmName } }
3939
steps {
4040
script {
41-
fileOperations([folderRenameOperation(source: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX.vsix", destination: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.5.vsix")])
42-
kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.5.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
41+
fileOperations([folderRenameOperation(source: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX.vsix", destination: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.6.vsix")])
42+
kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.6.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
4343
}
4444
}
4545
}

0 commit comments

Comments
 (0)