#374 Remove SonarAnalyzer.Scanner

SonarSource · May 31, 2017 · 5a7c323 · 5a7c323
1 parent 3774b52
commit 5a7c323
Show file tree

Hide file tree

Showing 36 changed files with 10 additions and 1,941 deletions.
diff --git a/sonaranalyzer-dotnet/SonarAnalyzer.sln b/sonaranalyzer-dotnet/SonarAnalyzer.sln
@@ -22,14 +22,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{B7233F78
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SonarAnalyzer.UnitTest", "src\Tests\SonarAnalyzer.UnitTest\SonarAnalyzer.UnitTest.csproj", "{4AC7D054-B645-46D7-9671-D666BCE0C745}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SonarAnalyzer.Platform.Integration.UnitTest", "src\Tests\SonarAnalyzer.Platform.Integration.UnitTest\SonarAnalyzer.Platform.Integration.UnitTest.csproj", "{980FF643-2605-46F3-8C63-2F76290F84A8}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SonarQube Integration", "SonarQube Integration", "{F51A8C2A-A0F5-4282-956F-549D05860396}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SonarAnalyzer.RuleDescriptorGenerator", "src\SonarAnalyzer.RuleDescriptorGenerator\SonarAnalyzer.RuleDescriptorGenerator.csproj", "{E4D5FF22-C1A4-4CAD-B068-E47817F25848}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SonarAnalyzer.Scanner", "src\SonarAnalyzer.Scanner\SonarAnalyzer.Scanner.csproj", "{79F0B359-8275-4F3B-B919-82C493B74665}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SonarAnalyzer.RuleDocGenerator.Web", "src\SonarAnalyzer.RuleDocGenerator.Web\SonarAnalyzer.RuleDocGenerator.Web.csproj", "{98EF48F7-28D7-44CA-8C7F-6042EA4898E1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CCEE2C5C-96D9-4427-B980-71DC0A49E23F}"
@@ -60,18 +56,10 @@ Global
 		{4AC7D054-B645-46D7-9671-D666BCE0C745}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4AC7D054-B645-46D7-9671-D666BCE0C745}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4AC7D054-B645-46D7-9671-D666BCE0C745}.Release|Any CPU.Build.0 = Release|Any CPU
-		{980FF643-2605-46F3-8C63-2F76290F84A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{980FF643-2605-46F3-8C63-2F76290F84A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{980FF643-2605-46F3-8C63-2F76290F84A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{980FF643-2605-46F3-8C63-2F76290F84A8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E4D5FF22-C1A4-4CAD-B068-E47817F25848}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E4D5FF22-C1A4-4CAD-B068-E47817F25848}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E4D5FF22-C1A4-4CAD-B068-E47817F25848}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E4D5FF22-C1A4-4CAD-B068-E47817F25848}.Release|Any CPU.Build.0 = Release|Any CPU
-		{79F0B359-8275-4F3B-B919-82C493B74665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{79F0B359-8275-4F3B-B919-82C493B74665}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{79F0B359-8275-4F3B-B919-82C493B74665}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{79F0B359-8275-4F3B-B919-82C493B74665}.Release|Any CPU.Build.0 = Release|Any CPU
 		{98EF48F7-28D7-44CA-8C7F-6042EA4898E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{98EF48F7-28D7-44CA-8C7F-6042EA4898E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{98EF48F7-28D7-44CA-8C7F-6042EA4898E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -90,9 +78,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{4AC7D054-B645-46D7-9671-D666BCE0C745} = {B7233F78-E142-4882-B084-7C83BE472109}
-		{980FF643-2605-46F3-8C63-2F76290F84A8} = {CCEE2C5C-96D9-4427-B980-71DC0A49E23F}
 		{E4D5FF22-C1A4-4CAD-B068-E47817F25848} = {F51A8C2A-A0F5-4282-956F-549D05860396}
-		{79F0B359-8275-4F3B-B919-82C493B74665} = {F51A8C2A-A0F5-4282-956F-549D05860396}
 		{CCEE2C5C-96D9-4427-B980-71DC0A49E23F} = {F51A8C2A-A0F5-4282-956F-549D05860396}
 	EndGlobalSection
 EndGlobal
diff --git a/sonaranalyzer-dotnet/build/ChangeVersion.proj b/sonaranalyzer-dotnet/build/ChangeVersion.proj
@@ -55,17 +55,12 @@
       <ExpectedMatchCount>1</ExpectedMatchCount>
     </NugetReleaseNotes>
 
-    <NugetRunner Include="$(SolutionRoot)\src\SonarAnalyzer.Scanner\Scanner.nuspec">
-      <Find>(?&lt;=&lt;version&gt;)([^&lt;]*)</Find>
-      <ReplaceWith>$(NugetVersion)</ReplaceWith>
-      <ExpectedMatchCount>1</ExpectedMatchCount>
-    </NugetRunner>
     <NugetDescriptorCs Include="$(SolutionRoot)\src\SonarAnalyzer.RuleDescriptorGenerator\Descriptor.cs.nuspec">
       <Find>(?&lt;=&lt;version&gt;)([^&lt;]*)</Find>
       <ReplaceWith>$(NugetVersion)</ReplaceWith>
       <ExpectedMatchCount>1</ExpectedMatchCount>
     </NugetDescriptorCs>
-	<NugetDescriptorVbNet Include="$(SolutionRoot)\src\SonarAnalyzer.RuleDescriptorGenerator\Descriptor.vbnet.nuspec">
+	  <NugetDescriptorVbNet Include="$(SolutionRoot)\src\SonarAnalyzer.RuleDescriptorGenerator\Descriptor.vbnet.nuspec">
       <Find>(?&lt;=&lt;version&gt;)([^&lt;]*)</Find>
       <ReplaceWith>$(NugetVersion)</ReplaceWith>
       <ExpectedMatchCount>1</ExpectedMatchCount>
@@ -80,7 +75,6 @@
     <RegexTransform Items="@(VsixReleaseNotes)" />
     <RegexTransform Items="@(NugetAnalyzer)" />
     <RegexTransform Items="@(NugetReleaseNotes)" />
-    <RegexTransform Items="@(NugetRunner)" />
     <RegexTransform Items="@(NugetDescriptorCs)" />
     <RegexTransform Items="@(NugetDescriptorVbNet)" />
   </Target>

diff --git a/sonaranalyzer-dotnet/build/Version.props b/sonaranalyzer-dotnet/build/Version.props
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <MainVersion>5.11.0</MainVersion>
     <BuildNumber>0</BuildNumber>
-    <Sha1>c4a5826afe906f9ead8e3a7759e647c2ff7fa496</Sha1>
-    <BranchName>master</BranchName>
+    <Sha1>not-set</Sha1>
+    <BranchName>not-set</BranchName>
     <FullVersion>$(MainVersion).$(BuildNumber)</FullVersion>
     <AssemblyVersion>$(MainVersion)</AssemblyVersion>
     <AssemblyFileVersion>$(FullVersion)</AssemblyFileVersion>

diff --git a/sonaranalyzer-dotnet/build/qa.ps1 b/sonaranalyzer-dotnet/build/qa.ps1
@@ -35,7 +35,7 @@ function Get-BuildArtifacts {
 
     $authHeaders = (Get-AuthHeaders)
 
-    $packageNames = "SonarAnalyzer.CSharp", "SonarAnalyzer.VisualBasic", "SonarAnalyzer.Scanner"
+    $packageNames = "SonarAnalyzer.CSharp", "SonarAnalyzer.VisualBasic"
 
     try {
         $tempFolder = (Resolve-RepoPath "temp") #TODO: make random

diff --git a/sonaranalyzer-dotnet/build/release.ps1 b/sonaranalyzer-dotnet/build/release.ps1
@@ -89,11 +89,6 @@ function ReleaseAll(
      <file src=""xml\*.xml"" target=""xml\"" />
     </files>"
 
-    $scannerContent = "<files>
-     <file src=""assembly\*.*"" target=""assembly\"" />
-     <file src=""protobuf\*.proto"" target=""protobuf\"" />
-    </files>"
-
 
     # analyzers
     CreateRelease   -productName "SonarAnalyzer.VisualBasic" `
@@ -106,10 +101,6 @@ function ReleaseAll(
                     -version $buildVersion -expectedSha1 $sha1 -releaseVersion $releaseVersion -additionalNugetFileContent $descriptorContent -nugetPath $nugetPath
     CreateRelease   -productName "SonarAnalyzer.RuleDocGenerator.CSharp" `
                     -version $buildVersion -expectedSha1 $sha1 -releaseVersion $releaseVersion -additionalNugetFileContent $descriptorContent -nugetPath $nugetPath
-
-    # scanner
-    CreateRelease   -productName "SonarAnalyzer.Scanner" `
-                    -version $buildVersion -expectedSha1 $sha1  -releaseVersion $releaseVersion -additionalNugetFileContent $scannerContent -nugetPath $nugetPath
 }
 
 ReleaseAll -buildVersion $env:PROMOTED_VERSION -sha1 $env:SHA1 -releaseVersion $env:RELEASE_VERSION -nugetPath $env:NUGET_PATH
@@ -145,7 +136,6 @@ pushToRepox -productName "SonarAnalyzer.CSharp"                         -release
 pushToRepox -productName "SonarAnalyzer.VisualBasic"                    -releaseVersion $env:RELEASE_VERSION -nugetPath $env:NUGET_PATH
 pushToRepox -productName "SonarAnalyzer.RuleDocGenerator.CSharp"        -releaseVersion $env:RELEASE_VERSION -nugetPath $env:NUGET_PATH
 pushToRepox -productName "SonarAnalyzer.RuleDocGenerator.VisualBasic"   -releaseVersion $env:RELEASE_VERSION -nugetPath $env:NUGET_PATH
-pushToRepox -productName "SonarAnalyzer.Scanner"                        -releaseVersion $env:RELEASE_VERSION -nugetPath $env:NUGET_PATH
 
 
 #upload to maven repo

diff --git a/sonaranalyzer-dotnet/src/SonarAnalyzer.CSharp/Properties/AssemblyInfo.cs b/sonaranalyzer-dotnet/src/SonarAnalyzer.CSharp/Properties/AssemblyInfo.cs
@@ -26,4 +26,4 @@
 [assembly: AssemblyDescription("")]
 
 [assembly: InternalsVisibleTo("SonarAnalyzer.UnitTest" + Signing.InternalsVisibleToPublicKey)]
-[assembly: InternalsVisibleTo("SonarAnalyzer.Scanner" + Signing.InternalsVisibleToPublicKey)]
+
diff --git a/sonaranalyzer-dotnet/src/SonarAnalyzer.Common/Properties/AssemblyInfo.cs b/sonaranalyzer-dotnet/src/SonarAnalyzer.Common/Properties/AssemblyInfo.cs
@@ -28,5 +28,4 @@
 [assembly: InternalsVisibleTo("SonarAnalyzer.CSharp" + Signing.InternalsVisibleToPublicKey)]
 [assembly: InternalsVisibleTo("SonarAnalyzer.VisualBasic" + Signing.InternalsVisibleToPublicKey)]
 [assembly: InternalsVisibleTo("SonarAnalyzer.UnitTest" + Signing.InternalsVisibleToPublicKey)]
-[assembly: InternalsVisibleTo("SonarAnalyzer.Scanner" + Signing.InternalsVisibleToPublicKey)]
 [assembly: InternalsVisibleTo("SonarAnalyzer.Platform.Integration.UnitTest" + Signing.InternalsVisibleToPublicKey)]
diff --git a/...et/src/SonarAnalyzer.RuleDescriptorGenerator/SonarAnalyzer.RuleDescriptorGenerator.csproj b/...et/src/SonarAnalyzer.RuleDescriptorGenerator/SonarAnalyzer.RuleDescriptorGenerator.csproj
@@ -46,6 +46,10 @@
       <HintPath>..\..\packages\Microsoft.CodeAnalysis.VisualBasic.1.0.0\lib\net45\Microsoft.CodeAnalysis.VisualBasic.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
@@ -105,10 +109,6 @@
       <Project>{d1ae804f-ae78-4883-b3d6-9e3c4026def6}</Project>
       <Name>SonarAnalyzer.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\SonarAnalyzer.Scanner\SonarAnalyzer.Scanner.csproj">
-      <Project>{79f0b359-8275-4f3b-b919-82c493b74665}</Project>
-      <Name>SonarAnalyzer.Scanner</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

diff --git a/sonaranalyzer-dotnet/src/SonarAnalyzer.Scanner/CompilationHelper.cs b/sonaranalyzer-dotnet/src/SonarAnalyzer.Scanner/CompilationHelper.cs
diff --git a/sonaranalyzer-dotnet/src/SonarAnalyzer.Scanner/Configuration.cs b/sonaranalyzer-dotnet/src/SonarAnalyzer.Scanner/Configuration.cs