Use $(NugetPackageRoot) instead of $(NUGET_PACKAGES) (#3226)

Co-authored-by: Corniel Nobel <mail@corniel.nl>
SonarSource · Mar 17, 2020 · a198035 · a198035
1 parent a7d1aa5
commit a198035
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/docs/contributing-analyzer.md b/docs/contributing-analyzer.md
@@ -27,7 +27,6 @@ In general, it is best to run commands from the Visual Studio Developer Command
     - **MAVEN_HOME** / **M2_HOME**
     - **MSBUILD_PATH** - path to the MSBuild.exe executable from the Visual Studio installation folder - to MSBuild 16
     - **NUGET_PATH** - path to the nuget.exe executable (related to the [plugin integration tests](./contributing-plugin.md#integration-tests))
-    - **NUGET_PACKAGES** - path to the local nuget cache (related to build)
     - **ORCHESTRATOR_CONFIG_URL** - url to orchestrator.properties file (for integration tests) in uri form (i.e. file:///c:/something/orchestrator.properties)
     - **RULE_API_PATH** - path to folder containing the rule api jar
     - **PATH** - the system **PATH** variable must contain:

diff --git a/sonaranalyzer-dotnet/src/SonarAnalyzer.Common/SonarAnalyzer.Common.csproj b/sonaranalyzer-dotnet/src/SonarAnalyzer.Common/SonarAnalyzer.Common.csproj
@@ -37,9 +37,9 @@
       <IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
     </PropertyGroup>
     <PropertyGroup>
-      <ProtocCompiler Condition="$(IsWindows)==true">"$(NUGET_PACKAGES)/Google.Protobuf.Tools/3.6.1/tools/windows_x64/protoc.exe"</ProtocCompiler>
-      <ProtocCompiler Condition="$(IsOSX)==true">$(NUGET_PACKAGES)/google.protobuf.tools/3.6.1/tools/macosx_x64/protoc</ProtocCompiler>
-      <ProtocCompiler Condition="$(IsLinux)==true">$(NUGET_PACKAGES)/google.protobuf.tools/3.6.1/tools/linux_x64/protoc</ProtocCompiler>
+      <ProtocCompiler Condition="$(IsWindows)==true">"$(NugetPackageRoot)/Google.Protobuf.Tools/3.6.1/tools/windows_x64/protoc.exe"</ProtocCompiler>
+      <ProtocCompiler Condition="$(IsOSX)==true">$(NugetPackageRoot)/google.protobuf.tools/3.6.1/tools/macosx_x64/protoc</ProtocCompiler>
+      <ProtocCompiler Condition="$(IsLinux)==true">$(NugetPackageRoot)/google.protobuf.tools/3.6.1/tools/linux_x64/protoc</ProtocCompiler>
     </PropertyGroup>
     <Exec Command="$(ProtocCompiler) -I=./Protobuf --csharp_out=./Protobuf ./Protobuf/AnalyzerReport.proto" />
     <Message Importance="high" Text="Protobuf classes generated." />