This is an automated email from the ASF dual-hosted git repository.
jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git
The following commit(s) were added to refs/heads/master by this push:
new 8e89abee1 THRIFT-5726 package upgrades and consolidation/improvement
of build targets checks Client: netstd Patch: Jens Geyer
8e89abee1 is described below
commit 8e89abee1744cb91708640a9bfd1bef7b672ed2a
Author: Jens Geyer <[email protected]>
AuthorDate: Thu Jul 20 21:43:23 2023 +0200
THRIFT-5726 package upgrades and consolidation/improvement of build targets
checks
Client: netstd
Patch: Jens Geyer
---
.../Thrift.Benchmarks/Thrift.Benchmarks.csproj | 2 +-
.../Thrift.IntegrationTests.csproj | 8 ++++----
.../Thrift.PublicInterfaces.Compile.Tests.csproj | 2 +-
lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj | 6 +++---
lib/netstd/Thrift/Protocol/TJSONProtocol.cs | 24 +++++++++++-----------
lib/netstd/Thrift/Thrift.csproj | 14 +++++++++++--
.../Thrift/Transport/Client/THttpTransport.cs | 18 ++++++++--------
.../Thrift/Transport/Client/TNamedPipeTransport.cs | 12 +++++------
.../Thrift/Transport/Client/TStreamTransport.cs | 12 +++++------
.../Transport/Server/TNamedPipeServerTransport.cs | 6 +++---
test/netstd/Client/Client.csproj | 2 +-
test/netstd/Server/Server.csproj | 3 +--
tutorial/netstd/Interfaces/Interfaces.csproj | 2 +-
tutorial/netstd/Server/Server.csproj | 9 ++++----
14 files changed, 64 insertions(+), 56 deletions(-)
diff --git a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
index aed36cdcb..b5afef582 100644
--- a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
+++ b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
@@ -27,7 +27,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="BenchmarkDotNet" Version="0.13.4" />
+ <PackageReference Include="BenchmarkDotNet" Version="0.13.6" />
</ItemGroup>
<ItemGroup>
diff --git
a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
index 8a0167a28..98e800775 100644
--- a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
+++ b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
@@ -35,10 +35,10 @@
<ItemGroup>
<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" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+ <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+ <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+ <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0"
/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Thrift\Thrift.csproj" />
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 457cdef3a..6f3abb155 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
@@ -37,7 +37,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="System.ServiceModel.Primitives"
Version="4.10.0" />
+ <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0"
/>
</ItemGroup>
<ItemGroup>
diff --git a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
index 6b20f5c9a..94b7b09c1 100644
--- a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
+++ b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
@@ -26,9 +26,9 @@
<ItemGroup>
<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="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+ <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+ <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
<PackageReference Include="NSubstitute" Version="5.0.0" />
</ItemGroup>
diff --git a/lib/netstd/Thrift/Protocol/TJSONProtocol.cs
b/lib/netstd/Thrift/Protocol/TJSONProtocol.cs
index 82e758b1e..9f761aeae 100644
--- a/lib/netstd/Thrift/Protocol/TJSONProtocol.cs
+++ b/lib/netstd/Thrift/Protocol/TJSONProtocol.cs
@@ -435,11 +435,11 @@ namespace Thrift.Protocol
// escaped?
if (ch != TJSONProtocolConstants.EscSequences[0])
{
-#if NETSTANDARD2_0
- await buffer.WriteAsync(new[] {ch}, 0, 1,
cancellationToken);
-#else
+#if NET5_0_OR_GREATER
var wbuf = new[] { ch };
await buffer.WriteAsync(wbuf.AsMemory(0, 1),
cancellationToken);
+#else
+ await buffer.WriteAsync(new[] { ch }, 0, 1,
cancellationToken);
#endif
continue;
}
@@ -454,11 +454,11 @@ namespace Thrift.Protocol
throw new
TProtocolException(TProtocolException.INVALID_DATA, "Expected control char");
}
ch = TJSONProtocolConstants.EscapeCharValues[off];
-#if NETSTANDARD2_0
- await buffer.WriteAsync(new[] {ch}, 0, 1,
cancellationToken);
-#else
+#if NET5_0_OR_GREATER
var wbuf = new[] { ch };
await buffer.WriteAsync( wbuf.AsMemory(0, 1),
cancellationToken);
+#else
+ await buffer.WriteAsync(new[] { ch }, 0, 1,
cancellationToken);
#endif
continue;
}
@@ -488,20 +488,20 @@ namespace Thrift.Protocol
codeunits.Add((char) wch);
var tmp = Utf8Encoding.GetBytes(codeunits.ToArray());
-#if NETSTANDARD2_0
- await buffer.WriteAsync(tmp, 0, tmp.Length,
cancellationToken);
-#else
+#if NET5_0_OR_GREATER
await buffer.WriteAsync(tmp.AsMemory(0, tmp.Length),
cancellationToken);
+#else
+ await buffer.WriteAsync(tmp, 0, tmp.Length,
cancellationToken);
#endif
codeunits.Clear();
}
else
{
var tmp = Utf8Encoding.GetBytes(new[] { (char)wch });
-#if NETSTANDARD2_0
- await buffer.WriteAsync(tmp, 0, tmp.Length,
cancellationToken);
-#else
+#if NET5_0_OR_GREATER
await buffer.WriteAsync(tmp.AsMemory( 0, tmp.Length),
cancellationToken);
+#else
+ await buffer.WriteAsync(tmp, 0, tmp.Length,
cancellationToken);
#endif
}
}
diff --git a/lib/netstd/Thrift/Thrift.csproj b/lib/netstd/Thrift/Thrift.csproj
index d2f9c17fc..2ebfb06df 100644
--- a/lib/netstd/Thrift/Thrift.csproj
+++ b/lib/netstd/Thrift/Thrift.csproj
@@ -56,12 +56,12 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions"
Version="2.2.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions"
Version="2.2.0" Condition="'$(TargetFramework.StartsWith(`netstandard2.`))' ==
'true'" />
<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.IO.Pipes.AccessControl" Version="5.0.0"
Condition="'$(TargetFramework.StartsWith(`netstandard2.`))' == 'true'" />
<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,)" />
@@ -69,6 +69,10 @@
<PackageReference Include="System.Threading.Tasks.Extensions"
Version="4.5.4" />
</ItemGroup>
+ <ItemGroup>
+ <FrameworkReference Include="Microsoft.AspNetCore.App"
Condition="'$(TargetFramework.StartsWith(`netstandard2.`))' == 'false'" />
+ </ItemGroup>
+
<ItemGroup>
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies"
Version="1.0.3" />
</ItemGroup>
@@ -76,6 +80,12 @@
<ItemGroup>
<None Include="..\README.md" Pack="true" PackagePath="\" />
</ItemGroup>
+
+ <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web">
+ <Version>7.0.9</Version>
+ </PackageReference>
+ </ItemGroup>
<Target Name="SetTFMAssemblyAttributesPath"
BeforeTargets="GenerateTargetFrameworkMonikerAttribute">
<PropertyGroup>
diff --git a/lib/netstd/Thrift/Transport/Client/THttpTransport.cs
b/lib/netstd/Thrift/Transport/Client/THttpTransport.cs
index 60ed59c67..1ab1caf72 100644
--- a/lib/netstd/Thrift/Transport/Client/THttpTransport.cs
+++ b/lib/netstd/Thrift/Transport/Client/THttpTransport.cs
@@ -150,10 +150,10 @@ namespace Thrift.Transport.Client
try
{
-#if NETSTANDARD2_0
- var ret = await _inputStream.ReadAsync(buffer, offset, length,
cancellationToken);
-#else
+#if NET5_0_OR_GREATER
var ret = await _inputStream.ReadAsync(new
Memory<byte>(buffer, offset, length), cancellationToken);
+#else
+ var ret = await _inputStream.ReadAsync(buffer, offset, length,
cancellationToken);
#endif
if (ret == -1)
{
@@ -173,10 +173,10 @@ namespace Thrift.Transport.Client
{
cancellationToken.ThrowIfCancellationRequested();
-#if NETSTANDARD2_0
- await _outputStream.WriteAsync(buffer, offset, length,
cancellationToken);
-#else
+#if NET5_0_OR_GREATER
await _outputStream.WriteAsync(buffer.AsMemory(offset, length),
cancellationToken);
+#else
+ await _outputStream.WriteAsync(buffer, offset, length,
cancellationToken);
#endif
}
@@ -245,10 +245,10 @@ namespace Thrift.Transport.Client
var response = (await _httpClient.PostAsync(_uri,
contentStream, cancellationToken)).EnsureSuccessStatusCode();
_inputStream?.Dispose();
-#if NETSTANDARD2_0 || NETSTANDARD2_1
- _inputStream = await response.Content.ReadAsStreamAsync();
-#else
+#if NET5_0_OR_GREATER
_inputStream = await
response.Content.ReadAsStreamAsync(cancellationToken);
+#else
+ _inputStream = await response.Content.ReadAsStreamAsync();
#endif
if (_inputStream.CanSeek)
{
diff --git a/lib/netstd/Thrift/Transport/Client/TNamedPipeTransport.cs
b/lib/netstd/Thrift/Transport/Client/TNamedPipeTransport.cs
index 071c66017..8e60f9f5e 100644
--- a/lib/netstd/Thrift/Transport/Client/TNamedPipeTransport.cs
+++ b/lib/netstd/Thrift/Transport/Client/TNamedPipeTransport.cs
@@ -76,10 +76,10 @@ namespace Thrift.Transport.Client
}
CheckReadBytesAvailable(length);
-#if NETSTANDARD2_0
- var numRead = await PipeStream.ReadAsync(buffer, offset, length,
cancellationToken);
-#else
+#if NET5_0_OR_GREATER
var numRead = await PipeStream.ReadAsync(new Memory<byte>(buffer,
offset, length), cancellationToken);
+#else
+ var numRead = await PipeStream.ReadAsync(buffer, offset, length,
cancellationToken);
#endif
CountConsumedMessageBytes(numRead);
return numRead;
@@ -98,10 +98,10 @@ namespace Thrift.Transport.Client
var nBytes = Math.Min(15 * 4096, length); // 16 would exceed the
limit
while (nBytes > 0)
{
-#if NETSTANDARD2_0
- await PipeStream.WriteAsync(buffer, offset, nBytes,
cancellationToken);
-#else
+#if NET5_0_OR_GREATER
await PipeStream.WriteAsync(buffer.AsMemory(offset, nBytes),
cancellationToken);
+#else
+ await PipeStream.WriteAsync(buffer, offset, nBytes,
cancellationToken);
#endif
offset += nBytes;
length -= nBytes;
diff --git a/lib/netstd/Thrift/Transport/Client/TStreamTransport.cs
b/lib/netstd/Thrift/Transport/Client/TStreamTransport.cs
index 55b636df2..7237b8dd2 100644
--- a/lib/netstd/Thrift/Transport/Client/TStreamTransport.cs
+++ b/lib/netstd/Thrift/Transport/Client/TStreamTransport.cs
@@ -81,10 +81,10 @@ namespace Thrift.Transport.Client
"Cannot read from null inputstream");
}
-#if NETSTANDARD2_0
- return await InputStream.ReadAsync(buffer, offset, length,
cancellationToken);
-#else
+#if NET5_0_OR_GREATER
return await InputStream.ReadAsync(new Memory<byte>(buffer,
offset, length), cancellationToken);
+#else
+ return await InputStream.ReadAsync(buffer, offset, length,
cancellationToken);
#endif
}
@@ -96,10 +96,10 @@ namespace Thrift.Transport.Client
"Cannot write to null outputstream");
}
-#if NETSTANDARD2_0
- await OutputStream.WriteAsync(buffer, offset, length,
cancellationToken);
-#else
+#if NET5_0_OR_GREATER
await OutputStream.WriteAsync(buffer.AsMemory(offset, length),
cancellationToken);
+#else
+ await OutputStream.WriteAsync(buffer, offset, length,
cancellationToken);
#endif
}
diff --git a/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs
b/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs
index 66018b085..b1ed91ef1 100644
--- a/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs
+++ b/lib/netstd/Thrift/Transport/Server/TNamedPipeServerTransport.cs
@@ -382,10 +382,10 @@ namespace Thrift.Transport.Server
}
CheckReadBytesAvailable(length);
-#if NETSTANDARD2_0
- var numBytes = await PipeStream.ReadAsync(buffer, offset,
length, cancellationToken);
-#else
+#if NET5_0_OR_GREATER
var numBytes = await
PipeStream.ReadAsync(buffer.AsMemory(offset, length), cancellationToken);
+#else
+ var numBytes = await PipeStream.ReadAsync(buffer, offset,
length, cancellationToken);
#endif
CountConsumedMessageBytes(numBytes);
return numBytes;
diff --git a/test/netstd/Client/Client.csproj b/test/netstd/Client/Client.csproj
index 4482f35a0..1ae67fa40 100644
--- a/test/netstd/Client/Client.csproj
+++ b/test/netstd/Client/Client.csproj
@@ -37,7 +37,7 @@
<ItemGroup>
<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.10.0" />
+ <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0"
/>
<PackageReference Include="System.Threading" Version="[4.3,)" />
</ItemGroup>
diff --git a/test/netstd/Server/Server.csproj b/test/netstd/Server/Server.csproj
index 905edc2ce..020b8d545 100644
--- a/test/netstd/Server/Server.csproj
+++ b/test/netstd/Server/Server.csproj
@@ -36,10 +36,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="7.0.0"
/>
<PackageReference Include="System.Runtime.Serialization.Primitives"
Version="[4.3,)" />
- <PackageReference Include="System.ServiceModel.Primitives"
Version="4.10.0" />
+ <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0"
/>
<PackageReference Include="System.Threading" Version="[4.3,)" />
</ItemGroup>
diff --git a/tutorial/netstd/Interfaces/Interfaces.csproj
b/tutorial/netstd/Interfaces/Interfaces.csproj
index de5f113e7..ff7891e5b 100644
--- a/tutorial/netstd/Interfaces/Interfaces.csproj
+++ b/tutorial/netstd/Interfaces/Interfaces.csproj
@@ -34,7 +34,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="System.ServiceModel.Primitives"
Version="4.10.0" />
+ <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0"
/>
</ItemGroup>
<Target Name="PreBuild"
BeforeTargets="_GenerateRestoreProjectSpec;Restore;Compile">
diff --git a/tutorial/netstd/Server/Server.csproj
b/tutorial/netstd/Server/Server.csproj
index 478fa8c4e..9aa3bc6b7 100644
--- a/tutorial/netstd/Server/Server.csproj
+++ b/tutorial/netstd/Server/Server.csproj
@@ -36,10 +36,9 @@
<ProjectReference Include="../../../lib/netstd/Thrift/Thrift.csproj" />
</ItemGroup>
- <ItemGroup>
- <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="7.0.0" />
+ <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web">
+ <Version>7.0.9</Version>
+ </PackageReference>
</ItemGroup>
</Project>
