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 ac2deed0f THRIFT-5746 Upgrade to net8 Client: netstd Patch: Jens Geyer
ac2deed0f is described below
commit ac2deed0fcf1d94e65bfa806866e2eaaa3aa0482
Author: Jens Geyer <[email protected]>
AuthorDate: Sat Nov 25 09:55:58 2023 +0100
THRIFT-5746 Upgrade to net8
Client: netstd
Patch: Jens Geyer
This updates certain packages that became available now for 8.0.0
---
.../Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj | 2 +-
.../Thrift.IntegrationTests/Thrift.IntegrationTests.csproj | 6 +++---
.../Thrift.PublicInterfaces.Compile.Tests.csproj | 2 +-
lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj | 6 +++---
lib/netstd/Thrift/Thrift.csproj | 14 ++++++++++----
test/netstd/Client/Client.csproj | 4 ++--
test/netstd/Server/Server.csproj | 4 ++--
tutorial/netstd/Interfaces/Interfaces.csproj | 2 +-
8 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
index cc2360de7..a8543a3bf 100644
--- a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
+++ b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj
@@ -28,7 +28,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="BenchmarkDotNet" Version="0.13.6" />
+ <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
</ItemGroup>
<ItemGroup>
diff --git
a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
index 3f52a5fe0..3f8345926 100644
--- a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
+++ b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj
@@ -35,11 +35,11 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="CompareNETObjects" Version="4.79.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+ <PackageReference Include="CompareNETObjects" Version="4.82.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<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"
/>
+ <PackageReference Include="System.ServiceModel.Primitives" Version="6.2.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 ecde36689..7c5775026 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
@@ -38,7 +38,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0"
/>
+ <PackageReference Include="System.ServiceModel.Primitives" Version="6.2.0"
/>
</ItemGroup>
<ItemGroup>
diff --git a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
index 54ce1e89c..a37be1b10 100644
--- a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
+++ b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj
@@ -26,11 +26,11 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="CompareNETObjects" Version="4.79.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+ <PackageReference Include="CompareNETObjects" Version="4.82.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
- <PackageReference Include="NSubstitute" Version="5.0.0" />
+ <PackageReference Include="NSubstitute" Version="5.1.0" />
</ItemGroup>
<ItemGroup>
diff --git a/lib/netstd/Thrift/Thrift.csproj b/lib/netstd/Thrift/Thrift.csproj
index c7b2a828e..d255f37c4 100644
--- a/lib/netstd/Thrift/Thrift.csproj
+++ b/lib/netstd/Thrift/Thrift.csproj
@@ -57,12 +57,12 @@
<ItemGroup>
<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="Microsoft.Extensions.Logging" Version="8.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Console"
Version="8.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Debug"
Version="8.0.0" />
<PackageReference Include="System.IO.Pipes" Version="[4.3,)" />
<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.Http.WinHttpHandler" Version="8.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" />
@@ -87,6 +87,12 @@
</PackageReference>
</ItemGroup>
+ <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web">
+ <Version>8.0.0</Version>
+ </PackageReference>
+ </ItemGroup>
+
<Target Name="SetTFMAssemblyAttributesPath"
BeforeTargets="GenerateTargetFrameworkMonikerAttribute">
<PropertyGroup>
<TargetFrameworkMonikerAssemblyAttributesPath>$(IntermediateOutputPath)$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)</TargetFrameworkMonikerAssemblyAttributesPath>
diff --git a/test/netstd/Client/Client.csproj b/test/netstd/Client/Client.csproj
index 0e1eaa3af..aa90e2c5e 100644
--- a/test/netstd/Client/Client.csproj
+++ b/test/netstd/Client/Client.csproj
@@ -35,9 +35,9 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0"
/>
+ <PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0"
/>
<PackageReference Include="System.Runtime.Serialization.Primitives"
Version="[4.3,)" />
- <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0"
/>
+ <PackageReference Include="System.ServiceModel.Primitives" Version="6.2.0"
/>
<PackageReference Include="System.Threading" Version="[4.3,)" />
</ItemGroup>
diff --git a/test/netstd/Server/Server.csproj b/test/netstd/Server/Server.csproj
index 38a942a06..63ce613bb 100644
--- a/test/netstd/Server/Server.csproj
+++ b/test/netstd/Server/Server.csproj
@@ -36,9 +36,9 @@
<ItemGroup>
<PackageReference Include="System.IO.Pipes" Version="4.3.0" />
- <PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0"
/>
+ <PackageReference Include="System.Net.Http.WinHttpHandler" Version="8.0.0"
/>
<PackageReference Include="System.Runtime.Serialization.Primitives"
Version="[4.3,)" />
- <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0"
/>
+ <PackageReference Include="System.ServiceModel.Primitives" Version="6.2.0"
/>
<PackageReference Include="System.Threading" Version="[4.3,)" />
</ItemGroup>
diff --git a/tutorial/netstd/Interfaces/Interfaces.csproj
b/tutorial/netstd/Interfaces/Interfaces.csproj
index 5ff8d9fb9..c3524575a 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="6.0.0"
/>
+ <PackageReference Include="System.ServiceModel.Primitives" Version="6.2.0"
/>
</ItemGroup>
<Target Name="PreBuild"
BeforeTargets="_GenerateRestoreProjectSpec;Restore;Compile">