diff options
| author | Jens Geyer <jensg@apache.org> | 2022-01-31 18:04:35 +0100 |
|---|---|---|
| committer | Jens Geyer <jensg@apache.org> | 2022-02-08 17:45:10 +0100 |
| commit | 3cac3204519bbdfe02beb9d863e9b873cdaf9d07 (patch) | |
| tree | 384c20a68441e257f07b69d3ee26a019ec43196f /tutorial | |
| parent | 2d667f34767b32d242687b5e31f65284f82ce16d (diff) | |
| download | thrift-3cac3204519bbdfe02beb9d863e9b873cdaf9d07.tar.gz | |
THRIFT-5511 Full support for the new net6 "nullability" semantics
Client: netstd
Patch: Jens Geyer
This closes #2516
Diffstat (limited to 'tutorial')
| -rw-r--r-- | tutorial/netstd/Interfaces/Interfaces.csproj | 6 | ||||
| -rw-r--r-- | tutorial/netstd/Server/Program.cs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tutorial/netstd/Interfaces/Interfaces.csproj b/tutorial/netstd/Interfaces/Interfaces.csproj index f81c88d96..d04b243f3 100644 --- a/tutorial/netstd/Interfaces/Interfaces.csproj +++ b/tutorial/netstd/Interfaces/Interfaces.csproj @@ -41,8 +41,8 @@ <Exec Condition="'$(OS)' == 'Windows_NT'" Command="where thrift" ConsoleToMSBuild="true"> <Output TaskParameter="ConsoleOutput" PropertyName="PathToThrift" /> </Exec> - <Exec Condition="Exists('$(PathToThrift)')" Command="$(PathToThrift) -out $(ProjectDir) -gen netstd:wcf,union,serial -r ./../../tutorial.thrift" /> - <Exec Condition="Exists('thrift')" Command="thrift -out $(ProjectDir) -gen netstd:wcf,union,serial -r ./../../tutorial.thrift" /> - <Exec Condition="Exists('./../../../compiler/cpp/thrift')" Command="./../../../compiler/cpp/thrift -out $(ProjectDir) -gen netstd:wcf,union,serial -r ./../../tutorial.thrift" /> + <Exec Condition="Exists('$(PathToThrift)')" Command="$(PathToThrift) -out $(ProjectDir) -gen netstd:wcf,union,serial,net6 -r ./../../tutorial.thrift" /> + <Exec Condition="Exists('thrift')" Command="thrift -out $(ProjectDir) -gen netstd:wcf,union,serial,net6 -r ./../../tutorial.thrift" /> + <Exec Condition="Exists('./../../../compiler/cpp/thrift')" Command="./../../../compiler/cpp/thrift -out $(ProjectDir) -gen netstd:wcf,union,serial,net6 -r ./../../tutorial.thrift" /> </Target> </Project> diff --git a/tutorial/netstd/Server/Program.cs b/tutorial/netstd/Server/Program.cs index d9c9dbf12..29b21d073 100644 --- a/tutorial/netstd/Server/Program.cs +++ b/tutorial/netstd/Server/Program.cs @@ -131,7 +131,7 @@ Sample: if (selectedTransport == Transport.Http) { if (multiplex) - throw new Exception("This tutorial semple code does not yet allow multiplex over http (although Thrift itself of course does)"); + throw new Exception("This tutorial sample code does not yet allow multiplex over http (although Thrift itself of course does)"); new HttpServerSample().Run(cancellationToken); } else |