diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/csharp/Grpc.Api.Tests/.gitignore (renamed from src/csharp/GrpcApi/.gitignore) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api.Tests/Grpc.Api.Tests.csproj (renamed from src/csharp/GrpcApiTests/GrpcApiTests.csproj) | 23 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api.Tests/MathClientServerTests.cs (renamed from src/csharp/GrpcApiTests/MathClientServerTests.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api.Tests/Properties/AssemblyInfo.cs (renamed from src/csharp/InteropClient/Properties/AssemblyInfo.cs) | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api.Tests/packages.config (renamed from src/csharp/GrpcApiTests/packages.config) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/.gitignore (renamed from src/csharp/GrpcApiTests/.gitignore) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/Empty.cs (renamed from src/csharp/GrpcApi/Empty.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/Grpc.Api.csproj (renamed from src/csharp/GrpcApi/GrpcApi.csproj) | 15 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/Math.cs (renamed from src/csharp/GrpcApi/Math.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/MathExamples.cs (renamed from src/csharp/GrpcApi/MathExamples.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/MathGrpc.cs (renamed from src/csharp/GrpcApi/MathGrpc.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/MathServiceImpl.cs (renamed from src/csharp/GrpcApi/MathServiceImpl.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/Messages.cs (renamed from src/csharp/GrpcApi/Messages.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/Properties/AssemblyInfo.cs (renamed from src/csharp/GrpcApi/Properties/AssemblyInfo.cs) | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/TestServiceGrpc.cs (renamed from src/csharp/GrpcApi/TestServiceGrpc.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/packages.config (renamed from src/csharp/GrpcApi/packages.config) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/proto/empty.proto (renamed from src/csharp/GrpcApi/proto/empty.proto) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/proto/math.proto (renamed from src/csharp/GrpcApi/proto/math.proto) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/proto/messages.proto (renamed from src/csharp/GrpcApi/proto/messages.proto) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Api/proto/test.proto (renamed from src/csharp/GrpcApi/proto/test.proto) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/.gitignore (renamed from src/csharp/GrpcCoreTests/.gitignore) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/ClientServerTest.cs (renamed from src/csharp/GrpcCoreTests/ClientServerTest.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj (renamed from src/csharp/GrpcCoreTests/GrpcCoreTests.csproj) | 8 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs (renamed from src/csharp/GrpcCoreTests/GrpcEnvironmentTest.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/Properties/AssemblyInfo.cs (renamed from src/csharp/GrpcCoreTests/Properties/AssemblyInfo.cs) | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/ServerTest.cs (renamed from src/csharp/GrpcCoreTests/ServerTest.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/TestResult.xml (renamed from src/csharp/GrpcCoreTests/TestResult.xml) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/TimespecTest.cs (renamed from src/csharp/GrpcCoreTests/TimespecTest.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core.Tests/packages.config (renamed from src/csharp/GrpcCoreTests/packages.config) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/.gitignore (renamed from src/csharp/GrpcCore/.gitignore) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Call.cs (renamed from src/csharp/GrpcCore/Call.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Calls.cs (renamed from src/csharp/GrpcCore/Calls.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Channel.cs (renamed from src/csharp/GrpcCore/Channel.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/ClientStreamingAsyncResult.cs (renamed from src/csharp/GrpcCore/ClientStreamingAsyncResult.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Grpc.Core.csproj (renamed from src/csharp/GrpcCore/GrpcCore.csproj) | 4 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/GrpcEnvironment.cs (renamed from src/csharp/GrpcCore/GrpcEnvironment.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/AsyncCall.cs (renamed from src/csharp/GrpcCore/Internal/AsyncCall.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/BatchContextSafeHandleNotOwned.cs (renamed from src/csharp/GrpcCore/Internal/BatchContextSafeHandleNotOwned.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/CallSafeHandle.cs (renamed from src/csharp/GrpcCore/Internal/CallSafeHandle.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/ChannelSafeHandle.cs (renamed from src/csharp/GrpcCore/Internal/ChannelSafeHandle.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/ClientStreamingInputObserver.cs (renamed from src/csharp/GrpcCore/Internal/ClientStreamingInputObserver.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/CompletionQueueSafeHandle.cs (renamed from src/csharp/GrpcCore/Internal/CompletionQueueSafeHandle.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/Enums.cs (renamed from src/csharp/GrpcCore/Internal/Enums.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs (renamed from src/csharp/GrpcCore/Internal/GrpcThreadPool.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/SafeHandleZeroIsInvalid.cs (renamed from src/csharp/GrpcCore/Internal/SafeHandleZeroIsInvalid.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/ServerSafeHandle.cs (renamed from src/csharp/GrpcCore/Internal/ServerSafeHandle.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/ServerStreamingOutputObserver.cs (renamed from src/csharp/GrpcCore/Internal/ServerStreamingOutputObserver.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Internal/Timespec.cs (renamed from src/csharp/GrpcCore/Internal/Timespec.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Marshaller.cs (renamed from src/csharp/GrpcCore/Marshaller.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Method.cs (renamed from src/csharp/GrpcCore/Method.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Properties/AssemblyInfo.cs (renamed from src/csharp/GrpcCore/Properties/AssemblyInfo.cs) | 4 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/RpcException.cs (renamed from src/csharp/GrpcCore/RpcException.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Server.cs (renamed from src/csharp/GrpcCore/Server.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/ServerCallHandler.cs (renamed from src/csharp/GrpcCore/ServerCallHandler.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/ServerCalls.cs (renamed from src/csharp/GrpcCore/ServerCalls.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/ServerServiceDefinition.cs (renamed from src/csharp/GrpcCore/ServerServiceDefinition.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Status.cs (renamed from src/csharp/GrpcCore/Status.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/StatusCode.cs (renamed from src/csharp/GrpcCore/StatusCode.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Utils/RecordingObserver.cs (renamed from src/csharp/GrpcCore/Utils/RecordingObserver.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.Core/Utils/RecordingQueue.cs (renamed from src/csharp/GrpcCore/Utils/RecordingQueue.cs) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/.gitignore (renamed from src/csharp/InteropClient/.gitignore) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/Client.cs (renamed from src/csharp/InteropClient/Client.cs) | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj (renamed from src/csharp/InteropClient/InteropClient.csproj) | 16 | ||||
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/Properties/AssemblyInfo.cs (renamed from src/csharp/GrpcApiTests/Properties/AssemblyInfo.cs) | 2 | ||||
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/packages.config (renamed from src/csharp/InteropClient/packages.config) | 0 | ||||
| -rw-r--r-- | src/csharp/Grpc.sln | 12 | ||||
| -rw-r--r-- | src/csharp/MathClient/MathClient.csproj | 16 |
67 files changed, 53 insertions, 55 deletions
diff --git a/src/csharp/GrpcApi/.gitignore b/src/csharp/Grpc.Api.Tests/.gitignore index 4795a95b94..4795a95b94 100644 --- a/src/csharp/GrpcApi/.gitignore +++ b/src/csharp/Grpc.Api.Tests/.gitignore diff --git a/src/csharp/GrpcApiTests/GrpcApiTests.csproj b/src/csharp/Grpc.Api.Tests/Grpc.Api.Tests.csproj index cb955cff41..93c3b688fa 100644 --- a/src/csharp/GrpcApiTests/GrpcApiTests.csproj +++ b/src/csharp/Grpc.Api.Tests/Grpc.Api.Tests.csproj @@ -7,8 +7,8 @@ <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{143B1C29-C442-4BE0-BF3F-A8F92288AC9F}</ProjectGuid> <OutputType>Library</OutputType> - <RootNamespace>GrpcApiTests</RootNamespace> - <AssemblyName>GrpcApiTests</AssemblyName> + <RootNamespace>Grpc.Api.Tests</RootNamespace> + <AssemblyName>Grpc.Api.Tests</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -30,14 +30,13 @@ <ConsolePause>false</ConsolePause> </PropertyGroup> <ItemGroup> - <Reference Include="Google.ProtocolBuffers, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath> - </Reference> <Reference Include="nunit.framework"> <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath> </Reference> <Reference Include="System" /> + <Reference Include="Google.ProtocolBuffers"> + <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> @@ -45,13 +44,13 @@ </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> - <ProjectReference Include="..\GrpcApi\GrpcApi.csproj"> - <Project>{7DC1433E-3225-42C7-B7EA-546D56E27A4B}</Project> - <Name>GrpcApi</Name> - </ProjectReference> - <ProjectReference Include="..\GrpcCore\GrpcCore.csproj"> + <ProjectReference Include="..\Grpc.Core\Grpc.Core.csproj"> <Project>{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}</Project> - <Name>GrpcCore</Name> + <Name>Grpc.Core</Name> + </ProjectReference> + <ProjectReference Include="..\Grpc.Api\Grpc.Api.csproj"> + <Project>{7DC1433E-3225-42C7-B7EA-546D56E27A4B}</Project> + <Name>Grpc.Api</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/src/csharp/GrpcApiTests/MathClientServerTests.cs b/src/csharp/Grpc.Api.Tests/MathClientServerTests.cs index 767340d6f2..767340d6f2 100644 --- a/src/csharp/GrpcApiTests/MathClientServerTests.cs +++ b/src/csharp/Grpc.Api.Tests/MathClientServerTests.cs diff --git a/src/csharp/InteropClient/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Api.Tests/Properties/AssemblyInfo.cs index c7184d7c0b..35ac86d8df 100644 --- a/src/csharp/InteropClient/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Api.Tests/Properties/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle("InteropClient")] +[assembly: AssemblyTitle("Grpc.Api.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] diff --git a/src/csharp/GrpcApiTests/packages.config b/src/csharp/Grpc.Api.Tests/packages.config index 51c17bcd5e..51c17bcd5e 100644 --- a/src/csharp/GrpcApiTests/packages.config +++ b/src/csharp/Grpc.Api.Tests/packages.config diff --git a/src/csharp/GrpcApiTests/.gitignore b/src/csharp/Grpc.Api/.gitignore index 4795a95b94..4795a95b94 100644 --- a/src/csharp/GrpcApiTests/.gitignore +++ b/src/csharp/Grpc.Api/.gitignore diff --git a/src/csharp/GrpcApi/Empty.cs b/src/csharp/Grpc.Api/Empty.cs index 7169ee2a4a..7169ee2a4a 100644 --- a/src/csharp/GrpcApi/Empty.cs +++ b/src/csharp/Grpc.Api/Empty.cs diff --git a/src/csharp/GrpcApi/GrpcApi.csproj b/src/csharp/Grpc.Api/Grpc.Api.csproj index 5a4ae67bd5..aa6e872fe4 100644 --- a/src/csharp/GrpcApi/GrpcApi.csproj +++ b/src/csharp/Grpc.Api/Grpc.Api.csproj @@ -7,8 +7,8 @@ <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{7DC1433E-3225-42C7-B7EA-546D56E27A4B}</ProjectGuid> <OutputType>Library</OutputType> - <RootNamespace>GrpcApi</RootNamespace> - <AssemblyName>GrpcApi</AssemblyName> + <RootNamespace>Grpc.Api</RootNamespace> + <AssemblyName>Grpc.Api</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -30,10 +30,6 @@ <ConsolePause>false</ConsolePause> </PropertyGroup> <ItemGroup> - <Reference Include="Google.ProtocolBuffers, Version=2.4.1.521, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL"> - <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath> - </Reference> <Reference Include="System" /> <Reference Include="System.Reactive.Core"> <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath> @@ -48,6 +44,9 @@ <Reference Include="System.Reactive.PlatformServices"> <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath> </Reference> + <Reference Include="Google.ProtocolBuffers"> + <HintPath>..\packages\Google.ProtocolBuffers.2.4.1.521\lib\net40\Google.ProtocolBuffers.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Properties\AssemblyInfo.cs" /> @@ -61,9 +60,9 @@ </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> - <ProjectReference Include="..\GrpcCore\GrpcCore.csproj"> + <ProjectReference Include="..\Grpc.Core\Grpc.Core.csproj"> <Project>{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}</Project> - <Name>GrpcCore</Name> + <Name>Grpc.Core</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/src/csharp/GrpcApi/Math.cs b/src/csharp/Grpc.Api/Math.cs index 75b1e9dbc2..75b1e9dbc2 100644 --- a/src/csharp/GrpcApi/Math.cs +++ b/src/csharp/Grpc.Api/Math.cs diff --git a/src/csharp/GrpcApi/MathExamples.cs b/src/csharp/Grpc.Api/MathExamples.cs index 97c91b1b1b..97c91b1b1b 100644 --- a/src/csharp/GrpcApi/MathExamples.cs +++ b/src/csharp/Grpc.Api/MathExamples.cs diff --git a/src/csharp/GrpcApi/MathGrpc.cs b/src/csharp/Grpc.Api/MathGrpc.cs index f938a24543..f938a24543 100644 --- a/src/csharp/GrpcApi/MathGrpc.cs +++ b/src/csharp/Grpc.Api/MathGrpc.cs diff --git a/src/csharp/GrpcApi/MathServiceImpl.cs b/src/csharp/Grpc.Api/MathServiceImpl.cs index 462fab4454..462fab4454 100644 --- a/src/csharp/GrpcApi/MathServiceImpl.cs +++ b/src/csharp/Grpc.Api/MathServiceImpl.cs diff --git a/src/csharp/GrpcApi/Messages.cs b/src/csharp/Grpc.Api/Messages.cs index 386f377f08..386f377f08 100644 --- a/src/csharp/GrpcApi/Messages.cs +++ b/src/csharp/Grpc.Api/Messages.cs diff --git a/src/csharp/GrpcApi/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Api/Properties/AssemblyInfo.cs index 23fa101170..cef3a983c4 100644 --- a/src/csharp/GrpcApi/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Api/Properties/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle ("GrpcApi")] +[assembly: AssemblyTitle ("Grpc.Api")] [assembly: AssemblyDescription ("")] [assembly: AssemblyConfiguration ("")] [assembly: AssemblyCompany ("")] diff --git a/src/csharp/GrpcApi/TestServiceGrpc.cs b/src/csharp/Grpc.Api/TestServiceGrpc.cs index 15700e40ac..15700e40ac 100644 --- a/src/csharp/GrpcApi/TestServiceGrpc.cs +++ b/src/csharp/Grpc.Api/TestServiceGrpc.cs diff --git a/src/csharp/GrpcApi/packages.config b/src/csharp/Grpc.Api/packages.config index a6a949b3b3..a6a949b3b3 100644 --- a/src/csharp/GrpcApi/packages.config +++ b/src/csharp/Grpc.Api/packages.config diff --git a/src/csharp/GrpcApi/proto/empty.proto b/src/csharp/Grpc.Api/proto/empty.proto index 4295a0a960..4295a0a960 100644 --- a/src/csharp/GrpcApi/proto/empty.proto +++ b/src/csharp/Grpc.Api/proto/empty.proto diff --git a/src/csharp/GrpcApi/proto/math.proto b/src/csharp/Grpc.Api/proto/math.proto index 5485d580c3..5485d580c3 100644 --- a/src/csharp/GrpcApi/proto/math.proto +++ b/src/csharp/Grpc.Api/proto/math.proto diff --git a/src/csharp/GrpcApi/proto/messages.proto b/src/csharp/Grpc.Api/proto/messages.proto index 65a8140465..65a8140465 100644 --- a/src/csharp/GrpcApi/proto/messages.proto +++ b/src/csharp/Grpc.Api/proto/messages.proto diff --git a/src/csharp/GrpcApi/proto/test.proto b/src/csharp/Grpc.Api/proto/test.proto index 927a3a83aa..927a3a83aa 100644 --- a/src/csharp/GrpcApi/proto/test.proto +++ b/src/csharp/Grpc.Api/proto/test.proto diff --git a/src/csharp/GrpcCoreTests/.gitignore b/src/csharp/Grpc.Core.Tests/.gitignore index 775a9440a2..775a9440a2 100644 --- a/src/csharp/GrpcCoreTests/.gitignore +++ b/src/csharp/Grpc.Core.Tests/.gitignore diff --git a/src/csharp/GrpcCoreTests/ClientServerTest.cs b/src/csharp/Grpc.Core.Tests/ClientServerTest.cs index 7e564a2fba..7e564a2fba 100644 --- a/src/csharp/GrpcCoreTests/ClientServerTest.cs +++ b/src/csharp/Grpc.Core.Tests/ClientServerTest.cs diff --git a/src/csharp/GrpcCoreTests/GrpcCoreTests.csproj b/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj index ca52cd8f40..687be3c0cb 100644 --- a/src/csharp/GrpcCoreTests/GrpcCoreTests.csproj +++ b/src/csharp/Grpc.Core.Tests/Grpc.Core.Tests.csproj @@ -7,8 +7,8 @@ <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{86EC5CB4-4EA2-40A2-8057-86542A0353BB}</ProjectGuid> <OutputType>Library</OutputType> - <RootNamespace>GrpcCoreTests</RootNamespace> - <AssemblyName>GrpcCoreTests</AssemblyName> + <RootNamespace>Grpc.Core.Tests</RootNamespace> + <AssemblyName>Grpc.Core.Tests</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> @@ -44,9 +44,9 @@ </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> - <ProjectReference Include="..\GrpcCore\GrpcCore.csproj"> + <ProjectReference Include="..\Grpc.Core\Grpc.Core.csproj"> <Project>{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}</Project> - <Name>GrpcCore</Name> + <Name>Grpc.Core</Name> </ProjectReference> </ItemGroup> <ItemGroup> diff --git a/src/csharp/GrpcCoreTests/GrpcEnvironmentTest.cs b/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs index 8d3aef946a..8d3aef946a 100644 --- a/src/csharp/GrpcCoreTests/GrpcEnvironmentTest.cs +++ b/src/csharp/Grpc.Core.Tests/GrpcEnvironmentTest.cs diff --git a/src/csharp/GrpcCoreTests/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Core.Tests/Properties/AssemblyInfo.cs index 6d697d0f5d..499d931d2a 100644 --- a/src/csharp/GrpcCoreTests/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Core.Tests/Properties/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle("GrpcCoreTests")] +[assembly: AssemblyTitle("Grpc.Core.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] diff --git a/src/csharp/GrpcCoreTests/ServerTest.cs b/src/csharp/Grpc.Core.Tests/ServerTest.cs index dd30366f6a..dd30366f6a 100644 --- a/src/csharp/GrpcCoreTests/ServerTest.cs +++ b/src/csharp/Grpc.Core.Tests/ServerTest.cs diff --git a/src/csharp/GrpcCoreTests/TestResult.xml b/src/csharp/Grpc.Core.Tests/TestResult.xml index 13da80739c..13da80739c 100644 --- a/src/csharp/GrpcCoreTests/TestResult.xml +++ b/src/csharp/Grpc.Core.Tests/TestResult.xml diff --git a/src/csharp/GrpcCoreTests/TimespecTest.cs b/src/csharp/Grpc.Core.Tests/TimespecTest.cs index 0ca84ec44b..0ca84ec44b 100644 --- a/src/csharp/GrpcCoreTests/TimespecTest.cs +++ b/src/csharp/Grpc.Core.Tests/TimespecTest.cs diff --git a/src/csharp/GrpcCoreTests/packages.config b/src/csharp/Grpc.Core.Tests/packages.config index c714ef3a23..c714ef3a23 100644 --- a/src/csharp/GrpcCoreTests/packages.config +++ b/src/csharp/Grpc.Core.Tests/packages.config diff --git a/src/csharp/GrpcCore/.gitignore b/src/csharp/Grpc.Core/.gitignore index 8d4a6c08a8..8d4a6c08a8 100644 --- a/src/csharp/GrpcCore/.gitignore +++ b/src/csharp/Grpc.Core/.gitignore diff --git a/src/csharp/GrpcCore/Call.cs b/src/csharp/Grpc.Core/Call.cs index 72dca68895..72dca68895 100644 --- a/src/csharp/GrpcCore/Call.cs +++ b/src/csharp/Grpc.Core/Call.cs diff --git a/src/csharp/GrpcCore/Calls.cs b/src/csharp/Grpc.Core/Calls.cs index b67332676a..b67332676a 100644 --- a/src/csharp/GrpcCore/Calls.cs +++ b/src/csharp/Grpc.Core/Calls.cs diff --git a/src/csharp/GrpcCore/Channel.cs b/src/csharp/Grpc.Core/Channel.cs index 942651cf39..942651cf39 100644 --- a/src/csharp/GrpcCore/Channel.cs +++ b/src/csharp/Grpc.Core/Channel.cs diff --git a/src/csharp/GrpcCore/ClientStreamingAsyncResult.cs b/src/csharp/Grpc.Core/ClientStreamingAsyncResult.cs index 44580a1154..44580a1154 100644 --- a/src/csharp/GrpcCore/ClientStreamingAsyncResult.cs +++ b/src/csharp/Grpc.Core/ClientStreamingAsyncResult.cs diff --git a/src/csharp/GrpcCore/GrpcCore.csproj b/src/csharp/Grpc.Core/Grpc.Core.csproj index ee76b742ce..4ad32e10e4 100644 --- a/src/csharp/GrpcCore/GrpcCore.csproj +++ b/src/csharp/Grpc.Core/Grpc.Core.csproj @@ -7,8 +7,8 @@ <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}</ProjectGuid> <OutputType>Library</OutputType> - <RootNamespace>GrpcCore</RootNamespace> - <AssemblyName>GrpcCore</AssemblyName> + <RootNamespace>Grpc.Core</RootNamespace> + <AssemblyName>Grpc.Core</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> diff --git a/src/csharp/GrpcCore/GrpcEnvironment.cs b/src/csharp/Grpc.Core/GrpcEnvironment.cs index 0e3a0a581c..0e3a0a581c 100644 --- a/src/csharp/GrpcCore/GrpcEnvironment.cs +++ b/src/csharp/Grpc.Core/GrpcEnvironment.cs diff --git a/src/csharp/GrpcCore/Internal/AsyncCall.cs b/src/csharp/Grpc.Core/Internal/AsyncCall.cs index 5e96092e27..5e96092e27 100644 --- a/src/csharp/GrpcCore/Internal/AsyncCall.cs +++ b/src/csharp/Grpc.Core/Internal/AsyncCall.cs diff --git a/src/csharp/GrpcCore/Internal/BatchContextSafeHandleNotOwned.cs b/src/csharp/Grpc.Core/Internal/BatchContextSafeHandleNotOwned.cs index 75cd30e1a2..75cd30e1a2 100644 --- a/src/csharp/GrpcCore/Internal/BatchContextSafeHandleNotOwned.cs +++ b/src/csharp/Grpc.Core/Internal/BatchContextSafeHandleNotOwned.cs diff --git a/src/csharp/GrpcCore/Internal/CallSafeHandle.cs b/src/csharp/Grpc.Core/Internal/CallSafeHandle.cs index 659a383b4b..659a383b4b 100644 --- a/src/csharp/GrpcCore/Internal/CallSafeHandle.cs +++ b/src/csharp/Grpc.Core/Internal/CallSafeHandle.cs diff --git a/src/csharp/GrpcCore/Internal/ChannelSafeHandle.cs b/src/csharp/Grpc.Core/Internal/ChannelSafeHandle.cs index f15ead3572..f15ead3572 100644 --- a/src/csharp/GrpcCore/Internal/ChannelSafeHandle.cs +++ b/src/csharp/Grpc.Core/Internal/ChannelSafeHandle.cs diff --git a/src/csharp/GrpcCore/Internal/ClientStreamingInputObserver.cs b/src/csharp/Grpc.Core/Internal/ClientStreamingInputObserver.cs index fb59e86e2d..fb59e86e2d 100644 --- a/src/csharp/GrpcCore/Internal/ClientStreamingInputObserver.cs +++ b/src/csharp/Grpc.Core/Internal/ClientStreamingInputObserver.cs diff --git a/src/csharp/GrpcCore/Internal/CompletionQueueSafeHandle.cs b/src/csharp/Grpc.Core/Internal/CompletionQueueSafeHandle.cs index 3f01fdbfd0..3f01fdbfd0 100644 --- a/src/csharp/GrpcCore/Internal/CompletionQueueSafeHandle.cs +++ b/src/csharp/Grpc.Core/Internal/CompletionQueueSafeHandle.cs diff --git a/src/csharp/GrpcCore/Internal/Enums.cs b/src/csharp/Grpc.Core/Internal/Enums.cs index f363050b07..f363050b07 100644 --- a/src/csharp/GrpcCore/Internal/Enums.cs +++ b/src/csharp/Grpc.Core/Internal/Enums.cs diff --git a/src/csharp/GrpcCore/Internal/GrpcThreadPool.cs b/src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs index 9e69fe2f43..9e69fe2f43 100644 --- a/src/csharp/GrpcCore/Internal/GrpcThreadPool.cs +++ b/src/csharp/Grpc.Core/Internal/GrpcThreadPool.cs diff --git a/src/csharp/GrpcCore/Internal/SafeHandleZeroIsInvalid.cs b/src/csharp/Grpc.Core/Internal/SafeHandleZeroIsInvalid.cs index aa6fce2e96..aa6fce2e96 100644 --- a/src/csharp/GrpcCore/Internal/SafeHandleZeroIsInvalid.cs +++ b/src/csharp/Grpc.Core/Internal/SafeHandleZeroIsInvalid.cs diff --git a/src/csharp/GrpcCore/Internal/ServerSafeHandle.cs b/src/csharp/Grpc.Core/Internal/ServerSafeHandle.cs index de9bbaf7c1..de9bbaf7c1 100644 --- a/src/csharp/GrpcCore/Internal/ServerSafeHandle.cs +++ b/src/csharp/Grpc.Core/Internal/ServerSafeHandle.cs diff --git a/src/csharp/GrpcCore/Internal/ServerStreamingOutputObserver.cs b/src/csharp/Grpc.Core/Internal/ServerStreamingOutputObserver.cs index 08d9921475..08d9921475 100644 --- a/src/csharp/GrpcCore/Internal/ServerStreamingOutputObserver.cs +++ b/src/csharp/Grpc.Core/Internal/ServerStreamingOutputObserver.cs diff --git a/src/csharp/GrpcCore/Internal/Timespec.cs b/src/csharp/Grpc.Core/Internal/Timespec.cs index b191ecde94..b191ecde94 100644 --- a/src/csharp/GrpcCore/Internal/Timespec.cs +++ b/src/csharp/Grpc.Core/Internal/Timespec.cs diff --git a/src/csharp/GrpcCore/Marshaller.cs b/src/csharp/Grpc.Core/Marshaller.cs index 602e0eb824..602e0eb824 100644 --- a/src/csharp/GrpcCore/Marshaller.cs +++ b/src/csharp/Grpc.Core/Marshaller.cs diff --git a/src/csharp/GrpcCore/Method.cs b/src/csharp/Grpc.Core/Method.cs index c94aa8161f..c94aa8161f 100644 --- a/src/csharp/GrpcCore/Method.cs +++ b/src/csharp/Grpc.Core/Method.cs diff --git a/src/csharp/GrpcCore/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs index b3b9766667..37ba1e2263 100644 --- a/src/csharp/GrpcCore/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.Core/Properties/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle ("GrpcCore")] +[assembly: AssemblyTitle ("Grpc.Core")] [assembly: AssemblyDescription ("")] [assembly: AssemblyConfiguration ("")] [assembly: AssemblyCompany ("")] @@ -20,5 +20,5 @@ using System.Runtime.CompilerServices; //[assembly: AssemblyDelaySign(false)] //[assembly: AssemblyKeyFile("")] -[assembly: InternalsVisibleTo("GrpcCoreTests")] +[assembly: InternalsVisibleTo("Grpc.Core.Tests")] diff --git a/src/csharp/GrpcCore/RpcException.cs b/src/csharp/Grpc.Core/RpcException.cs index 5a9d0039bc..5a9d0039bc 100644 --- a/src/csharp/GrpcCore/RpcException.cs +++ b/src/csharp/Grpc.Core/RpcException.cs diff --git a/src/csharp/GrpcCore/Server.cs b/src/csharp/Grpc.Core/Server.cs index 002592a3d8..002592a3d8 100644 --- a/src/csharp/GrpcCore/Server.cs +++ b/src/csharp/Grpc.Core/Server.cs diff --git a/src/csharp/GrpcCore/ServerCallHandler.cs b/src/csharp/Grpc.Core/ServerCallHandler.cs index 1296947f34..1296947f34 100644 --- a/src/csharp/GrpcCore/ServerCallHandler.cs +++ b/src/csharp/Grpc.Core/ServerCallHandler.cs diff --git a/src/csharp/GrpcCore/ServerCalls.cs b/src/csharp/Grpc.Core/ServerCalls.cs index bed77796de..bed77796de 100644 --- a/src/csharp/GrpcCore/ServerCalls.cs +++ b/src/csharp/Grpc.Core/ServerCalls.cs diff --git a/src/csharp/GrpcCore/ServerServiceDefinition.cs b/src/csharp/Grpc.Core/ServerServiceDefinition.cs index 231c376062..231c376062 100644 --- a/src/csharp/GrpcCore/ServerServiceDefinition.cs +++ b/src/csharp/Grpc.Core/ServerServiceDefinition.cs diff --git a/src/csharp/GrpcCore/Status.cs b/src/csharp/Grpc.Core/Status.cs index 5ea1df7b48..5ea1df7b48 100644 --- a/src/csharp/GrpcCore/Status.cs +++ b/src/csharp/Grpc.Core/Status.cs diff --git a/src/csharp/GrpcCore/StatusCode.cs b/src/csharp/Grpc.Core/StatusCode.cs index 1fbf9c1b68..1fbf9c1b68 100644 --- a/src/csharp/GrpcCore/StatusCode.cs +++ b/src/csharp/Grpc.Core/StatusCode.cs diff --git a/src/csharp/GrpcCore/Utils/RecordingObserver.cs b/src/csharp/Grpc.Core/Utils/RecordingObserver.cs index 99d2725b70..99d2725b70 100644 --- a/src/csharp/GrpcCore/Utils/RecordingObserver.cs +++ b/src/csharp/Grpc.Core/Utils/RecordingObserver.cs diff --git a/src/csharp/GrpcCore/Utils/RecordingQueue.cs b/src/csharp/Grpc.Core/Utils/RecordingQueue.cs index 63992da6a9..63992da6a9 100644 --- a/src/csharp/GrpcCore/Utils/RecordingQueue.cs +++ b/src/csharp/Grpc.Core/Utils/RecordingQueue.cs diff --git a/src/csharp/InteropClient/.gitignore b/src/csharp/Grpc.IntegrationTesting/.gitignore index 8d4a6c08a8..8d4a6c08a8 100644 --- a/src/csharp/InteropClient/.gitignore +++ b/src/csharp/Grpc.IntegrationTesting/.gitignore diff --git a/src/csharp/InteropClient/Client.cs b/src/csharp/Grpc.IntegrationTesting/Client.cs index fdec6efd2e..bb650a112d 100644 --- a/src/csharp/InteropClient/Client.cs +++ b/src/csharp/Grpc.IntegrationTesting/Client.cs @@ -40,7 +40,7 @@ using Grpc.Core.Utils; using NUnit.Framework; using grpc.testing; -namespace Grpc.Interop +namespace Grpc.IntegrationTesting { class Client { diff --git a/src/csharp/InteropClient/InteropClient.csproj b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj index 29590f4950..6fcee0f126 100644 --- a/src/csharp/InteropClient/InteropClient.csproj +++ b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj @@ -7,9 +7,9 @@ <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{C61154BA-DD4A-4838-8420-0162A28925E0}</ProjectGuid> <OutputType>Exe</OutputType> - <RootNamespace>InteropClient</RootNamespace> - <AssemblyName>InteropClient</AssemblyName> - <StartupObject>Grpc.Interop.Client</StartupObject> + <RootNamespace>Grpc.IntegrationTesting</RootNamespace> + <AssemblyName>Grpc.IntegrationTesting</AssemblyName> + <StartupObject>Grpc.IntegrationTesting.Client</StartupObject> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> @@ -47,16 +47,16 @@ </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> - <ProjectReference Include="..\GrpcCore\GrpcCore.csproj"> + <ProjectReference Include="..\Grpc.Core\Grpc.Core.csproj"> <Project>{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}</Project> - <Name>GrpcCore</Name> + <Name>Grpc.Core</Name> </ProjectReference> - <ProjectReference Include="..\GrpcApi\GrpcApi.csproj"> + <ProjectReference Include="..\Grpc.Api\Grpc.Api.csproj"> <Project>{7DC1433E-3225-42C7-B7EA-546D56E27A4B}</Project> - <Name>GrpcApi</Name> + <Name>Grpc.Api</Name> </ProjectReference> </ItemGroup> <ItemGroup> <None Include="packages.config" /> </ItemGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/src/csharp/GrpcApiTests/Properties/AssemblyInfo.cs b/src/csharp/Grpc.IntegrationTesting/Properties/AssemblyInfo.cs index 5f6c467750..f633c19132 100644 --- a/src/csharp/GrpcApiTests/Properties/AssemblyInfo.cs +++ b/src/csharp/Grpc.IntegrationTesting/Properties/AssemblyInfo.cs @@ -3,7 +3,7 @@ using System.Runtime.CompilerServices; // Information about this assembly is defined by the following attributes. // Change them to the values specific to your project. -[assembly: AssemblyTitle("GrpcApiTests")] +[assembly: AssemblyTitle("Grpc.IntegrationTesting")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] diff --git a/src/csharp/InteropClient/packages.config b/src/csharp/Grpc.IntegrationTesting/packages.config index 51c17bcd5e..51c17bcd5e 100644 --- a/src/csharp/InteropClient/packages.config +++ b/src/csharp/Grpc.IntegrationTesting/packages.config diff --git a/src/csharp/Grpc.sln b/src/csharp/Grpc.sln index a7b2c9b580..7022c54370 100644 --- a/src/csharp/Grpc.sln +++ b/src/csharp/Grpc.sln @@ -1,17 +1,17 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GrpcApi", "GrpcApi\GrpcApi.csproj", "{7DC1433E-3225-42C7-B7EA-546D56E27A4B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.Api", "Grpc.Api\Grpc.Api.csproj", "{7DC1433E-3225-42C7-B7EA-546D56E27A4B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GrpcCore", "GrpcCore\GrpcCore.csproj", "{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.Core", "Grpc.Core\Grpc.Core.csproj", "{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GrpcCoreTests", "GrpcCoreTests\GrpcCoreTests.csproj", "{86EC5CB4-4EA2-40A2-8057-86542A0353BB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.Core.Tests", "Grpc.Core.Tests\Grpc.Core.Tests.csproj", "{86EC5CB4-4EA2-40A2-8057-86542A0353BB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GrpcApiTests", "GrpcApiTests\GrpcApiTests.csproj", "{143B1C29-C442-4BE0-BF3F-A8F92288AC9F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.Api.Tests", "Grpc.Api.Tests\Grpc.Api.Tests.csproj", "{143B1C29-C442-4BE0-BF3F-A8F92288AC9F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MathClient", "MathClient\MathClient.csproj", "{61ECB8EE-0C96-4F8E-B187-8E4D227417C0}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InteropClient", "InteropClient\InteropClient.csproj", "{C61154BA-DD4A-4838-8420-0162A28925E0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.IntegrationTesting", "Grpc.IntegrationTesting\Grpc.IntegrationTesting.csproj", "{C61154BA-DD4A-4838-8420-0162A28925E0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,6 +45,6 @@ Global {CCC4440E-49F7-4790-B0AF-FEABB0837AE7}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = InteropClient\InteropClient.csproj
+ StartupItem = Grpc.Api\Grpc.Api.csproj
EndGlobalSection
EndGlobal
diff --git a/src/csharp/MathClient/MathClient.csproj b/src/csharp/MathClient/MathClient.csproj index 74213653d2..448ef13f70 100644 --- a/src/csharp/MathClient/MathClient.csproj +++ b/src/csharp/MathClient/MathClient.csproj @@ -7,8 +7,8 @@ <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{61ECB8EE-0C96-4F8E-B187-8E4D227417C0}</ProjectGuid> <OutputType>Exe</OutputType> - <RootNamespace>GrpcDemo</RootNamespace> - <AssemblyName>GrpcDemo</AssemblyName> + <RootNamespace>MathClient</RootNamespace> + <AssemblyName>MathClient</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> @@ -40,13 +40,13 @@ </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <ItemGroup> - <ProjectReference Include="..\GrpcApi\GrpcApi.csproj"> - <Project>{7DC1433E-3225-42C7-B7EA-546D56E27A4B}</Project> - <Name>GrpcApi</Name> - </ProjectReference> - <ProjectReference Include="..\GrpcCore\GrpcCore.csproj"> + <ProjectReference Include="..\Grpc.Core\Grpc.Core.csproj"> <Project>{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}</Project> - <Name>GrpcCore</Name> + <Name>Grpc.Core</Name> + </ProjectReference> + <ProjectReference Include="..\Grpc.Api\Grpc.Api.csproj"> + <Project>{7DC1433E-3225-42C7-B7EA-546D56E27A4B}</Project> + <Name>Grpc.Api</Name> </ProjectReference> </ItemGroup> </Project>
\ No newline at end of file |