lib updates and replace protobuf-net.MSBuild with protobuf-net.BuildTools

Author: mgravell

Directory.Packages.props

@@ -1,36 +1,37 @@
 <Project>
     <ItemGroup>
-        <PackageVersion Include="protobuf-net" Version="3.1.33" />
-        <PackageVersion Include="protobuf-net.Core" Version="3.1.33" />
-        <PackageVersion Include="protobuf-net.Grpc" Version="1.0.179" />
-        <PackageVersion Include="protobuf-net.Reflection" Version="3.1.33" />
-        <PackageVersion Include="protobuf-net.MSBuild" Version="3.1.33" />
-        
-        <PackageVersion Include="Google.Protobuf" Version="3.21.12" />
+        <PackageVersion Include="protobuf-net" Version="3.2.26" />
+        <PackageVersion Include="protobuf-net.BuildTools" Version="3.2.27" />
+        <PackageVersion Include="protobuf-net.Core" Version="3.2.26" />
+        <PackageVersion Include="protobuf-net.Grpc" Version="1.1.1" />
+        <PackageVersion Include="protobuf-net.Reflection" Version="3.2.12" />
 
+        <PackageVersion Include="Google.Protobuf" Version="3.23.4" />
+
         <PackageVersion Include="Grpc" Version="2.46.6" />
         <PackageVersion Include="Grpc.Core" Version="2.46.6" />
-        
-        <PackageVersion Include="Grpc.Tools" Version="2.51.0" />
-        <PackageVersion Include="Grpc.Net.Client" Version="2.51.0" />
-        <PackageVersion Include="Grpc.Core.Api" Version="2.51.0" />
-        <PackageVersion Include="Grpc.AspNetCore.Server" Version="2.51.0" />
-        <PackageVersion Include="Grpc.AspNetCore" Version="2.51.0" />
-        <PackageVersion Include="Grpc.Net.ClientFactory" Version="2.51.0" />
-        
-        <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.2" />
+
+        <PackageVersion Include="Grpc.Tools" Version="2.56.2" />
+        <PackageVersion Include="Grpc.Net.Client" Version="2.55.0" />
+        <PackageVersion Include="Grpc.Core.Api" Version="2.55.0" />
+        <PackageVersion Include="Grpc.AspNetCore.Server" Version="2.55.0" />
+        <PackageVersion Include="Grpc.AspNetCore" Version="2.55.0" />
+        <PackageVersion Include="Grpc.Net.ClientFactory" Version="2.55.0" />
+
+        <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.9" />
+        <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
         <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
         <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
         <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
 
-        <PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.119" />
-        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-        <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
-        <PackageVersion Include="System.Reactive" Version="5.0.0" />
+        <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
+        
+        <PackageVersion Include="System.Reactive" Version="6.0.0" />
         <PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
-        <PackageVersion Include="System.ServiceModel.Primitives" Version="4.10.0" />
-        <PackageVersion Include="xunit" Version="2.4.2" />
-        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+        <PackageVersion Include="System.ServiceModel.Primitives" Version="4.10.2" />
+        <PackageVersion Include="xunit" Version="2.5.0" />
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
         <PackageVersion Include="TaskBuilder.fs" Version="2.1.0" />
     </ItemGroup>
 </Project>

examples/pb-net/JustProtos/JustProtos.csproj

@@ -12,7 +12,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="protobuf-net.MSBuild" />
+    <AdditionalFiles Include="Descriptor.proto" />
+    <AdditionalFiles Include="MyContracts.proto" />
+    <AdditionalFiles Include="TimeService.proto" />
+  </ItemGroup>
+
+  <ItemGroup>
+      <PackageReference Include="protobuf-net.Core" />
+      <PackageReference Include="protobuf-net.BuildTools">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      </PackageReference>
   </ItemGroup>
 
 </Project>

tests/protobuf-net.Grpc.Test/ContractOperationTests.cs

@@ -22,7 +22,7 @@ public class ContractOperationTests
         public void SimpleInterface()
         {
             var all = ContractOperation.ExpandInterfaces(typeof(IC));
-            Assert.Equal(1, all.Count);
+            Assert.Single(all);
             Assert.Contains(typeof(IC), all);
         }
         [Fact]