Skip to content

Commit

Permalink
Remove protoc conditional properties
Browse files Browse the repository at this point in the history
  • Loading branch information
ObsidianMinor committed Jun 22, 2018
1 parent f42d592 commit 3128c01
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions csharp/Google.Protobuf.Tools.targets
@@ -1,16 +1,11 @@
<Project>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">>
<PropertyGroup>
<protoc_linux64>$(MSBuildThisFileDirectory)..\tools\linux_x64\protoc</protoc_linux64>
<protoc_linux86>$(MSBuildThisFileDirectory)..\tools\linux_x86\protoc</protoc_linux86>
<protoc_macosx64>$(MSBuildThisFileDirectory)..\tools\macosx_x64\protoc</protoc_macosx64>
<protoc_macosx86>$(MSBuildThisFileDirectory)..\tools\macosx_x86\protoc</protoc_macosx86>
<protoc_windows64>$(MSBuildThisFileDirectory)..\tools\windows_x64\protoc.exe</protoc_windows64>
<protoc_windows86>$(MSBuildThisFileDirectory)..\tools\windows_x86\protoc.exe</protoc_windows86>
<protoc Condition="'$([MSBuild]::IsOsPlatform(Linux))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X64'">$(protoc_linux64)</protoc>
<protoc Condition="'$([MSBuild]::IsOsPlatform(Linux))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X86'">$(protoc_linux86)</protoc>
<protoc Condition="'$([MSBuild]::IsOsPlatform(OSX))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X64'">$(protoc_macosx64)</protoc>
<protoc Condition="'$([MSBuild]::IsOsPlatform(OSX))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X86'">$(protoc_macosx86)</protoc>
<protoc Condition="'$([MSBuild]::IsOsPlatform(Windows))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X64'">$(protoc_windows64)</protoc>
<protoc Condition="'$([MSBuild]::IsOsPlatform(Windows))' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)'=='X86'">$(protoc_windows86)</protoc>
<protoc_tools>$(MSBuildThisFileDirectory)\..\tools\</protoc_tools>
<protoc_linux64>$(protoc_tools)\linux_x64\protoc</protoc_linux64>
<protoc_linux86>$(protoc_tools)\linux_x86\protoc</protoc_linux86>
<protoc_macosx64>$(protoc_tools)\macosx_x64\protoc</protoc_macosx64>
<protoc_macosx86>$(protoc_tools)\macosx_x86\protoc</protoc_macosx86>
<protoc_windows64>$(protoc_tools)\tools\windows_x64\protoc.exe</protoc_windows64>
<protoc_windows86>$(protoc_tools)\tools\windows_x86\protoc.exe</protoc_windows86>
</PropertyGroup>
</Project>
</Project>

0 comments on commit 3128c01

Please sign in to comment.