diff options
| author |  Nathaniel Manista <nathaniel@google.com> | 2016-08-11 13:31:44 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-08-11 13:31:44 -0700 |
| commit | 857b95767bdb3646e3dc3240ee88cc816cca9408 (patch) | |
| tree | 72987b668b1bab3f4837cd073049ef4787048151 /examples/csharp/helloworld | |
| parent | 2c779d64db4b4e460c697b59170f85135d552db5 (diff) | |
| parent | 7f074e0e20872de5720d6f5f2e77d4add7bed84a (diff) | |
Merge pull request #7711 from nicolasnoble/manual-upmerge
Manual v1.0.x -> master upmerge.
Diffstat (limited to 'examples/csharp/helloworld')
| -rw-r--r-- | examples/csharp/helloworld/.nuget/packages.config | 4 | ||||
| -rw-r--r-- | examples/csharp/helloworld/Greeter.sln | 5 | ||||
| -rw-r--r-- | examples/csharp/helloworld/Greeter/packages.config | 1 |
3 files changed, 1 insertions, 9 deletions
diff --git a/examples/csharp/helloworld/.nuget/packages.config b/examples/csharp/helloworld/.nuget/packages.config deleted file mode 100644 index aa060800c1..0000000000 --- a/examples/csharp/helloworld/.nuget/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Grpc.Tools" version="0.15.0" /> -</packages>
\ No newline at end of file diff --git a/examples/csharp/helloworld/Greeter.sln b/examples/csharp/helloworld/Greeter.sln index 9430e94de9..49e364d91c 100644 --- a/examples/csharp/helloworld/Greeter.sln +++ b/examples/csharp/helloworld/Greeter.sln @@ -9,11 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreeterServer", "GreeterSer EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreeterClient", "GreeterClient\GreeterClient.csproj", "{ACCF4597-3748-4117-8633-1CB767F8CCC3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{FF1EBE95-F20D-4C27-8A61-D0125F3C8152}" - ProjectSection(SolutionItems) = preProject - .nuget\packages.config = .nuget\packages.config - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/examples/csharp/helloworld/Greeter/packages.config b/examples/csharp/helloworld/Greeter/packages.config index ff9d6bbf73..c94bb87307 100644 --- a/examples/csharp/helloworld/Greeter/packages.config +++ b/examples/csharp/helloworld/Greeter/packages.config @@ -4,4 +4,5 @@ <package id="Grpc" version="0.15.0" targetFramework="net45" /> <package id="Grpc.Core" version="0.15.0" targetFramework="net45" /> <package id="Ix-Async" version="1.2.5" targetFramework="net45" /> + <package id="Grpc.Tools" version="0.15.0" targetFramework="net45" /> </packages>
\ No newline at end of file |