Merge branch '0.18.1'
diff --git a/ApacheThrift.nuspec b/ApacheThrift.nuspec
index fe066df..0e6f09e 100644
--- a/ApacheThrift.nuspec
+++ b/ApacheThrift.nuspec
@@ -19,14 +19,14 @@
the "Thrift" project.
2. nuget setApiKey <your-api-key>
3. nuget pack ApacheThrift.nuspec -Symbols -SymbolPackageFormat snupkg
- 4. nuget push ApacheThrift.0.18.1.nupkg -Source https://api.nuget.org/v3/index.json
+ 4. nuget push ApacheThrift.0.19.0.nupkg -Source https://api.nuget.org/v3/index.json
-->
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>ApacheThrift</id>
- <version>0.18.1</version>
- <title>Apache Thrift 0.18.1</title>
+ <version>0.19.0</version>
+ <title>Apache Thrift 0.19.0</title>
<authors>Apache Thrift Developers</authors>
<owners>Apache Software Foundation</owners>
<license type="expression">Apache-2.0</license>
@@ -36,7 +36,7 @@
<description>
Contains runtime libraries from lib/netstd for netstandard2.0 framework development.
</description>
- <repository type="GitHub" url="https://github.com/apache/thrift" branch="release/0.18.1" />
+ <repository type="GitHub" url="https://github.com/apache/thrift" branch="release/0.19.0" />
<tags>Apache Thrift RPC</tags>
</metadata>
<files>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3dfda41..f056629 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@
# PACKAGE_VERSION is used by cpack scripts currently
# Both thrift_VERSION and PACKAGE_VERSION should be the same for now
-set(thrift_VERSION "0.18.1")
+set(thrift_VERSION "0.19.0")
set(PACKAGE_VERSION ${thrift_VERSION})
project("thrift" VERSION ${PACKAGE_VERSION})
diff --git a/Thrift.podspec b/Thrift.podspec
index c0ae6c2..fe5bcc3 100644
--- a/Thrift.podspec
+++ b/Thrift.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'Thrift'
- s.version = '0.18.1'
+ s.version = '0.19.0'
s.summary = "Apache Thrift is a lightweight, language-independent software stack with an associated code generation mechanism for RPC."
s.description = <<-DESC
The Apache Thrift scalable cross-language software framework for networked services development combines a software stack with a code generation engine to build services that work efficiently and seamlessly between many programming languages.
@@ -10,6 +10,6 @@
s.author = { 'Apache Thrift Developers' => 'dev@thrift.apache.org' }
s.ios.deployment_target = '9.0'
s.osx.deployment_target = '10.10'
- s.source = { :git => 'https://github.com/apache/thrift.git', :tag => 'v0.18.1' }
+ s.source = { :git => 'https://github.com/apache/thrift.git', :tag => 'v0.19.0' }
s.source_files = 'lib/swift/Sources/*.swift'
end
diff --git a/appveyor.yml b/appveyor.yml
index 97d41cf..1f5abeb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,7 +19,7 @@
# build Apache Thrift on AppVeyor - https://ci.appveyor.com
-version: '0.18.1.{build}'
+version: '0.19.0.{build}'
shallow_clone: true
diff --git a/bower.json b/bower.json
index 2590c24..51913da 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
{
"name": "thrift",
- "version": "0.18.1",
+ "version": "0.19.0",
"homepage": "https://github.com/apache/thrift.git",
"authors": [
"Apache Thrift <dev@thrift.apache.org>"
diff --git a/build/docker/README.md b/build/docker/README.md
index a41f031..9635e6f 100644
--- a/build/docker/README.md
+++ b/build/docker/README.md
@@ -183,7 +183,7 @@
| java | 1.8.0\_191 | 17 | |
| js | Node.js 6.17.1, V8 5.1.281.111, npm 3.10.10 | Node.js 10.18.0, V8 6.8.275.32, npm 6.13.4 | |
| lua | | 5.2.4 | Lua 5.3: see THRIFT-4386 |
-| netstd | 6.0 | 6.0 | |
+| netstd | 7.0 | 7.0 | |
| nodejs | 6.16.0 | 10.16.0 | |
| ocaml | | 4.05.0 | THRIFT-4517: ocaml 4.02.3 on xenial appears broken |
| perl | 5.22.1 | 5.26.1 | |
diff --git a/build/docker/old/debian-stretch/Dockerfile b/build/docker/old/debian-stretch/Dockerfile
index 628b626..25237ca 100644
--- a/build/docker/old/debian-stretch/Dockerfile
+++ b/build/docker/old/debian-stretch/Dockerfile
@@ -102,10 +102,10 @@
# project isn't ready for this quite yet:
# RUN apt-get install -y --no-install-recommends \
# `# dotnet core dependencies` \
-# dotnet-sdk-6.0 \
-# dotnet-runtime-6.0 \
-# aspnetcore-runtime-6.0 \
-# dotnet-apphost-pack-6.0
+# dotnet-sdk-7.0 \
+# dotnet-runtime-7.0 \
+# aspnetcore-runtime-7.0 \
+# dotnet-apphost-pack-7.0
RUN apt-get install -y --no-install-recommends \
`# Erlang dependencies` \
diff --git a/build/docker/old/ubuntu-artful/Dockerfile b/build/docker/old/ubuntu-artful/Dockerfile
index 8068265..0391470 100644
--- a/build/docker/old/ubuntu-artful/Dockerfile
+++ b/build/docker/old/ubuntu-artful/Dockerfile
@@ -120,10 +120,10 @@
RUN apt-get install -y --no-install-recommends \
`# dotnet core dependencies` \
- dotnet-sdk-6.0 \
- dotnet-runtime-6.0 \
- aspnetcore-runtime-6.0 \
- dotnet-apphost-pack-6.0
+ dotnet-sdk-7.0 \
+ dotnet-runtime-7.0 \
+ aspnetcore-runtime-7.0 \
+ dotnet-apphost-pack-7.0
RUN apt-get install -y --no-install-recommends \
`# Erlang dependencies` \
diff --git a/build/docker/old/ubuntu-disco/Dockerfile b/build/docker/old/ubuntu-disco/Dockerfile
index 2e802e5..37377e3 100644
--- a/build/docker/old/ubuntu-disco/Dockerfile
+++ b/build/docker/old/ubuntu-disco/Dockerfile
@@ -126,10 +126,10 @@
RUN apt-get install -y --no-install-recommends \
`# dotnet core dependencies` \
- dotnet-sdk-6.0 \
- dotnet-runtime-6.0 \
- aspnetcore-runtime-6.0 \
- dotnet-apphost-pack-6.0
+ dotnet-sdk-7.0 \
+ dotnet-runtime-7.0 \
+ aspnetcore-runtime-7.0 \
+ dotnet-apphost-pack-7.0
RUN apt-get install -y --no-install-recommends \
`# Erlang dependencies` \
diff --git a/build/docker/old/ubuntu-xenial/Dockerfile b/build/docker/old/ubuntu-xenial/Dockerfile
index 7cb58e8..add524d 100644
--- a/build/docker/old/ubuntu-xenial/Dockerfile
+++ b/build/docker/old/ubuntu-xenial/Dockerfile
@@ -115,10 +115,10 @@
RUN apt-get install -y --no-install-recommends \
`# dotnet core dependencies` \
- dotnet-sdk-6.0 \
- dotnet-runtime-6.0 \
- aspnetcore-runtime-6.0 \
- dotnet-apphost-pack-6.0
+ dotnet-sdk-7.0 \
+ dotnet-runtime-7.0 \
+ aspnetcore-runtime-7.0 \
+ dotnet-apphost-pack-7.0
# Erlang dependencies
ARG ERLANG_OTP_VERSION=18.3.4.11
diff --git a/build/docker/ubuntu-bionic/Dockerfile b/build/docker/ubuntu-bionic/Dockerfile
index 873dad8..f0dcb90 100644
--- a/build/docker/ubuntu-bionic/Dockerfile
+++ b/build/docker/ubuntu-bionic/Dockerfile
@@ -124,10 +124,10 @@
RUN apt-get install -y --no-install-recommends \
`# dotnet core dependencies` \
- dotnet-sdk-6.0 \
- dotnet-runtime-6.0 \
- aspnetcore-runtime-6.0 \
- dotnet-apphost-pack-6.0
+ dotnet-sdk-7.0 \
+ dotnet-runtime-7.0 \
+ aspnetcore-runtime-7.0 \
+ dotnet-apphost-pack-7.0
# Erlang dependencies
ARG ERLANG_OTP_VERSION=23.3.4.11
diff --git a/build/docker/ubuntu-focal/Dockerfile b/build/docker/ubuntu-focal/Dockerfile
index 0a8c1c7..ad01f7e 100644
--- a/build/docker/ubuntu-focal/Dockerfile
+++ b/build/docker/ubuntu-focal/Dockerfile
@@ -125,10 +125,10 @@
RUN apt-get install -y --no-install-recommends \
`# dotnet core dependencies` \
- dotnet-sdk-6.0 \
- dotnet-runtime-6.0 \
- aspnetcore-runtime-6.0 \
- dotnet-apphost-pack-6.0
+ dotnet-sdk-7.0 \
+ dotnet-runtime-7.0 \
+ aspnetcore-runtime-7.0 \
+ dotnet-apphost-pack-7.0
# Erlang dependencies
ARG ERLANG_OTP_VERSION=23.3.4.11
diff --git a/build/docker/ubuntu-jammy/Dockerfile b/build/docker/ubuntu-jammy/Dockerfile
index 7d56cc5..d2a5f64 100644
--- a/build/docker/ubuntu-jammy/Dockerfile
+++ b/build/docker/ubuntu-jammy/Dockerfile
@@ -125,10 +125,10 @@
RUN apt-get install -y --no-install-recommends \
`# dotnet core dependencies` \
- dotnet-sdk-6.0 \
- dotnet-runtime-6.0 \
- aspnetcore-runtime-6.0 \
- dotnet-apphost-pack-6.0
+ dotnet-sdk-7.0 \
+ dotnet-runtime-7.0 \
+ aspnetcore-runtime-7.0 \
+ dotnet-apphost-pack-7.0
# Erlang dependencies
ARG ERLANG_OTP_VERSION=23.3.4.11
diff --git a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
index 96bdc3c..1c97002 100644
--- a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
@@ -179,6 +179,12 @@
return "@" + name;
}
+ // prevent CS8981 "The type name only contains lower-cased ascii characters"
+ if( name.find_first_not_of("abcdefghijklmnopqrstuvwxyz") == std::string::npos)
+ {
+ return "@" + name;
+ }
+
// no changes necessary
return name;
}
@@ -356,7 +362,7 @@
for (c_iter = consts.begin(); c_iter != consts.end(); ++c_iter)
{
generate_netstd_doc(out, *c_iter);
- if (print_const_value(out, (*c_iter)->get_name(), (*c_iter)->get_type(), (*c_iter)->get_value(), false))
+ if (print_const_value(out, normalize_name((*c_iter)->get_name()), (*c_iter)->get_type(), (*c_iter)->get_value(), false))
{
need_static_constructor = true;
}
@@ -474,7 +480,7 @@
if (type->is_base_type())
{
string v2 = render_const_value(out, name, type, value);
- out << normalize_name(name) << " = " << v2 << ";" << endl;
+ out << name << " = " << v2 << ";" << endl;
need_static_construction = false;
}
else if (type->is_enum())
@@ -552,7 +558,7 @@
}
else
{
- string t = tmp("tmp");
+ string t = normalize_name(tmp("tmp"));
print_const_value(out, t, type, value, true, true, true);
render << t;
}
@@ -940,7 +946,7 @@
{
if (field_is_required((*m_iter)))
{
- print_const_value(out, "this." + prop_name(*m_iter), t, (*m_iter)->get_value(), true, true);
+ print_const_value(out, "this." + normalize_name(prop_name(*m_iter)), t, (*m_iter)->get_value(), true, true);
}
else
{
@@ -1456,14 +1462,14 @@
// Let's define the class first
start_netstd_namespace(out);
- out << indent() << "public abstract partial class " << tunion->get_name() << " : TUnionBase" << endl;
+ out << indent() << "public abstract partial class " << normalize_name(tunion->get_name()) << " : TUnionBase" << endl;
out << indent() << "{" << endl;
indent_up();
out << indent() << "public abstract global::System.Threading.Tasks.Task WriteAsync(TProtocol tProtocol, CancellationToken " << CANCELLATION_TOKEN_NAME << ");" << endl
<< indent() << "public readonly int Isset;" << endl
<< indent() << "public abstract object" << nullable_suffix() <<" Data { get; }" << endl
- << indent() << "protected " << tunion->get_name() << "(int isset)" << endl
+ << indent() << "protected " << normalize_name(tunion->get_name()) << "(int isset)" << endl
<< indent() << "{" << endl;
indent_up();
out << indent() << "Isset = isset;" << endl;
@@ -1669,13 +1675,13 @@
<< endl;
- out << indent() << "public class " << tfield->get_name() << " : " << tunion->get_name() << endl;
+ out << indent() << "public class " << normalize_name(tfield->get_name()) << " : " << normalize_name(tunion->get_name()) << endl;
out << indent() << "{" << endl;
indent_up();
out << indent() << "private readonly " << type_name(tfield->get_type()) << " _data;" << endl
<< indent() << "public override object" << nullable_suffix() <<" Data { get { return _data; } }" << endl
- << indent() << "public " << tfield->get_name() << "(" << type_name(tfield->get_type()) << " data) : base("<< tfield->get_key() <<")" << endl
+ << indent() << "public " << normalize_name(tfield->get_name()) << "(" << type_name(tfield->get_type()) << " data) : base("<< tfield->get_key() <<")" << endl
<< indent() << "{" << endl;
indent_up();
out << indent() << "this._data = data;" << endl;
@@ -1683,13 +1689,13 @@
out << indent() << "}" << endl;
if( ! suppress_deepcopy) {
- out << indent() << "public new " << tfield->get_name() << " " << DEEP_COPY_METHOD_NAME << "()" << endl;
+ out << indent() << "public new " << normalize_name(tfield->get_name()) << " " << DEEP_COPY_METHOD_NAME << "()" << endl;
out << indent() << "{" << endl;
indent_up();
bool needs_typecast = false;
string suffix("");
string copy_op = get_deep_copy_method_call(tfield->get_type(), true, needs_typecast, suffix);
- out << indent() << "return new " << tfield->get_name() << "(_data" << copy_op << ");" << endl;
+ out << indent() << "return new " << normalize_name(tfield->get_name()) << "(_data" << copy_op << ");" << endl;
indent_down();
out << indent() << "}" << endl << endl;
}
diff --git a/compiler/cpp/src/thrift/version.h b/compiler/cpp/src/thrift/version.h
index 4aeae05..4f979d9 100644
--- a/compiler/cpp/src/thrift/version.h
+++ b/compiler/cpp/src/thrift/version.h
@@ -24,6 +24,6 @@
#pragma once
#endif // _MSC_VER
-#define THRIFT_VERSION "0.18.1"
+#define THRIFT_VERSION "0.19.0"
#endif // _THRIFT_VERSION_H_
diff --git a/configure.ac b/configure.ac
index 87aadc7..6331acd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
AC_PREREQ(2.65)
AC_CONFIG_MACRO_DIR([./aclocal])
-AC_INIT([thrift], [0.18.1])
+AC_INIT([thrift], [0.19.0])
AC_CONFIG_AUX_DIR([.])
@@ -469,7 +469,7 @@
if test "$with_netstd" = "yes"; then
AC_PATH_PROG([DOTNETCORE], [dotnet])
if [[ -x "$DOTNETCORE" ]] ; then
- AX_PROG_DOTNETCORE_VERSION( [3.1.0], have_netstd="yes", have_netstd="no")
+ AX_PROG_DOTNETCORE_VERSION( [7.0.0], have_netstd="yes", have_netstd="no")
fi
fi
AM_CONDITIONAL(WITH_DOTNET, [test "$have_netstd" = "yes"])
diff --git a/contrib/Rebus/Properties/AssemblyInfo.cs b/contrib/Rebus/Properties/AssemblyInfo.cs
index 5e63934..ab40a65 100644
--- a/contrib/Rebus/Properties/AssemblyInfo.cs
+++ b/contrib/Rebus/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
[assembly: Guid("0af10984-40d3-453d-b1e5-421529e8c7e2")]
-[assembly: AssemblyVersion("0.18.1.0")]
-[assembly: AssemblyFileVersion("0.18.1.0")]
+[assembly: AssemblyVersion("0.19.0.0")]
+[assembly: AssemblyFileVersion("0.19.0.0")]
diff --git a/contrib/thrift-maven-plugin/pom.xml b/contrib/thrift-maven-plugin/pom.xml
index 19258a8..b7a93c9 100644
--- a/contrib/thrift-maven-plugin/pom.xml
+++ b/contrib/thrift-maven-plugin/pom.xml
@@ -29,7 +29,7 @@
<artifactId>thrift-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>thrift-maven-plugin</name>
- <version>0.18.1</version>
+ <version>0.19.0</version>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
diff --git a/contrib/thrift.spec b/contrib/thrift.spec
index 639c514..5701116 100644
--- a/contrib/thrift.spec
+++ b/contrib/thrift.spec
@@ -28,7 +28,7 @@
License: Apache License v2.0
Group: Development
Summary: RPC and serialization framework
-Version: 0.18.1
+Version: 0.19.0
Release: 0
URL: http://thrift.apache.org
Packager: Thrift Developers <dev@thrift.apache.org>
diff --git a/contrib/zeromq/csharp/AssemblyInfo.cs b/contrib/zeromq/csharp/AssemblyInfo.cs
index 2c0165c..e785620 100644
--- a/contrib/zeromq/csharp/AssemblyInfo.cs
+++ b/contrib/zeromq/csharp/AssemblyInfo.cs
@@ -36,7 +36,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("0.18.1.0")]
+[assembly: AssemblyVersion("0.19.0.0")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
diff --git a/doc/specs/idl.md b/doc/specs/idl.md
index 3cf0efd..cf8354f 100644
--- a/doc/specs/idl.md
+++ b/doc/specs/idl.md
@@ -1,6 +1,6 @@
## Thrift interface description language
-For Thrift version 0.18.1.
+For Thrift version 0.19.0.
The Thrift interface definition language (IDL) allows for the definition of [Thrift Types](/docs/types). A Thrift IDL file is processed by the Thrift code generator to produce code for the various target languages to support the defined structs and services in the IDL file.
diff --git a/doc/specs/thrift-binary-protocol.md b/doc/specs/thrift-binary-protocol.md
index af4bd81..e751a02 100644
--- a/doc/specs/thrift-binary-protocol.md
+++ b/doc/specs/thrift-binary-protocol.md
@@ -80,7 +80,7 @@
### Double encoding
Values of type `double` are first converted to an int64 according to the IEEE 754 floating-point "double format" bit
-layout. Most run-times provide a library to make this conversion. Both the binary protocol as the compact protocol then
+layout. Most run-times provide a library to make this conversion. Both the binary protocol and the compact protocol then
encode the int64 in 8 bytes in big endian order.
### Boolean encoding
diff --git a/lib/cpp/libthrift.vcxproj b/lib/cpp/libthrift.vcxproj
index 2353cd3..0b5e16d 100644
--- a/lib/cpp/libthrift.vcxproj
+++ b/lib/cpp/libthrift.vcxproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug-mt|Win32">
<Configuration>Debug-mt</Configuration>
@@ -35,41 +35,41 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
- <ClCompile Include="src\thrift\async\TAsyncChannel.cpp"/>
- <ClCompile Include="src\thrift\async\TConcurrentClientSyncInfo.cpp"/>
- <ClCompile Include="src\thrift\concurrency\BoostMonitor.cpp" />
- <ClCompile Include="src\thrift\concurrency\BoostMutex.cpp" />
- <ClCompile Include="src\thrift\concurrency\ThreadManager.cpp"/>
- <ClCompile Include="src\thrift\concurrency\TimerManager.cpp"/>
- <ClCompile Include="src\thrift\concurrency\Util.cpp"/>
- <ClCompile Include="src\thrift\processor\PeekProcessor.cpp"/>
+ <ClCompile Include="src\thrift\async\TAsyncChannel.cpp" />
+ <ClCompile Include="src\thrift\async\TConcurrentClientSyncInfo.cpp" />
+ <ClCompile Include="src\thrift\concurrency\Monitor.cpp" />
+ <ClCompile Include="src\thrift\concurrency\Mutex.cpp" />
+ <ClCompile Include="src\thrift\concurrency\Thread.cpp" />
+ <ClCompile Include="src\thrift\concurrency\ThreadFactory.cpp" />
+ <ClCompile Include="src\thrift\concurrency\ThreadManager.cpp" />
+ <ClCompile Include="src\thrift\concurrency\TimerManager.cpp" />
+ <ClCompile Include="src\thrift\processor\PeekProcessor.cpp" />
<ClCompile Include="src\thrift\protocol\TBase64Utils.cpp" />
- <ClCompile Include="src\thrift\protocol\TDebugProtocol.cpp"/>
- <ClCompile Include="src\thrift\protocol\TJSONProtocol.cpp"/>
- <ClCompile Include="src\thrift\protocol\TProtocol.cpp"/>
- <ClCompile Include="src\thrift\protocol\TMultiplexedProtocol.cpp"/>
- <ClCompile Include="src\thrift\server\TSimpleServer.cpp"/>
- <ClCompile Include="src\thrift\server\TThreadPoolServer.cpp"/>
- <ClCompile Include="src\thrift\server\TThreadedServer.cpp"/>
- <ClCompile Include="src\thrift\server\TConnectedClient.cpp"/>
- <ClCompile Include="src\thrift\server\TNonblockingServer.cpp"/>
- <ClCompile Include="src\thrift\server\TServerFramework.cpp"/>
- <ClCompile Include="src\thrift\TApplicationException.cpp"/>
- <ClCompile Include="src\thrift\TOutput.cpp"/>
- <ClCompile Include="src\thrift\transport\TBufferTransports.cpp"/>
+ <ClCompile Include="src\thrift\protocol\TDebugProtocol.cpp" />
+ <ClCompile Include="src\thrift\protocol\TJSONProtocol.cpp" />
+ <ClCompile Include="src\thrift\protocol\TMultiplexedProtocol.cpp" />
+ <ClCompile Include="src\thrift\protocol\TProtocol.cpp" />
+ <ClCompile Include="src\thrift\server\TConnectedClient.cpp" />
+ <ClCompile Include="src\thrift\server\TServer.cpp" />
+ <ClCompile Include="src\thrift\server\TServerFramework.cpp" />
+ <ClCompile Include="src\thrift\server\TSimpleServer.cpp" />
+ <ClCompile Include="src\thrift\server\TThreadedServer.cpp" />
+ <ClCompile Include="src\thrift\server\TThreadPoolServer.cpp" />
+ <ClCompile Include="src\thrift\TApplicationException.cpp" />
+ <ClCompile Include="src\thrift\TOutput.cpp" />
+ <ClCompile Include="src\thrift\transport\SocketCommon.cpp" />
+ <ClCompile Include="src\thrift\transport\TBufferTransports.cpp" />
<ClCompile Include="src\thrift\transport\TFDTransport.cpp" />
- <ClCompile Include="src\thrift\transport\THttpClient.cpp" />
- <ClCompile Include="src\thrift\transport\THttpServer.cpp" />
- <ClCompile Include="src\thrift\transport\THttpTransport.cpp"/>
+ <ClCompile Include="src\thrift\transport\TFileTransport.cpp" />
+ <ClCompile Include="src\thrift\transport\THttpTransport.cpp" />
<ClCompile Include="src\thrift\transport\TPipe.cpp" />
<ClCompile Include="src\thrift\transport\TPipeServer.cpp" />
- <ClCompile Include="src\thrift\transport\TServerSocket.cpp"/>
+ <ClCompile Include="src\thrift\transport\TServerSocket.cpp" />
<ClCompile Include="src\thrift\transport\TSimpleFileTransport.cpp" />
- <ClCompile Include="src\thrift\transport\TFileTransport.cpp" />
- <ClCompile Include="src\thrift\transport\TSocket.cpp"/>
- <ClCompile Include="src\thrift\transport\TSSLSocket.cpp"/>
- <ClCompile Include="src\thrift\transport\TTransportException.cpp"/>
- <ClCompile Include="src\thrift\transport\TTransportUtils.cpp"/>
+ <ClCompile Include="src\thrift\transport\TSocket.cpp" />
+ <ClCompile Include="src\thrift\transport\TSocketPool.cpp" />
+ <ClCompile Include="src\thrift\transport\TTransportException.cpp" />
+ <ClCompile Include="src\thrift\transport\TTransportUtils.cpp" />
<ClCompile Include="src\thrift\windows\GetTimeOfDay.cpp" />
<ClCompile Include="src\thrift\windows\OverlappedSubmissionThread.cpp" />
<ClCompile Include="src\thrift\windows\SocketPair.cpp" />
@@ -99,15 +99,12 @@
<ClInclude Include="src\thrift\transport\TBufferTransports.h" />
<ClInclude Include="src\thrift\transport\TFDTransport.h" />
<ClInclude Include="src\thrift\transport\TFileTransport.h" />
- <ClInclude Include="src\thrift\transport\THttpClient.h" />
- <ClInclude Include="src\thrift\transport\THttpServer.h" />
<ClInclude Include="src\thrift\transport\TPipe.h" />
<ClInclude Include="src\thrift\transport\TPipeServer.h" />
<ClInclude Include="src\thrift\transport\TServerSocket.h" />
<ClInclude Include="src\thrift\transport\TServerTransport.h" />
<ClInclude Include="src\thrift\transport\TSimpleFileTransport.h" />
<ClInclude Include="src\thrift\transport\TSocket.h" />
- <ClInclude Include="src\thrift\transport\TSSLSocket.h" />
<ClInclude Include="src\thrift\transport\TTransport.h" />
<ClInclude Include="src\thrift\transport\TTransportException.h" />
<ClInclude Include="src\thrift\transport\TTransportUtils.h" />
@@ -134,45 +131,53 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -239,7 +244,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;thrift_EXPORTS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libthrift.pdb</ProgramDataBaseFileName>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
@@ -253,7 +258,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;thrift_EXPORTS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libthrift.pdb</ProgramDataBaseFileName>
<RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
</ClCompile>
@@ -295,7 +300,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;thrift_EXPORTS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libthrift.pdb</ProgramDataBaseFileName>
<RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
</ClCompile>
@@ -313,7 +318,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;thrift_EXPORTS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libthrift.pdb</ProgramDataBaseFileName>
<RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
</ClCompile>
@@ -361,4 +366,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/lib/cpp/libthrift.vcxproj.filters b/lib/cpp/libthrift.vcxproj.filters
index 0e9a9fd..98426fa 100644
--- a/lib/cpp/libthrift.vcxproj.filters
+++ b/lib/cpp/libthrift.vcxproj.filters
@@ -6,9 +6,6 @@
</ClCompile>
<ClCompile Include="src\thrift\TOutput.cpp" />
<ClCompile Include="src\thrift\TApplicationException.cpp" />
- <ClCompile Include="src\thrift\windows\StdAfx.cpp">
- <Filter>windows</Filter>
- </ClCompile>
<ClCompile Include="src\thrift\transport\TTransportException.cpp">
<Filter>transport</Filter>
</ClCompile>
@@ -21,9 +18,6 @@
<ClCompile Include="src\thrift\concurrency\TimerManager.cpp">
<Filter>concurrency</Filter>
</ClCompile>
- <ClCompile Include="src\thrift\concurrency\Util.cpp">
- <Filter>concurrency</Filter>
- </ClCompile>
<ClCompile Include="src\thrift\protocol\TDebugProtocol.cpp">
<Filter>protocol</Filter>
</ClCompile>
@@ -48,15 +42,6 @@
<ClCompile Include="src\thrift\transport\THttpTransport.cpp">
<Filter>transport</Filter>
</ClCompile>
- <ClCompile Include="src\thrift\transport\THttpClient.cpp">
- <Filter>transport</Filter>
- </ClCompile>
- <ClCompile Include="src\thrift\transport\THttpServer.cpp">
- <Filter>transport</Filter>
- </ClCompile>
- <ClCompile Include="src\thrift\transport\TSSLSocket.cpp">
- <Filter>transport</Filter>
- </ClCompile>
<ClCompile Include="src\thrift\transport\TTransportUtils.cpp">
<Filter>transport</Filter>
</ClCompile>
@@ -90,12 +75,6 @@
<ClCompile Include="src\thrift\windows\SocketPair.cpp">
<Filter>windows</Filter>
</ClCompile>
- <ClCompile Include="src\thrift\concurrency\BoostMonitor.cpp">
- <Filter>concurrency</Filter>
- </ClCompile>
- <ClCompile Include="src\thrift\concurrency\BoostMutex.cpp">
- <Filter>concurrency</Filter>
- </ClCompile>
<ClCompile Include="src\thrift\windows\WinFcntl.cpp">
<Filter>windows</Filter>
</ClCompile>
@@ -105,6 +84,17 @@
<ClCompile Include="src\thrift\transport\TPipeServer.cpp">
<Filter>transport</Filter>
</ClCompile>
+ <ClCompile Include="src\thrift\concurrency\Monitor.cpp" />
+ <ClCompile Include="src\thrift\concurrency\Mutex.cpp" />
+ <ClCompile Include="src\thrift\concurrency\Thread.cpp" />
+ <ClCompile Include="src\thrift\concurrency\ThreadFactory.cpp" />
+ <ClCompile Include="src\thrift\protocol\TProtocol.cpp" />
+ <ClCompile Include="src\thrift\server\TConnectedClient.cpp" />
+ <ClCompile Include="src\thrift\server\TServer.cpp" />
+ <ClCompile Include="src\thrift\server\TServerFramework.cpp" />
+ <ClCompile Include="src\thrift\transport\SocketCommon.cpp" />
+ <ClCompile Include="src\thrift\transport\TSocketPool.cpp" />
+ <ClCompile Include="src\thrift\windows\OverlappedSubmissionThread.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\thrift\transport\TBufferTransports.h">
@@ -119,12 +109,6 @@
<ClInclude Include="src\thrift\Thrift.h" />
<ClInclude Include="src\thrift\TProcessor.h" />
<ClInclude Include="src\thrift\TApplicationException.h" />
- <ClInclude Include="src\thrift\windows\StdAfx.h">
- <Filter>windows</Filter>
- </ClInclude>
- <ClInclude Include="src\thrift\windows\TargetVersion.h">
- <Filter>windows</Filter>
- </ClInclude>
<ClInclude Include="src\thrift\concurrency\Exception.h">
<Filter>concurrency</Filter>
</ClInclude>
@@ -182,15 +166,6 @@
<ClInclude Include="src\thrift\transport\TFileTransport.h">
<Filter>transport</Filter>
</ClInclude>
- <ClInclude Include="src\thrift\transport\THttpClient.h">
- <Filter>transport</Filter>
- </ClInclude>
- <ClInclude Include="src\thrift\transport\THttpServer.h">
- <Filter>transport</Filter>
- </ClInclude>
- <ClInclude Include="src\thrift\transport\TSSLSocket.h">
- <Filter>transport</Filter>
- </ClInclude>
<ClInclude Include="src\thrift\transport\TTransportUtils.h">
<Filter>transport</Filter>
</ClInclude>
@@ -218,9 +193,6 @@
<ClInclude Include="src\thrift\windows\SocketPair.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\thrift\windows\force_inc.h">
- <Filter>windows</Filter>
- </ClInclude>
<ClInclude Include="src\thrift\windows\WinFcntl.h">
<Filter>windows</Filter>
</ClInclude>
@@ -230,6 +202,8 @@
<ClInclude Include="src\thrift\transport\TPipeServer.h">
<Filter>transport</Filter>
</ClInclude>
+ <ClInclude Include="src\thrift\TOutput.h" />
+ <ClInclude Include="src\thrift\windows\OverlappedSubmissionThread.h" />
</ItemGroup>
<ItemGroup>
<Filter Include="protocol">
@@ -261,8 +235,5 @@
<None Include="src\thrift\protocol\TBinaryProtocol.tcc">
<Filter>protocol</Filter>
</None>
- <None Include="src\thrift\windows\tr1\functional">
- <Filter>windows\tr1</Filter>
- </None>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/lib/cpp/libthriftnb.vcxproj b/lib/cpp/libthriftnb.vcxproj
old mode 100755
new mode 100644
index dc6764e..9d80ba7
--- a/lib/cpp/libthriftnb.vcxproj
+++ b/lib/cpp/libthriftnb.vcxproj
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug-mt|Win32">
<Configuration>Debug-mt</Configuration>
@@ -64,45 +64,53 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-mt|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-mt|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -170,7 +178,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;thrift_EXPORTS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libthriftnb.pdb</ProgramDataBaseFileName>
<RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
</ClCompile>
@@ -185,7 +193,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;thrift_EXPORTS;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libthriftnb.pdb</ProgramDataBaseFileName>
<RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
</ClCompile>
@@ -230,7 +238,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;thrift_EXPORTS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libthriftnb.pdb</ProgramDataBaseFileName>
<RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
</ClCompile>
@@ -249,7 +257,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>HAVE_CONFIG_H=1;WIN32;thrift_EXPORTS;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ProgramDataBaseFileName>$(IntDir)libthriftnb.pdb</ProgramDataBaseFileName>
<RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
</ClCompile>
diff --git a/lib/cpp/libthriftnb.vcxproj.filters b/lib/cpp/libthriftnb.vcxproj.filters
index 85703dd..314d454 100644
--- a/lib/cpp/libthriftnb.vcxproj.filters
+++ b/lib/cpp/libthriftnb.vcxproj.filters
@@ -27,9 +27,6 @@
<ClCompile Include="src\thrift\async\TAsyncProtocolProcessor.cpp">
<Filter>async</Filter>
</ClCompile>
- <ClCompile Include="src\thrift\windows\StdAfx.cpp">
- <Filter>windows</Filter>
- </ClCompile>
<ClCompile Include="src\thrift\transport\TNonblockingServerSocket.cpp">
<Filter>transport</Filter>
</ClCompile>
@@ -53,9 +50,6 @@
<ClInclude Include="src\thrift\windows\config.h">
<Filter>windows</Filter>
</ClInclude>
- <ClInclude Include="src\thrift\windows\StdAfx.h">
- <Filter>windows</Filter>
- </ClInclude>
<ClInclude Include="src\thrift\windows\TargetVersion.h">
<Filter>windows</Filter>
</ClInclude>
@@ -72,4 +66,4 @@
<Filter>transport</Filter>
</ClInclude>
</ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc b/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
index 755f243..c448e77 100644
--- a/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
+++ b/lib/cpp/src/thrift/protocol/TBinaryProtocol.tcc
@@ -448,9 +448,9 @@
}
// Try to borrow first
- const uint8_t* borrow_buf;
uint32_t got = size;
- if ((borrow_buf = this->trans_->borrow(nullptr, &got))) {
+ const uint8_t* borrow_buf = this->trans_->borrow(nullptr, &got);
+ if (borrow_buf) {
str.assign((const char*)borrow_buf, size);
this->trans_->consume(size);
return size;
diff --git a/lib/cpp/test/SecurityFromBufferTest.cpp b/lib/cpp/test/SecurityFromBufferTest.cpp
index d275191..194e67f 100644
--- a/lib/cpp/test/SecurityFromBufferTest.cpp
+++ b/lib/cpp/test/SecurityFromBufferTest.cpp
@@ -198,15 +198,16 @@
try {
// matrix of connection success between client and server with different SSLProtocol selections
static_assert(apache::thrift::transport::LATEST == 5, "Mismatch in assumed number of ssl protocols");
+ bool ossl1 = OPENSSL_VERSION_MAJOR == 1;
bool matrix[apache::thrift::transport::LATEST + 1][apache::thrift::transport::LATEST + 1] =
{
// server = SSLTLS SSLv2 SSLv3 TLSv1_0 TLSv1_1 TLSv1_2
// client
- /* SSLTLS */ { true, false, false, true, true, true },
+ /* SSLTLS */ { true, false, false, ossl1, ossl1, true },
/* SSLv2 */ { false, false, false, false, false, false },
/* SSLv3 */ { false, false, true, false, false, false },
- /* TLSv1_0 */ { true, false, false, true, false, false },
- /* TLSv1_1 */ { true, false, false, false, true, false },
+ /* TLSv1_0 */ { ossl1, false, false, ossl1, false, false },
+ /* TLSv1_1 */ { ossl1, false, false, false, ossl1, false },
/* TLSv1_2 */ { true, false, false, false, false, true }
};
diff --git a/lib/cpp/test/SecurityTest.cpp b/lib/cpp/test/SecurityTest.cpp
index cba8768..df0cdaf 100644
--- a/lib/cpp/test/SecurityTest.cpp
+++ b/lib/cpp/test/SecurityTest.cpp
@@ -220,15 +220,16 @@
{
// matrix of connection success between client and server with different SSLProtocol selections
static_assert(apache::thrift::transport::LATEST == 5, "Mismatch in assumed number of ssl protocols");
+ bool ossl1 = OPENSSL_VERSION_MAJOR == 1;
bool matrix[apache::thrift::transport::LATEST + 1][apache::thrift::transport::LATEST + 1] =
{
// server = SSLTLS SSLv2 SSLv3 TLSv1_0 TLSv1_1 TLSv1_2
// client
- /* SSLTLS */ { true, false, false, true, true, true },
+ /* SSLTLS */ { true, false, false, ossl1, ossl1, true },
/* SSLv2 */ { false, false, false, false, false, false },
/* SSLv3 */ { false, false, true, false, false, false },
- /* TLSv1_0 */ { true, false, false, true, false, false },
- /* TLSv1_1 */ { true, false, false, false, true, false },
+ /* TLSv1_0 */ { ossl1, false, false, ossl1, false, false },
+ /* TLSv1_1 */ { ossl1, false, false, false, ossl1, false },
/* TLSv1_2 */ { true, false, false, false, false, true }
};
diff --git a/lib/d/src/thrift/base.d b/lib/d/src/thrift/base.d
index 980db9d..dbf1429 100644
--- a/lib/d/src/thrift/base.d
+++ b/lib/d/src/thrift/base.d
@@ -50,7 +50,7 @@
/// The Thrift version string, used for informative purposes.
// Note: This is currently hardcoded, but will likely be filled in by the build
// system in future versions.
-enum VERSION = "0.18.1";
+enum VERSION = "0.19.0";
/**
* Functions used for logging inside Thrift.
diff --git a/lib/dart/pubspec.yaml b/lib/dart/pubspec.yaml
index 4716c20..f16c3ea 100644
--- a/lib/dart/pubspec.yaml
+++ b/lib/dart/pubspec.yaml
@@ -16,7 +16,7 @@
# under the License.
name: thrift
-version: 0.18.1
+version: 0.19.0
description: >
A Dart library for Apache Thrift
author: Apache Thrift Developers <dev@thrift.apache.org>
diff --git a/lib/delphi/src/Thrift.Collections.pas b/lib/delphi/src/Thrift.Collections.pas
index 36a8d96..2cb2395 100644
--- a/lib/delphi/src/Thrift.Collections.pas
+++ b/lib/delphi/src/Thrift.Collections.pas
@@ -66,7 +66,7 @@
TThriftDictionaryImpl<TKey,TValue> = class( TInterfacedObject, IThriftDictionary<TKey,TValue>, IThriftContainer, ISupportsToString)
strict private
- FDictionaly : TDictionary<TKey,TValue>;
+ FDictionary : TDictionary<TKey,TValue>;
strict protected
function GetEnumerator: TEnumerator<TPair<TKey,TValue>>;
@@ -93,7 +93,8 @@
property Keys: TDictionary<TKey,TValue>.TKeyCollection read GetKeys;
property Values: TDictionary<TKey,TValue>.TValueCollection read GetValues;
public
- constructor Create(ACapacity: Integer = 0);
+ constructor Create( const aCapacity: Integer = 0); overload;
+ constructor Create( const aCapacity: Integer; const aComparer : IEqualityComparer<TKey>); overload;
destructor Destroy; override;
function ToString : string; override;
end;
@@ -185,7 +186,7 @@
property Count: Integer read GetCount write SetCount;
property Items[Index: Integer]: T read GetItem write SetItem; default;
public
- constructor Create;
+ constructor Create( const aCapacity: Integer = 0);
destructor Destroy; override;
function ToString : string; override;
end;
@@ -228,7 +229,8 @@
procedure CopyTo(var A: TArray<TValue>; arrayIndex: Integer);
function Remove( const item: TValue ): Boolean;
public
- constructor Create;
+ constructor Create( const aCapacity: Integer = 0); overload;
+ constructor Create( const aCapacity: Integer; const aComparer : IEqualityComparer<TValue>); overload;
function ToString : string; override;
end;
@@ -271,10 +273,16 @@
end;
end;
-constructor TThriftHashSetImpl<TValue>.Create;
+constructor TThriftHashSetImpl<TValue>.Create( const aCapacity: Integer);
begin
- inherited;
- FDictionary := TThriftDictionaryImpl<TValue,Integer>.Create;
+ inherited Create;
+ FDictionary := TThriftDictionaryImpl<TValue,Integer>.Create( aCapacity);
+end;
+
+constructor TThriftHashSetImpl<TValue>.Create( const aCapacity: Integer; const aComparer : IEqualityComparer<TValue>);
+begin
+ inherited Create;
+ FDictionary := TThriftDictionaryImpl<TValue,Integer>.Create( aCapacity, aComparer);
end;
function TThriftHashSetImpl<TValue>.GetCount: Integer;
@@ -329,85 +337,91 @@
procedure TThriftDictionaryImpl<TKey, TValue>.Add(const Key: TKey;
const Value: TValue);
begin
- FDictionaly.Add( Key, Value);
+ FDictionary.Add( Key, Value);
end;
procedure TThriftDictionaryImpl<TKey, TValue>.AddOrSetValue(const Key: TKey;
const Value: TValue);
begin
- FDictionaly.AddOrSetValue( Key, Value);
+ FDictionary.AddOrSetValue( Key, Value);
end;
procedure TThriftDictionaryImpl<TKey, TValue>.Clear;
begin
- FDictionaly.Clear;
+ FDictionary.Clear;
end;
function TThriftDictionaryImpl<TKey, TValue>.ContainsKey(
const Key: TKey): Boolean;
begin
- Result := FDictionaly.ContainsKey( Key );
+ Result := FDictionary.ContainsKey( Key );
end;
function TThriftDictionaryImpl<TKey, TValue>.ContainsValue(
const Value: TValue): Boolean;
begin
- Result := FDictionaly.ContainsValue( Value );
+ Result := FDictionary.ContainsValue( Value );
end;
-constructor TThriftDictionaryImpl<TKey, TValue>.Create(ACapacity: Integer);
+constructor TThriftDictionaryImpl<TKey, TValue>.Create(const aCapacity: Integer);
begin
inherited Create;
- FDictionaly := TDictionary<TKey,TValue>.Create( ACapacity );
+ FDictionary := TDictionary<TKey,TValue>.Create( aCapacity);
+end;
+
+constructor TThriftDictionaryImpl<TKey, TValue>.Create(const aCapacity: Integer; const aComparer : IEqualityComparer<TKey>);
+begin
+ inherited Create;
+ FDictionary := TDictionary<TKey,TValue>.Create( aCapacity, aComparer);
end;
destructor TThriftDictionaryImpl<TKey, TValue>.Destroy;
begin
- FDictionaly.Free;
+ FDictionary.Free;
inherited;
end;
{$IF CompilerVersion >= 21.0}
function TThriftDictionaryImpl<TKey, TValue>.ExtractPair( const Key: TKey): TPair<TKey, TValue>;
begin
- Result := FDictionaly.ExtractPair( Key);
+ Result := FDictionary.ExtractPair( Key);
end;
{$IFEND}
function TThriftDictionaryImpl<TKey, TValue>.GetCount: Integer;
begin
- Result := FDictionaly.Count;
+ Result := FDictionary.Count;
end;
function TThriftDictionaryImpl<TKey, TValue>.GetEnumerator: TEnumerator<TPair<TKey, TValue>>;
begin
- Result := FDictionaly.GetEnumerator;
+ Result := FDictionary.GetEnumerator;
end;
function TThriftDictionaryImpl<TKey, TValue>.GetItem(const Key: TKey): TValue;
begin
- Result := FDictionaly.Items[Key];
+ Result := FDictionary.Items[Key];
end;
function TThriftDictionaryImpl<TKey, TValue>.GetKeys: TDictionary<TKey, TValue>.TKeyCollection;
begin
- Result := FDictionaly.Keys;
+ Result := FDictionary.Keys;
end;
function TThriftDictionaryImpl<TKey, TValue>.GetValues: TDictionary<TKey, TValue>.TValueCollection;
begin
- Result := FDictionaly.Values;
+ Result := FDictionary.Values;
end;
procedure TThriftDictionaryImpl<TKey, TValue>.Remove(const Key: TKey);
begin
- FDictionaly.Remove( Key );
+ FDictionary.Remove( Key );
end;
procedure TThriftDictionaryImpl<TKey, TValue>.SetItem(const Key: TKey;
const Value: TValue);
begin
- FDictionaly.AddOrSetValue( Key, Value);
+ FDictionary.AddOrSetValue( Key, Value);
end;
function TThriftDictionaryImpl<TKey, TValue>.ToArray: TArray<TPair<TKey, TValue>>;
@@ -426,7 +440,7 @@
Inc( i );
end;
{$ELSE}
- Result := FDictionaly.ToArray;
+ Result := FDictionary.ToArray;
{$IFEND}
end;
@@ -438,7 +452,7 @@
sb := TThriftStringBuilder.Create('{');
try
first := TRUE;
- for pair in FDictionaly do begin
+ for pair in FDictionary do begin
if first
then first := FALSE
else sb.Append(', ');
@@ -458,13 +472,13 @@
procedure TThriftDictionaryImpl<TKey, TValue>.TrimExcess;
begin
- FDictionaly.TrimExcess;
+ FDictionary.TrimExcess;
end;
function TThriftDictionaryImpl<TKey, TValue>.TryGetValue(const Key: TKey;
out Value: TValue): Boolean;
begin
- Result := FDictionaly.TryGetValue( Key, Value);
+ Result := FDictionary.TryGetValue( Key, Value);
end;
{ TThriftListImpl<T> }
@@ -511,10 +525,13 @@
Result := FList.Contains( Value );
end;
-constructor TThriftListImpl<T>.Create;
+constructor TThriftListImpl<T>.Create( const aCapacity: Integer);
begin
- inherited;
+ inherited Create;
FList := TList<T>.Create;
+
+ if aCapacity > 0
+ then FList.Capacity := aCapacity;
end;
procedure TThriftListImpl<T>.Delete(Index: Integer);
diff --git a/lib/delphi/src/Thrift.pas b/lib/delphi/src/Thrift.pas
index b18ffad..b725ebc 100644
--- a/lib/delphi/src/Thrift.pas
+++ b/lib/delphi/src/Thrift.pas
@@ -28,7 +28,7 @@
Thrift.Protocol;
const
- Version = '0.18.1';
+ Version = '0.19.0';
type
TException = Thrift.Exception.TException; // compatibility alias
diff --git a/lib/erl/src/thrift.app.src b/lib/erl/src/thrift.app.src
index 3d98c07..c681a2f 100644
--- a/lib/erl/src/thrift.app.src
+++ b/lib/erl/src/thrift.app.src
@@ -22,7 +22,7 @@
{description, "Thrift bindings"},
% The version of the applicaton
- {vsn, "0.18.1"},
+ {vsn, "0.19.0"},
% All modules used by the application.
{modules, [
diff --git a/lib/haxe/haxelib.json b/lib/haxe/haxelib.json
index 53e128e..c2dab34 100644
--- a/lib/haxe/haxelib.json
+++ b/lib/haxe/haxelib.json
@@ -10,7 +10,7 @@
"framework"
],
"description": "Haxe bindings for the Apache Thrift RPC and serialization framework",
- "version": "0.18.1",
+ "version": "0.19.0",
"releasenote": "Licensed under Apache License, Version 2.0. The Apache Thrift compiler needs to be installed separately.",
"contributors": ["ApacheThrift"],
"dependencies": {
diff --git a/lib/java/gradle.properties b/lib/java/gradle.properties
index 07f0b62..917b24b 100644
--- a/lib/java/gradle.properties
+++ b/lib/java/gradle.properties
@@ -1,7 +1,7 @@
# This file is shared currently between this Gradle build and the
# Ant builds for fd303 and JavaScript. Keep the dotted notation for
# the properties to minimize the changes in the dependencies.
-thrift.version=0.18.1
+thrift.version=0.19.0
thrift.groupid=org.apache.thrift
release=false
diff --git a/lib/js/package-lock.json b/lib/js/package-lock.json
index 3eedc15..2697f4a 100644
--- a/lib/js/package-lock.json
+++ b/lib/js/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "thrift",
- "version": "0.18.1",
+ "version": "0.19.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/lib/js/package.json b/lib/js/package.json
index 49f1a72..57b4bb2 100644
--- a/lib/js/package.json
+++ b/lib/js/package.json
@@ -1,6 +1,6 @@
{
"name": "thrift",
- "version": "0.18.1",
+ "version": "0.19.0",
"description": "Thrift is a software framework for scalable cross-language services development.",
"main": "./src/thrift",
"author": {
diff --git a/lib/js/src/thrift.js b/lib/js/src/thrift.js
index e18e251..78fdfb2 100644
--- a/lib/js/src/thrift.js
+++ b/lib/js/src/thrift.js
@@ -46,7 +46,7 @@
* @const {string} Version
* @memberof Thrift
*/
- Version: '0.18.1',
+ Version: '0.19.0',
/**
* Thrift IDL type string to Id mapping.
diff --git a/lib/lua/Thrift.lua b/lib/lua/Thrift.lua
index ed052e1..c249278 100644
--- a/lib/lua/Thrift.lua
+++ b/lib/lua/Thrift.lua
@@ -48,7 +48,7 @@
return count
end
-version = '0.18.1'
+version = '0.19.0'
TType = {
STOP = 0,
diff --git a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
index 0e29b3b..aed36cd 100644
--- a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
+++ b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
@@ -20,14 +20,14 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<TieredCompilation>false</TieredCompilation>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+ <PackageReference Include="BenchmarkDotNet" Version="0.13.4" />
</ItemGroup>
<ItemGroup>
@@ -35,7 +35,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
+ <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
</ItemGroup>
</Project>
diff --git a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
index c353da3..19065c6 100644
--- a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
+++ b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
@@ -19,10 +19,10 @@
-->
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<AssemblyName>Thrift.IntegrationTests</AssemblyName>
<PackageId>Thrift.IntegrationTests</PackageId>
- <Version>0.18.1.0</Version>
+ <Version>0.19.0.0</Version>
<OutputType>Exe</OutputType>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
@@ -34,11 +34,11 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="CompareNETObjects" Version="4.74.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
- <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
- <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
- <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
+ <PackageReference Include="CompareNETObjects" Version="4.79.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+ <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+ <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+ <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Thrift\Thrift.csproj" />
@@ -47,7 +47,7 @@
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<ItemGroup>
- <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
+ <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj
index 4597d53..990b240 100644
--- a/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj
+++ b/lib/netstd/Tests/Thrift.PublicInterfaces.Compile.Tests/Thrift.PublicInterfaces.Compile.Tests.csproj
@@ -19,9 +19,9 @@
-->
<PropertyGroup>
- <ThriftVersion>0.18.1</ThriftVersion>
+ <ThriftVersion>0.19.0</ThriftVersion>
<ThriftVersionOutput>Thrift version $(ThriftVersion)</ThriftVersionOutput>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<Version>$(ThriftVersion).0</Version>
<AssemblyName>Thrift.PublicInterfaces.Compile.Tests</AssemblyName>
<PackageId>Thrift.PublicInterfaces.Compile.Tests</PackageId>
@@ -37,11 +37,11 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
+ <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" />
</ItemGroup>
<ItemGroup>
- <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
+ <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
</ItemGroup>
<Target Name="PreBuild" BeforeTargets="_GenerateRestoreProjectSpec;Restore;Compile">
diff --git a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
index c412fa0..bae55ea 100644
--- a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
+++ b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
@@ -19,17 +19,17 @@
-->
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
- <Version>0.18.1.0</Version>
+ <TargetFramework>net7.0</TargetFramework>
+ <Version>0.19.0.0</Version>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="CompareNETObjects" Version="4.74.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
- <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
- <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
- <PackageReference Include="NSubstitute" Version="4.2.2" />
+ <PackageReference Include="CompareNETObjects" Version="4.79.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+ <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+ <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
+ <PackageReference Include="NSubstitute" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
@@ -42,6 +42,6 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
+ <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/lib/netstd/Thrift/Properties/AssemblyInfo.cs b/lib/netstd/Thrift/Properties/AssemblyInfo.cs
index 387033e..3dd0cc6 100644
--- a/lib/netstd/Thrift/Properties/AssemblyInfo.cs
+++ b/lib/netstd/Thrift/Properties/AssemblyInfo.cs
@@ -52,5 +52,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("0.18.1.0")]
-[assembly: AssemblyFileVersion("0.18.1.0")]
+[assembly: AssemblyVersion("0.19.0.0")]
+[assembly: AssemblyFileVersion("0.19.0.0")]
diff --git a/lib/netstd/Thrift/Thrift.csproj b/lib/netstd/Thrift/Thrift.csproj
index 84521d5..760ffe4 100644
--- a/lib/netstd/Thrift/Thrift.csproj
+++ b/lib/netstd/Thrift/Thrift.csproj
@@ -19,7 +19,7 @@
-->
<PropertyGroup>
- <TargetFrameworks>netstandard2.1;netstandard2.0;net6.0</TargetFrameworks>
+ <TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net7.0</TargetFrameworks>
<AssemblyName>Thrift</AssemblyName>
<PackageId>ApacheThrift</PackageId>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -40,8 +40,8 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>thrift.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
- <Title>Apache Thrift 0.18.1</Title>
- <Version>0.18.1.0</Version>
+ <Title>Apache Thrift 0.19.0</Title>
+ <Version>0.19.0.0</Version>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
<PackageProjectUrl>http://thrift.apache.org/</PackageProjectUrl>
<Authors>Apache Thrift Developers</Authors>
@@ -50,19 +50,19 @@
<PackageDescription>C# .NET Core bindings for the Apache Thrift RPC system</PackageDescription>
<PackageReleaseNotes></PackageReleaseNotes>
<PackageTags>Apache Thrift RPC</PackageTags>
- <PackageReleaseNotes>https://github.com/apache/thrift/blob/0.18.1/CHANGES.md</PackageReleaseNotes>
+ <PackageReleaseNotes>https://github.com/apache/thrift/blob/0.19.0/CHANGES.md</PackageReleaseNotes>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Copyright>Copyright 2023 The Apache Software Foundation</Copyright>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
- <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
- <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="System.IO.Pipes" Version="[4.3,)" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
- <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0" />
+ <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0" />
<PackageReference Include="System.Net.NameResolution" Version="[4.3,)" />
<PackageReference Include="System.Net.Requests" Version="[4.3,)" />
<PackageReference Include="System.Net.Security" Version="4.3.2" />
@@ -70,11 +70,11 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" />
+ <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
</ItemGroup>
<ItemGroup>
- <None Include="..\README.md" Pack="true" PackagePath="\"/>
+ <None Include="..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>
<Target Name="SetTFMAssemblyAttributesPath" BeforeTargets="GenerateTargetFrameworkMonikerAttribute">
diff --git a/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs b/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs
index 8ad62aa..66018b0 100644
--- a/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs
+++ b/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs
@@ -32,13 +32,6 @@
namespace Thrift.Transport.Server
{
- [Obsolete("NamedPipeClientFlags is deprecated, use NamedPipeServerFlags instead.")]
- [Flags]
- public enum NamedPipeClientFlags { // bad name
- None = 0x00,
- OnlyLocalClients = 0x01
- };
-
[Flags]
public enum NamedPipeServerFlags
{
@@ -84,18 +77,6 @@
_numListenPipes = (byte)numListenPipes;
}
- [Obsolete("NamedPipeClientFlags is deprecated, use NamedPipeServerFlags instead.")]
- public TNamedPipeServerTransport(string pipeAddress, TConfiguration config, NamedPipeClientFlags flags, int numListenPipes = 1)
- : base(config)
- {
- if ((numListenPipes < 1) || (numListenPipes > 254))
- throw new ArgumentOutOfRangeException(nameof(numListenPipes), "Value must be in the range of [1..254]");
-
- _pipeAddress = pipeAddress;
- _onlyLocalClients = flags.HasFlag(NamedPipeClientFlags.OnlyLocalClients);
- _numListenPipes = (byte)numListenPipes;
- }
-
public override bool IsOpen() {
return true;
diff --git a/lib/ocaml/_oasis b/lib/ocaml/_oasis
index 4014d81..cd4a0c7 100644
--- a/lib/ocaml/_oasis
+++ b/lib/ocaml/_oasis
@@ -1,5 +1,5 @@
Name: libthrift-ocaml
-Version: 0.18.1
+Version: 0.19.0
OASISFormat: 0.3
Synopsis: OCaml bindings for the Apache Thrift RPC system
Authors: Apache Thrift Developers <dev@thrift.apache.org>
diff --git a/lib/perl/lib/Thrift.pm b/lib/perl/lib/Thrift.pm
index bb41d45..08eb841 100644
--- a/lib/perl/lib/Thrift.pm
+++ b/lib/perl/lib/Thrift.pm
@@ -31,6 +31,6 @@
#
package Thrift;
-use version 0.77; our $VERSION = version->declare("v0.18.1");
+use version 0.77; our $VERSION = version->declare("v0.19.0");
1;
diff --git a/lib/py/setup.py b/lib/py/setup.py
index e4d58f9..6e365f8 100644
--- a/lib/py/setup.py
+++ b/lib/py/setup.py
@@ -105,7 +105,7 @@
twisted_deps = ['twisted']
setup(name='thrift',
- version='0.18.1',
+ version='0.19.0',
description='Python bindings for the Apache Thrift RPC system',
long_description=read_file("README.md"),
long_description_content_type="text/markdown",
diff --git a/lib/rb/thrift.gemspec b/lib/rb/thrift.gemspec
index 17462b0..f6ac77c 100644
--- a/lib/rb/thrift.gemspec
+++ b/lib/rb/thrift.gemspec
@@ -3,7 +3,7 @@
Gem::Specification.new do |s|
s.name = 'thrift'
- s.version = '0.18.1'
+ s.version = '0.19.0'
s.authors = ['Apache Thrift Developers']
s.email = ['dev@thrift.apache.org']
s.homepage = 'http://thrift.apache.org'
diff --git a/lib/rs/Cargo.toml b/lib/rs/Cargo.toml
index dd27060..4b3c857 100644
--- a/lib/rs/Cargo.toml
+++ b/lib/rs/Cargo.toml
@@ -2,7 +2,7 @@
name = "thrift"
description = "Rust bindings for the Apache Thrift RPC system"
edition = "2021"
-version = "0.18.1"
+version = "0.19.0"
license = "Apache-2.0"
authors = ["Apache Thrift Developers <dev@thrift.apache.org>"]
homepage = "http://thrift.apache.org"
diff --git a/lib/st/package.xml b/lib/st/package.xml
index 5c9e374..63dd3af 100644
--- a/lib/st/package.xml
+++ b/lib/st/package.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<!-- Apache Thrift Smalltalk library version 0.18.1 -->
+<!-- Apache Thrift Smalltalk library version 0.19.0 -->
<package>
<name>libthrift-st</name>
<file>thrift.st</file>
diff --git a/lib/swift/Sources/Thrift.swift b/lib/swift/Sources/Thrift.swift
index 6033312..df1b658 100644
--- a/lib/swift/Sources/Thrift.swift
+++ b/lib/swift/Sources/Thrift.swift
@@ -1,3 +1,3 @@
class Thrift {
- let version = "0.18.1"
+ let version = "0.19.0"
}
diff --git a/lib/swift/Tests/ThriftTests/ThriftTests.swift b/lib/swift/Tests/ThriftTests/ThriftTests.swift
index 8a3a8a0..aea9bc8 100644
--- a/lib/swift/Tests/ThriftTests/ThriftTests.swift
+++ b/lib/swift/Tests/ThriftTests/ThriftTests.swift
@@ -3,7 +3,7 @@
class ThriftTests: XCTestCase {
func testVersion() {
- XCTAssertEqual(Thrift().version, "0.18.1")
+ XCTAssertEqual(Thrift().version, "0.19.0")
}
static var allTests : [(String, (ThriftTests) -> () throws -> Void)] {
diff --git a/lib/ts/package-lock.json b/lib/ts/package-lock.json
index 7e8382a..fed7fe4 100644
--- a/lib/ts/package-lock.json
+++ b/lib/ts/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "thrift",
- "version": "0.18.1",
+ "version": "0.19.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/lib/ts/package.json b/lib/ts/package.json
index 97da5c4..2d93d32 100644
--- a/lib/ts/package.json
+++ b/lib/ts/package.json
@@ -1,6 +1,6 @@
{
"name": "thrift",
- "version": "0.18.1",
+ "version": "0.19.0",
"description": "Thrift is a software framework for scalable cross-language services development.",
"author": {
"name": "Apache Thrift Developers",
diff --git a/package-lock.json b/package-lock.json
index c2b9b68..df62965 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "thrift",
- "version": "0.18.1",
+ "version": "0.19.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index cce14ba..84080a6 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
"type": "git",
"url": "https://github.com/apache/thrift.git"
},
- "version": "0.18.1",
+ "version": "0.19.0",
"author": {
"name": "Apache Thrift Developers",
"email": "dev@thrift.apache.org",
diff --git a/sonar-project.properties b/sonar-project.properties
index 464f75e..cac8e8c 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -16,7 +16,7 @@
services that work efficiently and seamlessly between all major languages.
# Apache Thrift Version
-sonar.projectVersion=0.18.1
+sonar.projectVersion=0.19.0
# use this to set another version string
# $ sonar-runner -D sonar.projectVersion=`git rev-parse HEAD`
# set projectDate in combination with projectVersion for imports of old releases
@@ -54,7 +54,7 @@
module1.sonar.projectBaseDir=lib/java
module1.sonar.sources=src
module1.sonar.tests=test
-module1.sonar.binaries=build/libs/libthrift-0.18.1.jar
+module1.sonar.binaries=build/libs/libthrift-0.19.0.jar
module1.sonar.libraries=build/deps/*.jar
module1.sonar.language=java
@@ -62,7 +62,7 @@
module2.sonar.projectBaseDir=.
module2.sonar.sources=tutorial/java/src, tutorial/java/gen-java
module2.sonar.binaries=tutorial/java/tutorial.jar
-module2.sonar.libraries=lib/java/build/deps/*.jar,lib/java/build/libs/libthrift-0.18.1.jar
+module2.sonar.libraries=lib/java/build/deps/*.jar,lib/java/build/libs/libthrift-0.19.0.jar
module2.sonar.language=java
module3.sonar.projectName=Apache Thrift - JavaScript Library
diff --git a/test/dart/test_client/pubspec.yaml b/test/dart/test_client/pubspec.yaml
index 87db077..c34d693 100644
--- a/test/dart/test_client/pubspec.yaml
+++ b/test/dart/test_client/pubspec.yaml
@@ -16,7 +16,7 @@
# under the License.
name: thrift_test_client
-version: 0.18.1
+version: 0.19.0
description: A client integration test for the Dart Thrift library
author: Apache Thrift Developers <dev@thrift.apache.org>
homepage: http://thrift.apache.org
diff --git a/test/erl/src/thrift_test.app.src b/test/erl/src/thrift_test.app.src
index dd4e00e..4a850d0 100644
--- a/test/erl/src/thrift_test.app.src
+++ b/test/erl/src/thrift_test.app.src
@@ -22,7 +22,7 @@
{description, "Thrift cross language test"},
% The version of the applicaton
- {vsn, "0.18.1"},
+ {vsn, "0.19.0"},
% All modules used by the application.
{modules, [
diff --git a/test/go/go.mod b/test/go/go.mod
index 0143eba..245dd2e 100644
--- a/test/go/go.mod
+++ b/test/go/go.mod
@@ -7,11 +7,4 @@
github.com/golang/mock v1.6.0
)
-require (
- golang.org/x/mod v0.4.2 // indirect
- golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
- golang.org/x/tools v0.1.1 // indirect
- golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-)
-
replace github.com/apache/thrift => ../../
diff --git a/test/go/go.sum b/test/go/go.sum
index 6904b3e..d067127 100644
--- a/test/go/go.sum
+++ b/test/go/go.sum
@@ -3,7 +3,6 @@
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -14,16 +13,13 @@
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.1 h1:wGiQel/hW0NnEkJUk8lbzkX2gFJU6PFxf1v5OlCfuOs=
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/test/netstd/Client/Client.csproj b/test/netstd/Client/Client.csproj
index afbdda7..bd7d1ee 100644
--- a/test/netstd/Client/Client.csproj
+++ b/test/netstd/Client/Client.csproj
@@ -19,12 +19,12 @@
-->
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<AssemblyName>Client</AssemblyName>
<PackageId>Client</PackageId>
<OutputType>Exe</OutputType>
- <Version>0.18.1.0</Version>
+ <Version>0.19.0.0</Version>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -35,9 +35,9 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0" />
+ <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="[4.3,)" />
- <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
+ <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" />
<PackageReference Include="System.Threading" Version="[4.3,)" />
</ItemGroup>
diff --git a/test/netstd/Client/TestClient.cs b/test/netstd/Client/TestClient.cs
index 1227a38..183cfb4 100644
--- a/test/netstd/Client/TestClient.cs
+++ b/test/netstd/Client/TestClient.cs
@@ -257,7 +257,7 @@
trans = new TTlsSocketTransport(host, port, Configuration, 0,
cert,
(sender, certificate, chain, errors) => true,
- null, SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12);
+ null, SslProtocols.Tls12);
break;
case TransportChoice.Socket:
diff --git a/test/netstd/Server/Server.csproj b/test/netstd/Server/Server.csproj
index 52d2d05..85c1ad4 100644
--- a/test/netstd/Server/Server.csproj
+++ b/test/netstd/Server/Server.csproj
@@ -19,12 +19,12 @@
-->
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<AssemblyName>Server</AssemblyName>
<PackageId>Server</PackageId>
<OutputType>Exe</OutputType>
- <Version>0.18.1.0</Version>
+ <Version>0.19.0.0</Version>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -37,9 +37,9 @@
<ItemGroup>
<PackageReference Include="System.IO.Pipes" Version="4.3.0" />
<PackageReference Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
- <PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0" />
+ <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="[4.3,)" />
- <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
+ <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" />
<PackageReference Include="System.Threading" Version="[4.3,)" />
</ItemGroup>
diff --git a/test/netstd/Server/TestServer.cs b/test/netstd/Server/TestServer.cs
index 1eb5030..fdbaa97 100644
--- a/test/netstd/Server/TestServer.cs
+++ b/test/netstd/Server/TestServer.cs
@@ -606,7 +606,7 @@
trans = new TTlsServerSocketTransport(param.port, Configuration,
cert,
(sender, certificate, chain, errors) => true,
- null, SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12);
+ null, SslProtocols.Tls12);
break;
case TransportChoice.Socket:
diff --git a/tutorial/dart/client/pubspec.yaml b/tutorial/dart/client/pubspec.yaml
index 0210611..626c8f9 100644
--- a/tutorial/dart/client/pubspec.yaml
+++ b/tutorial/dart/client/pubspec.yaml
@@ -16,7 +16,7 @@
# under the License.
name: tutorial_client
-version: 0.18.1
+version: 0.19.0
description: A Dart client implementation of the Apache Thrift tutorial
author: Apache Thrift Developers <dev@thrift.apache.org>
homepage: http://thrift.apache.org
diff --git a/tutorial/dart/console_client/pubspec.yaml b/tutorial/dart/console_client/pubspec.yaml
index cb409dd..957b96c 100644
--- a/tutorial/dart/console_client/pubspec.yaml
+++ b/tutorial/dart/console_client/pubspec.yaml
@@ -16,7 +16,7 @@
# under the License.
name: tutorial_console_client
-version: 0.18.1
+version: 0.19.0
description: >
A Dart console client to implementation of the Apache Thrift tutorial
author: Apache Thrift Developers <dev@thrift.apache.org>
diff --git a/tutorial/dart/server/pubspec.yaml b/tutorial/dart/server/pubspec.yaml
index db08db3..6ad5cdd 100644
--- a/tutorial/dart/server/pubspec.yaml
+++ b/tutorial/dart/server/pubspec.yaml
@@ -16,7 +16,7 @@
# under the License.
name: tutorial_server
-version: 0.18.1
+version: 0.19.0
description: A Dart server to support the Apache Thrift tutorial
author: Apache Thrift Developers <dev@thrift.apache.org>
homepage: http://thrift.apache.org
diff --git a/tutorial/delphi/DelphiClient/DelphiClient.dproj b/tutorial/delphi/DelphiClient/DelphiClient.dproj
index 30b44c3..e55cc06 100644
--- a/tutorial/delphi/DelphiClient/DelphiClient.dproj
+++ b/tutorial/delphi/DelphiClient/DelphiClient.dproj
@@ -124,13 +124,13 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"/>
<VersionInfoKeys Name="FileDescription">Thrift Tutorial</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">0.18.1.0</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">0.19.0.0</VersionInfoKeys>
<VersionInfoKeys Name="InternalName">DelphiClient</VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright">Copyright © 2012 The Apache Software Foundation</VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"/>
<VersionInfoKeys Name="OriginalFilename">DelphiClient.exe</VersionInfoKeys>
<VersionInfoKeys Name="ProductName">Thrift</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">0.18.1.0</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">0.19.0.0</VersionInfoKeys>
<VersionInfoKeys Name="Comments"/>
</VersionInfoKeys>
<Source>
diff --git a/tutorial/delphi/DelphiServer/DelphiServer.dproj b/tutorial/delphi/DelphiServer/DelphiServer.dproj
index 3ea81d3..4080b92 100644
--- a/tutorial/delphi/DelphiServer/DelphiServer.dproj
+++ b/tutorial/delphi/DelphiServer/DelphiServer.dproj
@@ -121,13 +121,13 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"/>
<VersionInfoKeys Name="FileDescription">Thrift Tutorial</VersionInfoKeys>
- <VersionInfoKeys Name="FileVersion">0.18.1.0</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">0.19.0.0</VersionInfoKeys>
<VersionInfoKeys Name="InternalName">DelphiServer</VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright">Copyright © 2012 The Apache Software Foundation</VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"/>
<VersionInfoKeys Name="OriginalFilename">DelphiServer.exe</VersionInfoKeys>
<VersionInfoKeys Name="ProductName">Thrift</VersionInfoKeys>
- <VersionInfoKeys Name="ProductVersion">0.18.1.0</VersionInfoKeys>
+ <VersionInfoKeys Name="ProductVersion">0.19.0.0</VersionInfoKeys>
<VersionInfoKeys Name="Comments"/>
</VersionInfoKeys>
<Source>
diff --git a/tutorial/netstd/Client/Client.csproj b/tutorial/netstd/Client/Client.csproj
index 53ea7b4..c21b58d 100644
--- a/tutorial/netstd/Client/Client.csproj
+++ b/tutorial/netstd/Client/Client.csproj
@@ -19,12 +19,12 @@
-->
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<AssemblyName>Client</AssemblyName>
<PackageId>Client</PackageId>
<OutputType>Exe</OutputType>
- <Version>0.18.1.0</Version>
+ <Version>0.19.0.0</Version>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -32,7 +32,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
diff --git a/tutorial/netstd/Interfaces/Interfaces.csproj b/tutorial/netstd/Interfaces/Interfaces.csproj
index 194f859..1e1193b 100644
--- a/tutorial/netstd/Interfaces/Interfaces.csproj
+++ b/tutorial/netstd/Interfaces/Interfaces.csproj
@@ -19,10 +19,10 @@
-->
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<AssemblyName>Interfaces</AssemblyName>
<PackageId>Interfaces</PackageId>
- <Version>0.18.1.0</Version>
+ <Version>0.19.0.0</Version>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -34,7 +34,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
+ <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" />
</ItemGroup>
<Target Name="PreBuild" BeforeTargets="_GenerateRestoreProjectSpec;Restore;Compile">
diff --git a/tutorial/netstd/Server/Program.cs b/tutorial/netstd/Server/Program.cs
index 29b21d0..01e7336 100644
--- a/tutorial/netstd/Server/Program.cs
+++ b/tutorial/netstd/Server/Program.cs
@@ -191,7 +191,7 @@
TServerTransport serverTransport = transport switch
{
Transport.Tcp => new TServerSocketTransport(9090, Configuration),
- Transport.NamedPipe => new TNamedPipeServerTransport(".test", Configuration, NamedPipeClientFlags.None),
+ Transport.NamedPipe => new TNamedPipeServerTransport(".test", Configuration, NamedPipeServerFlags.None, 64),
Transport.TcpTls => new TTlsServerSocketTransport(9090, Configuration, GetCertificate(), ClientCertValidator, LocalCertificateSelectionCallback),
_ => throw new ArgumentException("unsupported value $transport", nameof(transport)),
};
diff --git a/tutorial/netstd/Server/Server.csproj b/tutorial/netstd/Server/Server.csproj
index c7e8007..193e3c3 100644
--- a/tutorial/netstd/Server/Server.csproj
+++ b/tutorial/netstd/Server/Server.csproj
@@ -19,12 +19,12 @@
-->
<PropertyGroup>
- <TargetFramework>net6.0</TargetFramework>
+ <TargetFramework>net7.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<AssemblyName>Server</AssemblyName>
<PackageId>Server</PackageId>
<OutputType>Exe</OutputType>
- <Version>0.18.1.0</Version>
+ <Version>0.19.0.0</Version>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -40,6 +40,6 @@
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
- <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
</ItemGroup>
</Project>
diff --git a/tutorial/ocaml/_oasis b/tutorial/ocaml/_oasis
index 0231ffa..1101740 100644
--- a/tutorial/ocaml/_oasis
+++ b/tutorial/ocaml/_oasis
@@ -1,5 +1,5 @@
Name: tutorial
-Version: 0.18.1
+Version: 0.19.0
OASISFormat: 0.3
Synopsis: OCaml Tutorial example
Authors: Apache Thrift Developers <dev@thrift.apache.org>