From 923b1317d551b9318ce70080c79862d719ad30d4 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Wed, 12 Apr 2017 09:58:55 +0200 Subject: update .NET core example to .csproj projects --- examples/csharp/helloworld-from-cli/Greeter.sln | 34 +++++++++++++++++++++ .../helloworld-from-cli/Greeter/Greeter.csproj | 17 +++++++++++ .../helloworld-from-cli/Greeter/project.json | 31 ------------------- .../GreeterClient/GreeterClient.csproj | 17 +++++++++++ .../helloworld-from-cli/GreeterClient/project.json | 35 ---------------------- .../GreeterServer/GreeterServer.csproj | 17 +++++++++++ .../helloworld-from-cli/GreeterServer/project.json | 35 ---------------------- examples/csharp/helloworld-from-cli/README.md | 17 ++++------- examples/csharp/helloworld-from-cli/global.json | 5 ---- 9 files changed, 90 insertions(+), 118 deletions(-) create mode 100644 examples/csharp/helloworld-from-cli/Greeter.sln create mode 100644 examples/csharp/helloworld-from-cli/Greeter/Greeter.csproj delete mode 100644 examples/csharp/helloworld-from-cli/Greeter/project.json create mode 100644 examples/csharp/helloworld-from-cli/GreeterClient/GreeterClient.csproj delete mode 100644 examples/csharp/helloworld-from-cli/GreeterClient/project.json create mode 100644 examples/csharp/helloworld-from-cli/GreeterServer/GreeterServer.csproj delete mode 100644 examples/csharp/helloworld-from-cli/GreeterServer/project.json delete mode 100644 examples/csharp/helloworld-from-cli/global.json (limited to 'examples/csharp') diff --git a/examples/csharp/helloworld-from-cli/Greeter.sln b/examples/csharp/helloworld-from-cli/Greeter.sln new file mode 100644 index 0000000000..ca50470e66 --- /dev/null +++ b/examples/csharp/helloworld-from-cli/Greeter.sln @@ -0,0 +1,34 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.4 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greeter", "Greeter\Greeter.csproj", "{13B6DFC8-F5F6-4CC2-99DF-57A7CF042033}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreeterClient", "GreeterClient\GreeterClient.csproj", "{B754FB02-D501-4308-8B89-33AB7119C80D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GreeterServer", "GreeterServer\GreeterServer.csproj", "{DDBFF994-E076-43AD-B18D-049DFC1B670C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {13B6DFC8-F5F6-4CC2-99DF-57A7CF042033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {13B6DFC8-F5F6-4CC2-99DF-57A7CF042033}.Debug|Any CPU.Build.0 = Debug|Any CPU + {13B6DFC8-F5F6-4CC2-99DF-57A7CF042033}.Release|Any CPU.ActiveCfg = Release|Any CPU + {13B6DFC8-F5F6-4CC2-99DF-57A7CF042033}.Release|Any CPU.Build.0 = Release|Any CPU + {B754FB02-D501-4308-8B89-33AB7119C80D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B754FB02-D501-4308-8B89-33AB7119C80D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B754FB02-D501-4308-8B89-33AB7119C80D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B754FB02-D501-4308-8B89-33AB7119C80D}.Release|Any CPU.Build.0 = Release|Any CPU + {DDBFF994-E076-43AD-B18D-049DFC1B670C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DDBFF994-E076-43AD-B18D-049DFC1B670C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DDBFF994-E076-43AD-B18D-049DFC1B670C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DDBFF994-E076-43AD-B18D-049DFC1B670C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/examples/csharp/helloworld-from-cli/Greeter/Greeter.csproj b/examples/csharp/helloworld-from-cli/Greeter/Greeter.csproj new file mode 100644 index 0000000000..600eda3fdd --- /dev/null +++ b/examples/csharp/helloworld-from-cli/Greeter/Greeter.csproj @@ -0,0 +1,17 @@ + + + + Greeter + netcoreapp1.0 + portable + Greeter + Greeter + 1.0.4 + + + + + + + + diff --git a/examples/csharp/helloworld-from-cli/Greeter/project.json b/examples/csharp/helloworld-from-cli/Greeter/project.json deleted file mode 100644 index 72254ce73e..0000000000 --- a/examples/csharp/helloworld-from-cli/Greeter/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "title": "Greeter", - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - }, - "dependencies": { - "Google.Protobuf": "3.0.0", - "Grpc": "1.0.1", - }, - "frameworks": { - "net45": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.IO": "" - }, - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1" - } - }, - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/examples/csharp/helloworld-from-cli/GreeterClient/GreeterClient.csproj b/examples/csharp/helloworld-from-cli/GreeterClient/GreeterClient.csproj new file mode 100644 index 0000000000..24cacfc021 --- /dev/null +++ b/examples/csharp/helloworld-from-cli/GreeterClient/GreeterClient.csproj @@ -0,0 +1,17 @@ + + + + GreeterClient + netcoreapp1.0 + portable + GreeterClient + Exe + GreeterClient + 1.0.4 + + + + + + + diff --git a/examples/csharp/helloworld-from-cli/GreeterClient/project.json b/examples/csharp/helloworld-from-cli/GreeterClient/project.json deleted file mode 100644 index 09e156f68e..0000000000 --- a/examples/csharp/helloworld-from-cli/GreeterClient/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "title": "GreeterClient", - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": "true" - }, - "dependencies": { - "Google.Protobuf": "3.0.0", - "Grpc": "1.0.1", - "Greeter": { - "target": "project" - } - }, - "frameworks": { - "net45": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.IO": "" - }, - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1" - } - }, - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/examples/csharp/helloworld-from-cli/GreeterServer/GreeterServer.csproj b/examples/csharp/helloworld-from-cli/GreeterServer/GreeterServer.csproj new file mode 100644 index 0000000000..f7980fa728 --- /dev/null +++ b/examples/csharp/helloworld-from-cli/GreeterServer/GreeterServer.csproj @@ -0,0 +1,17 @@ + + + + GreeterServer + netcoreapp1.0 + portable + GreeterServer + Exe + GreeterServer + 1.0.4 + + + + + + + diff --git a/examples/csharp/helloworld-from-cli/GreeterServer/project.json b/examples/csharp/helloworld-from-cli/GreeterServer/project.json deleted file mode 100644 index 8802fe3265..0000000000 --- a/examples/csharp/helloworld-from-cli/GreeterServer/project.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "title": "GreeterServer", - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": "true" - }, - "dependencies": { - "Google.Protobuf": "3.0.0", - "Grpc": "1.0.1", - "Greeter": { - "target": "project" - } - }, - "frameworks": { - "net45": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.IO": "" - }, - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1" - } - }, - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.1" - } - }, - "imports": "dnxcore50" - } - } -} diff --git a/examples/csharp/helloworld-from-cli/README.md b/examples/csharp/helloworld-from-cli/README.md index 4db077631d..c8f8149f73 100644 --- a/examples/csharp/helloworld-from-cli/README.md +++ b/examples/csharp/helloworld-from-cli/README.md @@ -12,26 +12,19 @@ Example projects in this directory depend on the [Grpc](https://www.nuget.org/pa and [Google.Protobuf](https://www.nuget.org/packages/Google.Protobuf/) NuGet packages which have been already added to the project for you. -The examples in this directory target .NET 4.5 framework, as .NET Core support is -currently experimental. - PREREQUISITES ------------- -- The DotNetCore SDK cli. - -- The .NET 4.5 framework. - -Both are available to download at https://www.microsoft.com/net/download +- The [.NET Core SDK](https://www.microsoft.com/net/core). BUILD ------- From the `examples/csharp/helloworld-from-cli` directory: -- `dotnet restore` +- `dotnet restore Greeter.sln` -- `dotnet build **/project.json` (this will automatically download NuGet dependencies) +- `dotnet build Greeter.sln` Try it! ------- @@ -40,14 +33,14 @@ Try it! ``` > cd GreeterServer - > dotnet run + > dotnet run -f netcoreapp1.0 ``` - Run the client ``` > cd GreeterClient - > dotnet run + > dotnet run -f netcoreapp1.0 ``` Tutorial diff --git a/examples/csharp/helloworld-from-cli/global.json b/examples/csharp/helloworld-from-cli/global.json deleted file mode 100644 index f3c33cef6a..0000000000 --- a/examples/csharp/helloworld-from-cli/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "1.0.0-preview2-003131" - } -} \ No newline at end of file -- cgit v1.2.3