Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

get rid of workaround to build net45 targets on linux and mac

Browse Source
pull/19242/head
Jan Tattermusch 6 years ago
parent da3784bf89
commit a827504ffb
3 changed files with 12 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/csharp/Grpc.Core/Common.csproj.include
  2. 15
      src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj
  3. 15
      src/csharp/Grpc.Tools/Grpc.Tools.csproj

10
src/csharp/Grpc.Core/Common.csproj.include
Unescape View File

@ -19,10 +19,8 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign> <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(OS)' != 'Windows_NT'"> <!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
<!-- Workaround for https://github.com/dotnet/sdk/issues/335 --> <ItemGroup>
<FrameworkPathOverride Condition="Exists('/usr/lib/mono/4.5-api')">/usr/lib/mono/4.5-api</FrameworkPathOverride> <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
<FrameworkPathOverride Condition="Exists('/usr/local/lib/mono/4.5-api')">/usr/local/lib/mono/4.5-api</FrameworkPathOverride> </ItemGroup>
<FrameworkPathOverride Condition="Exists('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5-api')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5-api</FrameworkPathOverride>
</PropertyGroup>
</Project> </Project>

15
src/csharp/Grpc.Tools.Tests/Grpc.Tools.Tests.csproj
Unescape View File

@ -7,17 +7,10 @@
<Import Project="..\Grpc.Core\SourceLink.csproj.include" /> <Import Project="..\Grpc.Core\SourceLink.csproj.include" />
<!-- This is copied verbatim from Grpc.Core/Common.csproj.include. Other settings <!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
in that file conflict with the intent of this build, as it cannot be signed, <ItemGroup>
and may not compile Grpc.Core/Version.cs, as that file references constants <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
in Grpc.Core.dll. </ItemGroup>
TODO(kkm): Refactor imports. -->
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' and '$(MSBuildRuntimeType)' == 'Core' ">
<!-- Use Mono reference assemblies in SDK build: https://github.com/dotnet/sdk/issues/335 -->
<FrameworkPathOverride Condition="Exists('/usr/lib/mono/4.5-api')">/usr/lib/mono/4.5-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="Exists('/usr/local/lib/mono/4.5-api')">/usr/local/lib/mono/4.5-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="Exists('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5-api')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5-api</FrameworkPathOverride>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Grpc.Tools\Grpc.Tools.csproj" /> <ProjectReference Include="..\Grpc.Tools\Grpc.Tools.csproj" />

15
src/csharp/Grpc.Tools/Grpc.Tools.csproj
Unescape View File

@ -7,17 +7,10 @@
<TargetFrameworks>net45;netstandard1.3</TargetFrameworks> <TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<!-- This is copied verbatim from Grpc.Core/Common.csproj.include. Other settings <!-- Needed for the net45 build to work on Unix. See https://github.com/dotnet/designs/pull/33 -->
in that file conflict with the intent of this build, as it cannot be signed, <ItemGroup>
and may not compile Grpc.Core/Version.cs, as that file references constants <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
in Grpc.Core.dll. </ItemGroup>
TODO(kkm): Refactor imports. -->
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' and '$(MSBuildRuntimeType)' == 'Core' ">
<!-- Use Mono reference assemblies in SDK build: https://github.com/dotnet/sdk/issues/335 -->
<FrameworkPathOverride Condition="Exists('/usr/lib/mono/4.5-api')">/usr/lib/mono/4.5-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="Exists('/usr/local/lib/mono/4.5-api')">/usr/local/lib/mono/4.5-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="Exists('/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5-api')">/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5-api</FrameworkPathOverride>
</PropertyGroup>
<PropertyGroup Label="Asset root folders. TODO(kkm): Change with package separation."> <PropertyGroup Label="Asset root folders. TODO(kkm): Change with package separation.">
<!-- TODO(kkm): Rework whole section when splitting packages. --> <!-- TODO(kkm): Rework whole section when splitting packages. -->

Write Preview
Loading…
Cancel
Save