Implementation of feedback from @AArnott

microsoft · Apr 25, 2024 · 5f77203 · 5f77203
1 parent e2e88d2
commit 5f77203
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,6 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-
     <MessagePackVersion>2.5.108</MessagePackVersion>
     <MicroBuildVersion>2.0.149</MicroBuildVersion>
     <VisualStudioThreadingVersion>17.9.28</VisualStudioThreadingVersion>
@@ -25,14 +24,14 @@
     <PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.10.69" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageVersion Include="System.Collections.Immutable" Version="7.0.0" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
+    <PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
     <PackageVersion Include="System.IO.Pipelines" Version="7.0.0" />
     <PackageVersion Include="System.IO.Pipes" Version="4.3.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Text.Json" Version="7.0.3" />
     <PackageVersion Include="System.Text.Encodings.Web" Version="7.0.0" />
-    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="xunit.combinatorial" Version="1.6.24" />
     <PackageVersion Include="xunit.runner.console" Version="2.5.3" />
@@ -54,4 +53,4 @@
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/StreamJsonRpc/StreamJsonRpc.csproj b/src/StreamJsonRpc/StreamJsonRpc.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -18,17 +18,19 @@
     <PackageReference Include="Nerdbank.Streams" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="all" />
-    <PackageReference Include="System.IO.Pipelines" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'== 'netStandard2.0'">
+  <ItemGroup Condition="'$(TargetFramework)'== 'netstandard2.0'">
     <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" PrivateAssets="compile"/>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'== 'netStandard2.0' or '$(TargetFramework)' == 'netStandard2.1'">
+  <ItemGroup Condition="'$(TargetFramework)'== 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="System.Collections.Immutable" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
-    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" PrivateAssets="compile" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'== 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="System.IO.Pipelines" />
+  </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="$(TargetFramework)\PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="$(TargetFramework)\PublicAPI.Unshipped.txt" />

diff --git a/...treamJsonRpc/net7.0/PublicAPI.Shipped.txt → ...treamJsonRpc/net6.0/PublicAPI.Shipped.txt b/...treamJsonRpc/net7.0/PublicAPI.Shipped.txt → ...treamJsonRpc/net6.0/PublicAPI.Shipped.txt
diff --git a/...eamJsonRpc/net7.0/PublicAPI.Unshipped.txt → ...eamJsonRpc/net6.0/PublicAPI.Unshipped.txt b/...eamJsonRpc/net7.0/PublicAPI.Unshipped.txt → ...eamJsonRpc/net6.0/PublicAPI.Unshipped.txt