#56 support 6.3

jmecosta · Mar 21, 2017 · 5663c12 · 5663c12
1 parent 60edf63
commit 5663c12
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/CxxSonarQubeMsbuidRunner/CxxSonarQubeMsbuidRunner.fsproj b/CxxSonarQubeMsbuidRunner/CxxSonarQubeMsbuidRunner.fsproj
@@ -41,7 +41,7 @@
     <DocumentationFile>
     </DocumentationFile>
     <Prefer32Bit>false</Prefer32Bit>
-    <StartArguments>/k:Tekla.Tools.RoslynRunner /n:RoslynRunner  /v:work /m=D:\Development\SonarQube\dotnet\sonar-roslyn-plugin\RoslynRunner\RoslynRunner.sln</StartArguments>
+    <StartArguments>/i</StartArguments>
   </PropertyGroup>
   <PropertyGroup>
     <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
@@ -84,28 +84,28 @@
       <Private>True</Private>
     </ProjectReference>
     <Reference Include="FSharp.Data">
-      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.0\lib\FSharp.Data.dll</HintPath>
+      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.1\lib\FSharp.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="FSharp.Data.DesignTime">
-      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.0\lib\FSharp.Data.DesignTime.dll</HintPath>
+      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.1\lib\FSharp.Data.DesignTime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="MsbuildAutomationHelper">
-      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.0\lib\MsbuildAutomationHelper.dll</HintPath>
+      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.1\lib\MsbuildAutomationHelper.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <Private>True</Private>
     </Reference>
     <Reference Include="RestSharp">
-      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.0\lib\RestSharp.dll</HintPath>
+      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.1\lib\RestSharp.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="SonarRestService">
-      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.0\lib\SonarRestService.dll</HintPath>
+      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.1\lib\SonarRestService.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -145,11 +145,11 @@
       <Private>True</Private>
     </ProjectReference>
     <Reference Include="VSSonarPlugins">
-      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.0\lib\VSSonarPlugins.dll</HintPath>
+      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.1\lib\VSSonarPlugins.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="VSSonarQubeCmdExecutor">
-      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.0\lib\VSSonarQubeCmdExecutor.dll</HintPath>
+      <HintPath>..\packages\VSSonarExtensionPlugin3Api.6.1.1\lib\VSSonarQubeCmdExecutor.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/CxxSonarQubeMsbuidRunner/InstallationModule.fs b/CxxSonarQubeMsbuidRunner/InstallationModule.fs
@@ -147,7 +147,7 @@ let InstallCppLint() =
         wc.DownloadFile("""https://raw.githubusercontent.com/SonarOpenCommunity/sonar-cxx-msbuild-tasks/master/Nuget/CppLint/cpplint_mod.py""", cpplintMod)
     cpplintMod
 
-let InstallRats() =    
+let InstallRats() = 
     Path.Combine(DownloadAndInstallZipDist("""https://github.com/SonarOpenCommunity/sonar-cxx-msbuild-tasks/raw/master/Nuget/rats.zip""", "RATS"), "rats.exe")
 
 let InstallVera() =

diff --git a/CxxSonarQubeMsbuidRunner/Options.fs b/CxxSonarQubeMsbuidRunner/Options.fs
@@ -204,7 +204,7 @@ type OptionsData(args : string []) =
         if arguments.ContainsKey("r") then
             arguments.["r"] |> Seq.head
         else
-            "1.1"
+            "2.2"
 
     let parentBranch = 
         if arguments.ContainsKey("b") then

diff --git a/CxxSonarQubeMsbuidRunner/Program.fs b/CxxSonarQubeMsbuidRunner/Program.fs
@@ -54,13 +54,13 @@ let main argv =
                     printf "Exception During Run: %s \r\n %s" ex.Message ex.StackTrace            
                     ret <- 1
 
-
                 options.Clean()
                 options.DuplicateFalsePositives()
-
         with
         | ex ->
             printf "Exception During Run: %s %s\r\n" ex.Message ex.StackTrace
             ret <- 1
 
+
+
     ret
diff --git a/CxxSonarQubeMsbuidRunner/packages.config b/CxxSonarQubeMsbuidRunner/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="VSSonarExtensionPlugin3Api" version="6.1.0" targetFramework="net452" />
+  <package id="VSSonarExtensionPlugin3Api" version="6.1.1" targetFramework="net452" />
 </packages>