Merge pull request grpc#31 from chwarr/msbuild_import_dir_trailing_slash

Fix import directories with trailing slashes
lalo · Feb 7, 2015 · 6ba51ef · 6ba51ef
2 parents 42bc0cb + c8a0fc4
commit 6ba51ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cs/build/Bond.CSharp.targets b/cs/build/Bond.CSharp.targets
@@ -68,7 +68,7 @@
     <PropertyGroup>
       <_BondExe Condition="'$(OS)' != 'Unix' Or Exists('$(BOND_COMPILER_PATH)\gbc.exe')">"$(BOND_COMPILER_PATH)\gbc.exe"</_BondExe>
       <_BondExe Condition="'$(OS)' == 'Unix' And !Exists('$(BOND_COMPILER_PATH)\gbc.exe')">gbc</_BondExe>
-      <_BondImportDirs>--import-dir="$(BOND_INCLUDE_PATH)" @(BondImportDirectory -> '--import-dir=&quot;%(Identity)&quot;',' ')</_BondImportDirs>
+      <_BondImportDirs>--import-dir="$(BOND_INCLUDE_PATH)" @(BondImportDirectory -> '--import-dir=&quot;%(Identity)\.&quot;',' ')</_BondImportDirs>
       <_BondCommand>$(_BondExe) $(BondCodegenMode) $(_BondImportDirs) --namespace=bond=Bond --output-dir="$(BondOutputDirectory)\."</_BondCommand>
     </PropertyGroup>
 

diff --git a/cs/test/core/Core.csproj b/cs/test/core/Core.csproj
@@ -35,7 +35,7 @@
     <BondOptions>--collection-interfaces</BondOptions>
   </PropertyGroup>
   <ItemGroup>
-    <BondImportDirectory Include="import dir with spaces" />
+    <BondImportDirectory Include="import dir with spaces\" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AttributesTests.cs" />