Skip to content

Commit

Permalink
Update Grpc references (Azure#5802)
Browse files Browse the repository at this point in the history
  • Loading branch information
pragnagopa authored Mar 17, 2020
1 parent 48256b7 commit bfc22dd
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.7.0" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.7.0" />
<PackageReference Include="Grpc.Core" Version="1.20.1" />
<PackageReference Include="Grpc.Tools" Version="1.20.1">
<PackageReference Include="Google.Protobuf" Version="3.11.4" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.11.4" />
<PackageReference Include="Grpc.Core" Version="2.27.0" />
<PackageReference Include="Grpc.Tools" Version="2.27.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
Expand Down
4 changes: 2 additions & 2 deletions src/WebJobs.Script.Grpc/generate_protos.bat
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ setlocal
cd /d %~dp0

set NUGET_PATH="%UserProfile%\.nuget\packages"
set GRPC_TOOLS_PATH=%NUGET_PATH%\grpc.tools\1.20.1\tools\windows_x86
set GRPC_TOOLS_PATH=%NUGET_PATH%\grpc.tools\2.27.0\tools\windows_x86
set PROTO_PATH=.\azure-functions-language-worker-protobuf\src\proto
set PROTO=.\azure-functions-language-worker-protobuf\src\proto\FunctionRpc.proto
set PROTOBUF_TOOLS=%NUGET_PATH%\google.protobuf.tools\3.7.0\tools
set PROTOBUF_TOOLS=%NUGET_PATH%\google.protobuf.tools\3.11.4\tools
set MSGDIR=.\Messages

if exist %MSGDIR% rmdir /s /q %MSGDIR%
Expand Down
4 changes: 2 additions & 2 deletions src/WebJobs.Script.Grpc/generate_protos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ else
NUGET_PATH=$NUGET_ROOT/packages
fi

GRPC_TOOLS_PATH=$NUGET_PATH/grpc.tools/1.20.1/tools/$PLATFORM
GRPC_TOOLS_PATH=$NUGET_PATH/grpc.tools/2.27.0/tools/$PLATFORM
PROTO_PATH=./azure-functions-language-worker-protobuf/src/proto
PROTOBUF_TOOLS=$NUGET_PATH/google.protobuf.tools/3.7.0/tools
PROTOBUF_TOOLS=$NUGET_PATH/google.protobuf.tools/3.11.4/tools
PROTO=./azure-functions-language-worker-protobuf/src/proto/FunctionRpc.proto
MSGDIR=./Messages

Expand Down
4 changes: 2 additions & 2 deletions src/WebJobs.Script/WebJobs.Script.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.7.0" />
<PackageReference Include="Grpc.Core" Version="1.20.1" />
<PackageReference Include="Google.Protobuf" Version="3.11.4" />
<PackageReference Include="Grpc.Core" Version="2.27.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.2.0">
<NoWarn>NU1701</NoWarn>
</PackageReference>
Expand Down

0 comments on commit bfc22dd

Please sign in to comment.