Take a lighter touch on forcing PreviewFeatures for QUIC (#80)

NethermindEth · Apr 23, 2024 · 6432c5d · 6432c5d
1 parent 0e839d0
commit 6432c5d
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 39 deletions.
diff --git a/src/libp2p/Libp2p.Core.Benchmarks/Libp2p.Core.Benchmarks.csproj b/src/libp2p/Libp2p.Core.Benchmarks/Libp2p.Core.Benchmarks.csproj
@@ -8,7 +8,6 @@
     <Optimize>true</Optimize>
     <LangVersion>latest</LangVersion>
     <OutputType>Exe</OutputType>
-    <EnablePreviewFeatures>true</EnablePreviewFeatures>
     <AssemblyName>Nethermind.$(MSBuildProjectName)</AssemblyName>
     <RootNamespace>Nethermind.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
   </PropertyGroup>

diff --git a/src/libp2p/Libp2p.Protocols.Quic/Libp2p.Protocols.Quic.csproj b/src/libp2p/Libp2p.Protocols.Quic/Libp2p.Protocols.Quic.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <EnablePreviewFeatures>true</EnablePreviewFeatures>
     <AssemblyName>Nethermind.$(MSBuildProjectName)</AssemblyName>
     <RootNamespace>Nethermind.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
   </PropertyGroup>

diff --git a/src/libp2p/Libp2p.Protocols.Quic/QuicProtocol.cs b/src/libp2p/Libp2p.Protocols.Quic/QuicProtocol.cs
@@ -11,17 +11,19 @@
 using System.Net.Quic;
 using System.Net.Security;
 using System.Net.Sockets;
+using System.Runtime.Versioning;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 //using Nethermind.Libp2p.Protocols.Quic;
 
 namespace Nethermind.Libp2p.Protocols;
 
 #pragma warning disable CA1416 // Do not inform about platform compatibility
-#pragma warning disable CA2252 // EnablePreviewFeatures is set in the project, but build still fails
+
 /// <summary>
 /// https://github.com/libp2p/specs/blob/master/quic/README.md
 /// </summary>
+[RequiresPreviewFeatures]
 public class QuicProtocol : IProtocol
 {
     private readonly ILogger<QuicProtocol>? _logger;

diff --git a/src/libp2p/Libp2p/Libp2p.csproj b/src/libp2p/Libp2p/Libp2p.csproj
@@ -5,7 +5,6 @@
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <RootNamespace>Nethermind.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
-    <EnablePreviewFeatures>true</EnablePreviewFeatures>
     <AssemblyName>Nethermind.$(MSBuildProjectName)</AssemblyName>
   </PropertyGroup>
 

diff --git a/src/libp2p/Libp2p/Libp2pPeerFactoryBuilder.cs b/src/libp2p/Libp2p/Libp2pPeerFactoryBuilder.cs
@@ -4,9 +4,11 @@
 using Nethermind.Libp2p.Core;
 using Nethermind.Libp2p.Protocols;
 using Nethermind.Libp2p.Protocols.Pubsub;
+using System.Runtime.Versioning;
 
 namespace Nethermind.Libp2p.Stack;
 
+[RequiresPreviewFeatures]
 public class Libp2pPeerFactoryBuilder : PeerFactoryBuilderBase<Libp2pPeerFactoryBuilder, Libp2pPeerFactory>,
     ILibp2pPeerFactoryBuilder
 {

diff --git a/src/libp2p/Libp2p/ServiceProviderExtensions.cs b/src/libp2p/Libp2p/ServiceProviderExtensions.cs
@@ -4,11 +4,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using Nethermind.Libp2p.Core;
 using Nethermind.Libp2p.Protocols.Pubsub;
+using System.Runtime.Versioning;
 
 namespace Nethermind.Libp2p.Stack;
 
 public static class ServiceProviderExtensions
 {
+    [RequiresPreviewFeatures]
     public static IServiceCollection AddLibp2p(this IServiceCollection services, Func<ILibp2pPeerFactoryBuilder, IPeerFactoryBuilder> factorySetup)
     {
         return services

diff --git a/src/samples/chat/Chat.csproj b/src/samples/chat/Chat.csproj
@@ -18,7 +18,6 @@
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\libp2p\Libp2p.Core\Libp2p.Core.csproj" />
     <ProjectReference Include="..\..\libp2p\Libp2p.Protocols.Identify\Libp2p.Protocols.Identify.csproj" />
     <ProjectReference Include="..\..\libp2p\Libp2p.Protocols.IpTcp\Libp2p.Protocols.IpTcp.csproj" />
     <ProjectReference Include="..\..\libp2p\Libp2p.Protocols.Multistream\Libp2p.Protocols.Multistream.csproj" />

diff --git a/src/samples/chat/README.md b/src/samples/chat/README.md
@@ -0,0 +1,9 @@
+
+```
+$ ./Chat
+[...]info: Chat[0] Listener started at /ip4/0.0.0.0/tcp/58641/p2p/ABCDEF
+```
+
+```
+$ ./Chat -d /ip4/127.0.0.1/58641
+```
diff --git a/src/samples/perf-benchmarks/PerfBenchmarks.csproj b/src/samples/perf-benchmarks/PerfBenchmarks.csproj
@@ -11,14 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BouncyCastle.Cryptography" Version="2.2.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.25.1" />
-    <PackageReference Include="Google.Protobuf.Tools" Version="3.25.1" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\libp2p\Libp2p.Core\Libp2p.Core.csproj" />
     <ProjectReference Include="..\..\libp2p\Libp2p.Protocols.Identify\Libp2p.Protocols.Identify.csproj" />
     <ProjectReference Include="..\..\libp2p\Libp2p.Protocols.IpTcp\Libp2p.Protocols.IpTcp.csproj" />
     <ProjectReference Include="..\..\libp2p\Libp2p.Protocols.Multistream\Libp2p.Protocols.Multistream.csproj" />

diff --git a/src/samples/perf-benchmarks/PerfTesting.csproj b/src/samples/perf-benchmarks/PerfTesting.csproj
diff --git a/src/samples/pubsub-chat/PubsubChat.csproj b/src/samples/pubsub-chat/PubsubChat.csproj
@@ -14,7 +14,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\libp2p\Libp2p.Core\Libp2p.Core.csproj" />
       <ProjectReference Include="..\..\libp2p\Libp2p.Protocols.MDns\Libp2p.Protocols.MDns.csproj" />
       <ProjectReference Include="..\..\libp2p\Libp2p\Libp2p.csproj" />
     </ItemGroup>