From 7bf5092df0da31a4a3015f23408cb825941b6d06 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sat, 9 May 2015 03:17:21 +0200 Subject: [PATCH] Adding grpc++_unsecure project file, and adding better support for test projects. --- build.json | 3 +- .../vsprojects/generate_debug_projects.sh | 6 + .../gpr/gpr.vcxproj.filters.template | 2 +- templates/vsprojects/gpr/gpr.vcxproj.template | 2 +- .../gpr_test_util.vcxproj.template | 2 +- .../grpc++/grpc++.vcxproj.filters.template | 2 +- .../vsprojects/grpc++/grpc++.vcxproj.template | 2 +- .../grpc++.vcxproj.filters.template | 2 + .../grpc++_unsecure/grpc++.vcxproj.template | 2 + .../grpc/grpc.vcxproj.filters.template | 2 +- .../vsprojects/grpc/grpc.vcxproj.template | 2 +- .../grpc_csharp_ext.vcxproj.template | 2 +- .../grpc_test_util.vcxproj.template | 2 +- .../grpc_unsecure.vcxproj.filters.template | 2 +- .../grpc_unsecure.vcxproj.template | 2 +- .../vsprojects/vcxproj.filters_defs.include | 2 +- templates/vsprojects/vcxproj_defs.include | 40 ++- tools/buildgen/plugins/generate_vsprojects.py | 12 + vsprojects/dummy.c | 0 vsprojects/global.props | 2 +- vsprojects/grpc++_unsecure/grpc++.vcxproj | 250 ++++++++++++++++++ .../grpc++_unsecure/grpc++.vcxproj.filters | 226 ++++++++++++++++ vsprojects/grpc.sln | 14 + .../grpc_csharp_ext/grpc_csharp_ext.vcxproj | 8 +- vsprojects/openssl.props | 2 +- vsprojects/protobuf.props | 13 + vsprojects/zlib.props | 2 +- 27 files changed, 573 insertions(+), 33 deletions(-) create mode 100755 templates/vsprojects/generate_debug_projects.sh create mode 100644 templates/vsprojects/grpc++_unsecure/grpc++.vcxproj.filters.template create mode 100644 templates/vsprojects/grpc++_unsecure/grpc++.vcxproj.template create mode 100644 vsprojects/dummy.c create mode 100644 vsprojects/grpc++_unsecure/grpc++.vcxproj create mode 100644 vsprojects/grpc++_unsecure/grpc++.vcxproj.filters create mode 100644 vsprojects/protobuf.props diff --git a/build.json b/build.json index cc2dfe8cb9d..3d6522216bf 100644 --- a/build.json +++ b/build.json @@ -553,7 +553,8 @@ "filegroups": [ "grpc++_base" ], - "secure": "no" + "secure": "no", + "vs_project_guid": "{6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}" }, { "name": "grpc_plugin_support", diff --git a/templates/vsprojects/generate_debug_projects.sh b/templates/vsprojects/generate_debug_projects.sh new file mode 100755 index 00000000000..d432a231e3d --- /dev/null +++ b/templates/vsprojects/generate_debug_projects.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +cd `dirname $0`/../.. + +git diff | grep \\+Project | cut -d\" -f 4 | sort -u | grep _test$ | while read p ; do mkdir -p templates/vsprojects/$p ; echo '<%namespace file="../vcxproj_defs.include" import="gen_project"/>${gen_project("'$p'", targets)}' > templates/vsprojects/$p/$p.vcxproj.template ; done +git diff | grep \\+Project | cut -d\" -f 4 | sort -u | grep -v _test$ | while read p ; do mkdir -p templates/vsprojects/$p ; echo '<%namespace file="../vcxproj_defs.include" import="gen_project"/>${gen_project("'$p'", libs)}' > templates/vsprojects/$p/$p.vcxproj.template ; done diff --git a/templates/vsprojects/gpr/gpr.vcxproj.filters.template b/templates/vsprojects/gpr/gpr.vcxproj.filters.template index 1aeb3b1dd07..779a36bf0f8 100644 --- a/templates/vsprojects/gpr/gpr.vcxproj.filters.template +++ b/templates/vsprojects/gpr/gpr.vcxproj.filters.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\ -${gen_filters('gpr', libs, targets)} +${gen_filters('gpr', libs)} diff --git a/templates/vsprojects/gpr/gpr.vcxproj.template b/templates/vsprojects/gpr/gpr.vcxproj.template index b94266c7767..ca217c27624 100644 --- a/templates/vsprojects/gpr/gpr.vcxproj.template +++ b/templates/vsprojects/gpr/gpr.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj_defs.include" import="gen_project"/>\ -${gen_project('gpr', libs, targets)} +${gen_project('gpr', libs)} diff --git a/templates/vsprojects/gpr_test_util/gpr_test_util.vcxproj.template b/templates/vsprojects/gpr_test_util/gpr_test_util.vcxproj.template index 42f4a248b8c..d412d646e7a 100644 --- a/templates/vsprojects/gpr_test_util/gpr_test_util.vcxproj.template +++ b/templates/vsprojects/gpr_test_util/gpr_test_util.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj_defs.include" import="gen_project"/>\ -${gen_project('gpr_test_util', libs, targets)} \ No newline at end of file +${gen_project('gpr_test_util', libs)} \ No newline at end of file diff --git a/templates/vsprojects/grpc++/grpc++.vcxproj.filters.template b/templates/vsprojects/grpc++/grpc++.vcxproj.filters.template index 818eb87c757..70e0a6c13b2 100644 --- a/templates/vsprojects/grpc++/grpc++.vcxproj.filters.template +++ b/templates/vsprojects/grpc++/grpc++.vcxproj.filters.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\ -${gen_filters('grpc++', libs, targets)} +${gen_filters('grpc++', libs)} diff --git a/templates/vsprojects/grpc++/grpc++.vcxproj.template b/templates/vsprojects/grpc++/grpc++.vcxproj.template index fb84a1a801b..5f13591b2df 100644 --- a/templates/vsprojects/grpc++/grpc++.vcxproj.template +++ b/templates/vsprojects/grpc++/grpc++.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj_defs.include" import="gen_project"/>\ -${gen_project('grpc++', libs, targets)} \ No newline at end of file +${gen_project('grpc++', libs)} \ No newline at end of file diff --git a/templates/vsprojects/grpc++_unsecure/grpc++.vcxproj.filters.template b/templates/vsprojects/grpc++_unsecure/grpc++.vcxproj.filters.template new file mode 100644 index 00000000000..465a3d76f58 --- /dev/null +++ b/templates/vsprojects/grpc++_unsecure/grpc++.vcxproj.filters.template @@ -0,0 +1,2 @@ +<%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\ +${gen_filters('grpc++_unsecure', libs)} diff --git a/templates/vsprojects/grpc++_unsecure/grpc++.vcxproj.template b/templates/vsprojects/grpc++_unsecure/grpc++.vcxproj.template new file mode 100644 index 00000000000..62016ccc0ad --- /dev/null +++ b/templates/vsprojects/grpc++_unsecure/grpc++.vcxproj.template @@ -0,0 +1,2 @@ +<%namespace file="../vcxproj_defs.include" import="gen_project"/>\ +${gen_project('grpc++_unsecure', libs)} \ No newline at end of file diff --git a/templates/vsprojects/grpc/grpc.vcxproj.filters.template b/templates/vsprojects/grpc/grpc.vcxproj.filters.template index a9575e935a4..9607d233249 100644 --- a/templates/vsprojects/grpc/grpc.vcxproj.filters.template +++ b/templates/vsprojects/grpc/grpc.vcxproj.filters.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\ -${gen_filters('grpc', libs, targets)} +${gen_filters('grpc', libs)} diff --git a/templates/vsprojects/grpc/grpc.vcxproj.template b/templates/vsprojects/grpc/grpc.vcxproj.template index 35ac30380ed..a19214e0a48 100644 --- a/templates/vsprojects/grpc/grpc.vcxproj.template +++ b/templates/vsprojects/grpc/grpc.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj_defs.include" import="gen_project"/>\ -${gen_project('grpc', libs, targets, packages=['openssl','zlib'])} \ No newline at end of file +${gen_project('grpc', libs, packages=['openssl','zlib'])} \ No newline at end of file diff --git a/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template b/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template index c1f23011b23..8a5f1ca5b7b 100644 --- a/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template +++ b/templates/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj_defs.include" import="gen_project"/>\ -${gen_project('grpc_csharp_ext', libs, targets, configuration_type = 'DynamicLibrary', additional_props = ['winsock'], packages=['openssl','zlib'])} +${gen_project('grpc_csharp_ext', libs, configuration_type = 'DynamicLibrary', props = ['winsock'], packages=['openssl','zlib'])} diff --git a/templates/vsprojects/grpc_test_util/grpc_test_util.vcxproj.template b/templates/vsprojects/grpc_test_util/grpc_test_util.vcxproj.template index 4dd335505a8..3781023837a 100644 --- a/templates/vsprojects/grpc_test_util/grpc_test_util.vcxproj.template +++ b/templates/vsprojects/grpc_test_util/grpc_test_util.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj_defs.include" import="gen_project"/>\ -${gen_project('grpc_test_util', libs, targets)} \ No newline at end of file +${gen_project('grpc_test_util', libs)} \ No newline at end of file diff --git a/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters.template b/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters.template index a0c26df73b8..aef6465915d 100644 --- a/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters.template +++ b/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.filters.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj.filters_defs.include" import="gen_filters"/>\ -${gen_filters('grpc_unsecure', libs, targets)} +${gen_filters('grpc_unsecure', libs)} diff --git a/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.template b/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.template index 93b343eb454..fd827d191af 100644 --- a/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.template +++ b/templates/vsprojects/grpc_unsecure/grpc_unsecure.vcxproj.template @@ -1,2 +1,2 @@ <%namespace file="../vcxproj_defs.include" import="gen_project"/>\ -${gen_project('grpc_unsecure', libs, targets, packages=['zlib'])} \ No newline at end of file +${gen_project('grpc_unsecure', libs, packages=['zlib'])} \ No newline at end of file diff --git a/templates/vsprojects/vcxproj.filters_defs.include b/templates/vsprojects/vcxproj.filters_defs.include index 646b17e9fe4..787d66eeff3 100644 --- a/templates/vsprojects/vcxproj.filters_defs.include +++ b/templates/vsprojects/vcxproj.filters_defs.include @@ -9,7 +9,7 @@ <%def name="to_windows_path(path)">${path.replace('/','\\')}\ <%def name="to_filter(path)">${calc_to_filter(path)}\ <%def name="filter_to_guid(proj, filter)">${re.sub('(........)(....)(....)(....)', r'\1-\2-\3-\4-', hashlib.md5(''.join([filter, proj])).hexdigest())}\ -<%def name="gen_filters(name, libs, targets)">\ +<%def name="gen_filters(name, collection)">\ % for project in vsprojects: % if project.name == name: diff --git a/templates/vsprojects/vcxproj_defs.include b/templates/vsprojects/vcxproj_defs.include index af215d6a2a0..628074c75fa 100644 --- a/templates/vsprojects/vcxproj_defs.include +++ b/templates/vsprojects/vcxproj_defs.include @@ -2,9 +2,24 @@ <%def name="get_repo_root()">..\..\ <%def name="to_windows_path(path)">${path.replace('/','\\')}\ <%def name="get_subsystem(is_library)">${'Windows' if is_library else 'Console'}\ -<%def name="gen_project(name, libs, targets, configuration_type = 'StaticLibrary', project_guid = None, additional_props = [], packages = [])">\ -% for project in vsprojects: - % if project.name == name: +<%def name="gen_project(name, collection, configuration_type = None, project_guid = None, props = [], packages = [])">\ +<% + for p in vsprojects: + if p.name == name: + project = p + for t in collection: + if t.name == name: + target = t + if not configuration_type: + configuration_type = 'StaticLibrary' + if not project_guid: + project_guid = project.vs_project_guid + if configuration_type == 'Application': + props.extend(['winsock', 'protobuf', 'zlib', 'openssl']) + if target.language == 'c++': + props.extend(['protobuf']) + props.extend(['global']) +%>\ ${gen_package_props(packages)}\ @@ -66,29 +81,25 @@ ${gen_package_props(packages)}\ - - % for prop in additional_props: + % for prop in props: % endfor - - % for prop in additional_props: + % for prop in props: % endfor - - % for prop in additional_props: + % for prop in props: % endfor - - % for prop in additional_props: + % for prop in props: % endfor @@ -186,6 +197,11 @@ ${gen_package_props(packages)}\ % endfor + % elif configuration_type != 'StaticLibrary': + + + + % endif % if project.get('deps',[]): @@ -207,6 +223,4 @@ ${gen_package_targets(packages)}\ ${gen_package_ensure(packages)}\ - % endif -% endfor \ \ No newline at end of file diff --git a/tools/buildgen/plugins/generate_vsprojects.py b/tools/buildgen/plugins/generate_vsprojects.py index f00c1762149..09a5bdbcc86 100755 --- a/tools/buildgen/plugins/generate_vsprojects.py +++ b/tools/buildgen/plugins/generate_vsprojects.py @@ -35,6 +35,10 @@ and "vsproject_dict", to be used by the visual studio generators. """ +import hashlib +import re + + def mako_plugin(dictionary): """The exported plugin code for generate_vsprojeccts @@ -53,6 +57,14 @@ def mako_plugin(dictionary): projects = [] projects.extend(libs) projects.extend(targets) + if dictionary.get('debug', False): + for target in projects: + if not target.get('vs_project_guid', None) and 'windows' in target.get('platforms', ['windows']): + name = target['name'] + guid = re.sub('(........)(....)(....)(....)(.*)', + r'{\1-\2-\3-\4-\5}', + hashlib.md5(name).hexdigest()) + target['vs_project_guid'] = guid.upper() # Exclude projects without a visual project guid, such as the tests. projects = [project for project in projects if project.get('vs_project_guid', None)] diff --git a/vsprojects/dummy.c b/vsprojects/dummy.c new file mode 100644 index 00000000000..e69de29bb2d diff --git a/vsprojects/global.props b/vsprojects/global.props index d51831e2ed3..14acf4668b3 100644 --- a/vsprojects/global.props +++ b/vsprojects/global.props @@ -5,7 +5,7 @@ - $(ProjectDir)\..\..;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\third_party\protobuf\src + $(ProjectDir)\..\..;$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\third_party\protobuf\src;$(AdditionalIncludeDirectories) _CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;%(PreprocessorDefinitions) EnableAllWarnings diff --git a/vsprojects/grpc++_unsecure/grpc++.vcxproj b/vsprojects/grpc++_unsecure/grpc++.vcxproj new file mode 100644 index 00000000000..026bbea51d6 --- /dev/null +++ b/vsprojects/grpc++_unsecure/grpc++.vcxproj @@ -0,0 +1,250 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {6EE56155-DF7C-4F6E-BFC4-F6F776BEB211} + + + + v100 + + + v110 + + + v120 + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + false + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + grpc++_unsecure + + + grpc++_unsecure + + + grpc++_unsecure + + + grpc++_unsecure + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;_USE_32BIT_TIME_T;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + Level3 + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} + + + {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5} + + + + + + diff --git a/vsprojects/grpc++_unsecure/grpc++.vcxproj.filters b/vsprojects/grpc++_unsecure/grpc++.vcxproj.filters new file mode 100644 index 00000000000..7221027afd3 --- /dev/null +++ b/vsprojects/grpc++_unsecure/grpc++.vcxproj.filters @@ -0,0 +1,226 @@ + + + + + src\cpp\client + + + src\cpp\client + + + src\cpp\client + + + src\cpp\client + + + src\cpp\client + + + src\cpp\client + + + src\cpp\client + + + src\cpp\client + + + src\cpp\client + + + src\cpp\common + + + src\cpp\common + + + src\cpp\common + + + src\cpp\proto + + + src\cpp\server + + + src\cpp\server + + + src\cpp\server + + + src\cpp\server + + + src\cpp\server + + + src\cpp\server + + + src\cpp\server + + + src\cpp\util + + + src\cpp\util + + + src\cpp\util + + + src\cpp\util + + + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++\impl + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + include\grpc++ + + + + + src\cpp\client + + + src\cpp\proto + + + src\cpp\server + + + + + + {5c4eb19f-d511-e8fd-e1d6-c377cdc7d3b1} + + + {eceb50c0-bb49-3812-b6bd-b0af6df81da7} + + + {dadc0002-f2ac-451b-a9b8-33b8de10b5fc} + + + {cce6a85d-1111-3834-6825-31e170d93cff} + + + {1e5fd68c-bd87-e803-42b0-75a7fa19b91d} + + + {ff72923a-6499-8d2a-e0fb-6d574b85d77e} + + + {ed8e4daa-825f-fbe5-2a45-846ad9165d3d} + + + {10b51a99-2e57-249e-ce23-3ab8c6b99ffb} + + + {8a54a279-d14b-4237-0df3-1ffe1ef5a7af} + + + {fb5d9a64-20ca-5119-ed38-04a3cf94923d} + + + + diff --git a/vsprojects/grpc.sln b/vsprojects/grpc.sln index b978eb3e514..f931311dc8f 100644 --- a/vsprojects/grpc.sln +++ b/vsprojects/grpc.sln @@ -40,6 +40,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc++", "grpc++\grpc++.vcx {29D16885-7228-4C31-81ED-5F9187C7F2A9} = {29D16885-7228-4C31-81ED-5F9187C7F2A9} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc++_unsecure", "grpc++_unsecure\grpc++_unsecure.vcxproj", "{6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}" + ProjectSection(ProjectDependencies) = postProject + {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} + {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5} = {46CEDFFF-9692-456A-AA24-38B5D6BCF4C5} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grpc_csharp_ext", "grpc_csharp_ext\grpc_csharp_ext.vcxproj", "{D64C6D63-4458-4A88-AB38-35678384A7E4}" ProjectSection(ProjectDependencies) = postProject {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} @@ -110,6 +116,14 @@ Global {C187A093-A0FE-489D-A40A-6E33DE0F9FEB}.Release|Win32.Build.0 = Release|Win32 {C187A093-A0FE-489D-A40A-6E33DE0F9FEB}.Release|x64.ActiveCfg = Release|x64 {C187A093-A0FE-489D-A40A-6E33DE0F9FEB}.Release|x64.Build.0 = Release|x64 + {6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}.Debug|Win32.ActiveCfg = Debug|Win32 + {6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}.Debug|Win32.Build.0 = Debug|Win32 + {6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}.Debug|x64.ActiveCfg = Debug|x64 + {6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}.Debug|x64.Build.0 = Debug|x64 + {6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}.Release|Win32.ActiveCfg = Release|Win32 + {6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}.Release|Win32.Build.0 = Release|Win32 + {6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}.Release|x64.ActiveCfg = Release|x64 + {6EE56155-DF7C-4F6E-BFC4-F6F776BEB211}.Release|x64.Build.0 = Release|x64 {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|Win32.ActiveCfg = Debug|Win32 {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|Win32.Build.0 = Debug|Win32 {D64C6D63-4458-4A88-AB38-35678384A7E4}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj b/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj index 0ed2ebb3a7f..41706e92097 100644 --- a/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj +++ b/vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj @@ -59,23 +59,23 @@ - + - + - + - + diff --git a/vsprojects/openssl.props b/vsprojects/openssl.props index 94e3ff98fff..b4c94f2c962 100644 --- a/vsprojects/openssl.props +++ b/vsprojects/openssl.props @@ -6,7 +6,7 @@ ssleay32.lib;libeay32.lib;%(AdditionalDependencies) - $(MSBuildProjectDirectory)\..\packages\grpc.dependencies.openssl.1.0.2.2\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories) + $(ProjectDir)\..\packages\grpc.dependencies.openssl.1.0.2.2\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static;%(AdditionalLibraryDirectories) diff --git a/vsprojects/protobuf.props b/vsprojects/protobuf.props new file mode 100644 index 00000000000..d2685f7762b --- /dev/null +++ b/vsprojects/protobuf.props @@ -0,0 +1,13 @@ + + + + + + + + libprotobuf.lib;%(AdditionalDependencies) + $(ProjectDir)\..\..\third_party\protobuf\vsprojects\$(Configuration);%(AdditionalLibraryDirectories) + + + + \ No newline at end of file diff --git a/vsprojects/zlib.props b/vsprojects/zlib.props index ac881a59048..bf914c57ece 100644 --- a/vsprojects/zlib.props +++ b/vsprojects/zlib.props @@ -6,7 +6,7 @@ zlib.lib;%(AdditionalDependencies) - $(MSBuildProjectDirectory)\..\packages\grpc.dependencies.zlib.1.2.8.9\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static\cdecl;%(AdditionalLibraryDirectories) + $(ProjectDir)\..\packages\grpc.dependencies.zlib.1.2.8.9\build\native\lib\$(PlatformToolset)\$(Platform)\$(Configuration)\static\cdecl;%(AdditionalLibraryDirectories)