diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2017-04-04 16:49:06 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2017-04-07 09:02:45 +0200 |
| commit | 3c344d2f6955d3a3a7f784279bd66a67c6f02ce4 (patch) | |
| tree | c546aeee7daaaeddf2562774b48495974f0159b3 /src/csharp | |
| parent | 7727c7649c52756c8bffa79c6f019fedb80f8776 (diff) | |
adjust run_tests scripts
Diffstat (limited to 'src/csharp')
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/SanityTest.cs | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/NativeDeps.Windows.csproj.include | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/csharp/Grpc.Core.Tests/SanityTest.cs b/src/csharp/Grpc.Core.Tests/SanityTest.cs index 1c28277df5..e02f2c9e54 100644 --- a/src/csharp/Grpc.Core.Tests/SanityTest.cs +++ b/src/csharp/Grpc.Core.Tests/SanityTest.cs @@ -101,7 +101,7 @@ namespace Grpc.Core.Tests private string ReadTestsJson() { var assemblyDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); - var testsJsonFile = Path.Combine(assemblyDir, "..", "..", "..", "tests.json"); + var testsJsonFile = Path.Combine(assemblyDir, "..", "..", "..", "..", "tests.json"); return File.ReadAllText(testsJsonFile); } diff --git a/src/csharp/Grpc.Core/NativeDeps.Windows.csproj.include b/src/csharp/Grpc.Core/NativeDeps.Windows.csproj.include index 85e1b77bd0..04f3b077ac 100644 --- a/src/csharp/Grpc.Core/NativeDeps.Windows.csproj.include +++ b/src/csharp/Grpc.Core/NativeDeps.Windows.csproj.include @@ -1,8 +1,8 @@ <Project> <ItemGroup> - <Content Include="..\..\..\cmake\build\Win32\$(NativeDependenciesConfiguration)\grpc_csharp_ext.dll"> + <Content Include="..\..\..\cmake\build\x64\$(NativeDependenciesConfiguration)\grpc_csharp_ext.dll"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - <Link>grpc_csharp_ext.x86.dll</Link> + <Link>grpc_csharp_ext.x64.dll</Link> <Pack>false</Pack> </Content> </ItemGroup> |