Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Mar 17, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e339438
See: https://github.com/NuGet/Home/issues/6301#issuecomment-350939781
Mar 13, 2020
86bd798
rm var from doc
andrei-epure-sonarsource Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docs/contributing-analyzer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions sonaranalyzer-dotnet/src/SonarAnalyzer.Common/SonarAnalyzer.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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." />
Expand Down