Skip to content

Commit 41ea791

Browse files
authored
Rename proto file under proper folder structure (#2745)
* adding proto file under proper folder structure * update proto directory name
1 parent 9bf36ff commit 41ea791

File tree

9 files changed

+6
-6
lines changed

9 files changed

+6
-6
lines changed

src/WebJobs.Script.Grpc/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Messages
22
node_modules
3-
Proto
3+
azure-functions-language-worker-protobuf

src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Folder Include="Messages\DotNet\" />
3131
</ItemGroup>
3232

33-
<Target Name="GenerateProtoFiles" BeforeTargets="BeforeBuild" Inputs="Proto/src/proto/FunctionRpc.proto" Outputs="Messages/DotNet/FunctionRpc.cs;Messages/DotNet/FunctionRpcGrpc.cs">
33+
<Target Name="GenerateProtoFiles" BeforeTargets="BeforeBuild" Inputs="azure-functions-language-worker-protobuf/src/proto/FunctionRpc.proto" Outputs="Messages/DotNet/FunctionRpc.cs;Messages/DotNet/FunctionRpcGrpc.cs">
3434
<Exec Command="./generate_protos.$(Ext)" />
3535
<ItemGroup>
3636
<Compile Include="**/*$(DefaultLanguageSourceExtension)" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(BaseIntermediateOutputPath)**;$(BaseOutputPath)**;@(Compile)" />
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/WebJobs.Script.Grpc/generate_protos.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ setlocal
3535
cd /d %~dp0
3636

3737
set NUGET_PATH=%UserProfile%\.nuget\packages\grpc.tools\1.4.1\tools\windows_x86
38-
set PROTO=.\Proto\src\proto\FunctionRpc.proto
38+
set PROTO=.\azure-functions-language-worker-protobuf\src\proto\FunctionRpc.proto
3939
set MSGDIR=.\Messages
4040

4141
if exist %MSGDIR% rmdir /s /q %MSGDIR%
4242
mkdir %MSGDIR%
4343

4444
set OUTDIR=%MSGDIR%\DotNet
4545
mkdir %OUTDIR%
46-
%NUGET_PATH%\protoc.exe %PROTO% --csharp_out %OUTDIR% --grpc_out=%OUTDIR% --plugin=protoc-gen-grpc=%NUGET_PATH%\grpc_csharp_plugin.exe --proto_path=.\Proto\src\proto
46+
%NUGET_PATH%\protoc.exe %PROTO% --csharp_out %OUTDIR% --grpc_out=%OUTDIR% --plugin=protoc-gen-grpc=%NUGET_PATH%\grpc_csharp_plugin.exe --proto_path=.\azure-functions-language-worker-protobuf\src\proto
4747

4848
@rem add pragma warning disable labels to generated files
4949

src/WebJobs.Script.Grpc/generate_protos.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if [ -z "$NUGET_ROOT" ]; then
4848
else
4949
NUGET_PATH=$NUGET_ROOT/packages/grpc.tools/1.4.1/tools/$PLATFORM
5050
fi
51-
PROTO=./Proto/src/proto/FunctionRpc.proto
51+
PROTO=./azure-functions-language-worker-protobuf/src/proto/FunctionRpc.proto
5252
MSGDIR=./Messages
5353

5454
if [ ! -d "$NUGET_PATH" ]; then
@@ -61,7 +61,7 @@ mkdir $MSGDIR
6161

6262
OUTDIR=$MSGDIR/DotNet
6363
mkdir $OUTDIR
64-
$NUGET_PATH/protoc $PROTO --csharp_out $OUTDIR --grpc_out=$OUTDIR --plugin=protoc-gen-grpc=$NUGET_PATH/grpc_csharp_plugin --proto_path=./Proto/src/proto
64+
$NUGET_PATH/protoc $PROTO --csharp_out $OUTDIR --grpc_out=$OUTDIR --plugin=protoc-gen-grpc=$NUGET_PATH/grpc_csharp_plugin --proto_path=./azure-functions-language-worker-protobuf/src/proto
6565

6666
# add #pragma warning disable labels
6767

0 commit comments

Comments
 (0)