Build.csproj

@@ -4,6 +4,7 @@
     <ProjectReference Include="src\protobuf-net\*.csproj" />
     <ProjectReference Include="src\protobuf-net.Core\*.csproj" />
     <ProjectReference Include="src\protobuf-net.MSBuild\*.csproj" />
+    <ProjectReference Include="src\protobuf-net.NodaTime\*.csproj" />
     <ProjectReference Include="src\protobuf-net.Protogen\*.csproj" />
     <ProjectReference Include="src\protobuf-net.Reflection\*.csproj" />
     <ProjectReference Include="src\protobuf-net.AspNetCore\*.csproj" />

README.md

@@ -91,7 +91,7 @@ using (var file = File.OpenRead("person.bin")) {
 
 ### Inheritance
 
-Inheritance must be explicitly declared, in a similar way that if must for XmlSerializer and DataContractSerializer. This is done via [ProtoInclude(...)] on each type with known sub-types: 
+Inheritance must be explicitly declared, in a similar way that it must for XmlSerializer and DataContractSerializer. This is done via [ProtoInclude(...)] on each type with known sub-types: 
 
 ```csharp
 [ProtoContract]

docs/3_0.md

@@ -44,7 +44,7 @@ a simple update. A few niche features have changed or been removed - more detail
   and [`protobuf-net.Core`](https://www.nuget.org/packages/protobuf-net.Core/), with the "Core" package having the main serializer API but none of the runtime reflection
   code; this means that future AOT-only scenarios only require the "Core" package, and can omit the overhead of shipping any of the other code *at all*; you can see
   this in action already at [protogen.marcgravell.com](https://protogen.marcgravell.com/), which uses the schema parting tools *and serializer core* in the client browser
-  (not at the web-server) via "Blazor"/WASM, via a dependency on `protobuf-net.Core` (a huge thanks once again to [Rémi BOURGAREL](https://github.com/RemiBou) here, who leant
+  (not at the web-server) via "Blazor"/WASM, via a dependency on `protobuf-net.Core` (a huge thanks once again to [Remi BOURGAREL](https://github.com/RemiBou) here, who leant
   their Blazor expertise)
 
 ## Changes To Existing Features

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

docs/releasenotes.md

@@ -11,6 +11,17 @@ Packages are available on NuGet: [protobuf-net](https://www.nuget.org/packages/p
 - 3.2: protogen support for emitting pre-coded custom serializers
 - future: build-time tooling from code-first (aka "generators")
 
+## unreleased
+
+- add new protobuf-net.NodaTime package that adds direct support for NodaTime primitives (note: this may be relocated to a NodaTime library)
+- fix #700 - new APIs to allow surrogates to be defined externally, and to be implemented over primitive backing types
+- fix #703 - new options on MSBuild targets (via Konstantin Sharon)
+- fix #693 - new `IgnoreUnknownSubTypes` API on `[ProtoContract(...)]` and `MetaType`; serializes the types it *does* understand, and silently ignores the unknown sub-types
+- fix #695 - JIT error when serialization callbacks declared at types other than the inheritance root
+- fix #713 - work correctly with arrays (etc) of nullable enum types
+- fix #697 - improve error reporting for invalid end-group markers
+- fix #668 - additional non-generic APIs
+- fix problem with protogen website not allowing imports
 
 ## 3.0.24
 

src/Benchmark/Benchmark.csproj

@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.12.3" />
+    <PackageReference Include="Google.Protobuf" Version="3.12.4" />
     <ProjectReference Include="..\protobuf-net\protobuf-net.csproj" />
     <PackageReference Include="Pipelines.Sockets.Unofficial" Version="2.1.16" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />

src/Benchmark/Codegen/protogen.cs

@@ -2,6 +2,7 @@
 // Consider using 'partial classes' to extend these types
 // Input: my.proto
 
+#pragma warning disable IDE0079
 #pragma warning disable CS1591, CS0612, CS0618, CS3021, IDE1006
 namespace protogen
 {
@@ -105,4 +106,4 @@ public partial class OrderLine : global::ProtoBuf.IExtensible
 
 }
 
-#pragma warning restore CS1591, CS0612, CS0618, CS3021, IDE1006
+#pragma warning restore IDE0079, CS1591, CS0612, CS0618, CS3021, IDE1006

src/BenchmarkBaseline/BenchmarkBaseline.csproj

@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="Google.Protobuf" Version="3.12.3" />
+    <PackageReference Include="Google.Protobuf" Version="3.12.4" />
     <PackageReference Include="protobuf-net" Version="2.4.6" />
     <PackageReference Include="Pipelines.Sockets.Unofficial" Version="2.1.16" />
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />

src/Directory.Build.props

@@ -5,7 +5,7 @@
     <OutputType>Library</OutputType>
     <SignAssembly>true</SignAssembly>
     <DelaySign>False</DelaySign>
-    <NoWarn>NU5105;CS1701;BC42016</NoWarn>
+    <NoWarn>NU5105;CS1701;BC42016;IDE0057</NoWarn>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)ProtoBuf.snk</AssemblyOriginatorKeyFile>
     <Copyright>See https://github.com/protobuf-net/protobuf-net</Copyright>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -31,8 +31,9 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31" PrivateAssets="All" />
     <!-- oh gawd, I'm just not emotionally prepared for this...
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.4">
       <PrivateAssets>all</PrivateAssets>

src/Examples/EnumTests.cs

@@ -72,7 +72,7 @@ enum blah {
    A = -1;
    C = 1;
 }
-", proto);
+", proto, ignoreLineEndingDifferences: true);
         }
 
 
@@ -96,7 +96,7 @@ enum blah {
    A = -1;
    C = 1;
 }
-", proto);
+", proto, ignoreLineEndingDifferences: true);
         }
 
         [Fact]
@@ -132,7 +132,7 @@ enum OutOfRangeEnum {
    // F = -2147483649; // note: enums should be valid 32-bit integers
 }
 */
-", proto);
+", proto, ignoreLineEndingDifferences: true);
         }
 
         public enum InRangeEnum : long
@@ -181,7 +181,7 @@ enum blah {
    A = -1;
    C = 1;
 }
-", proto);
+", proto, ignoreLineEndingDifferences: true);
         }
 
         [Fact]

src/Examples/Examples.csproj

@@ -17,16 +17,18 @@
     <ProjectReference Include="..\protobuf-net.MessagePipes\protobuf-net.MessagePipes.csproj" />
     <ProjectReference Include="..\protobuf-net\protobuf-net.csproj" />
     <ProjectReference Include="..\protobuf-net.Reflection\protobuf-net.Reflection.csproj" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
     <PackageReference Include="System.Threading.Channels" Version="4.7.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
+    <PackageReference Include="Xunit.SkippableFact" Version="1.4.13" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework)=='net462'">
     <PackageReference Include="NHibernate" Version="4.1.1.4000" />

src/Examples/Issues/Issue124.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Windows.Media;
 using Xunit;
@@ -36,25 +37,36 @@ public class TypeWithColor
             public Color Color { get; set; }
         }
 
-        [Fact]
+        [SkippableFact]
         public void TestMediaColorDirect()
         {
-            var model = RuntimeTypeModel.Create();
-            model.Add(typeof(Color), false).Add("A","R","G","B");
+            Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows));
+            AvoidJit();
+            static void AvoidJit()
+            {
+                var model = RuntimeTypeModel.Create();
+                model.Add(typeof(Color), false).Add("A", "R", "G", "B");
 
-            RoundtripTypeWithColor(model);
+                RoundtripTypeWithColor(model);
+            }
         }
 
-        [Fact]
+        [SkippableFact]
         public void TestMediaColorSurrogate()
         {
-            var model = RuntimeTypeModel.Create();
-            model.Add(typeof(Color), false).SetSurrogate(typeof(MyColor));
+            Skip.IfNot(RuntimeInformation.IsOSPlatform(OSPlatform.Windows));
+            AvoidJit();
 
-            RoundtripTypeWithColor(model);
+            static void AvoidJit()
+            {
+                var model = RuntimeTypeModel.Create();
+                model.Add(typeof(Color), false).SetSurrogate(typeof(MyColor));
+
+                RoundtripTypeWithColor(model);
+            }
         }
 
-        private void RoundtripTypeWithColor(RuntimeTypeModel model)
+        private static void RoundtripTypeWithColor(RuntimeTypeModel model)
         {
             var orig = new TypeWithColor
             {

src/Examples/Issues/Issue265.cs

@@ -105,7 +105,7 @@ enum E {
    V1 = 1;
    V2 = 2;
 }
-", schema);
+", schema, ignoreLineEndingDifferences: true);
         }
 
         [Fact]
@@ -133,7 +133,7 @@ enum E {
 message List_E {
    repeated E items = 1;
 }
-", schema);
+", schema, ignoreLineEndingDifferences: true);
         }
 
         private static void TestArray(TypeModel model)

src/Examples/Issues/Issue303.cs

@@ -40,7 +40,7 @@ public void TestEntireModel_Proto2()
 }
 ",
 
- model.GetSchema(null, ProtoSyntax.Proto2)
+ model.GetSchema(null, ProtoSyntax.Proto2), ignoreLineEndingDifferences: true
 
 );
         }
@@ -66,7 +66,7 @@ public void TestEntireModel_Proto3()
 }
 ",
 
- model.GetSchema(null, ProtoSyntax.Proto3)
+ model.GetSchema(null, ProtoSyntax.Proto3), ignoreLineEndingDifferences: true
 
 );
         }
@@ -143,7 +143,7 @@ public void TestInheritanceStartingWithBaseType()
 }
 ",
 
-                model.GetSchema(typeof(Animal), ProtoSyntax.Proto2)
+                model.GetSchema(typeof(Animal), ProtoSyntax.Proto2), ignoreLineEndingDifferences: true
 
                 );
         }
@@ -166,7 +166,7 @@ public void TestInheritanceStartingWithDerivedType()
 }
 ",
 
-                model.GetSchema(typeof(Animal), ProtoSyntax.Proto2)
+                model.GetSchema(typeof(Animal), ProtoSyntax.Proto2), ignoreLineEndingDifferences: true
 
                 );
         }

src/Examples/Issues/Issue304.cs

@@ -19,7 +19,7 @@ public void DefaultValuesForBoolMustBeLowerCase()
 }
 ",
 
-        Serializer.GetProto<Foo>(ProtoSyntax.Proto2)
+        Serializer.GetProto<Foo>(ProtoSyntax.Proto2), ignoreLineEndingDifferences: true
 
         );
         }

src/Examples/Issues/Issue306.cs

@@ -25,7 +25,7 @@ public void TestTuple()
 message Foo {
    map<int32,string> Lookup = 1;
 }
-", schema);
+", schema, ignoreLineEndingDifferences: true);
         }
 
         [ProtoContract]

src/Examples/Issues/Issue310.cs

@@ -33,7 +33,7 @@ public void Execute()
 message Dog {
    optional string OwnerName = 1;
 }
-", proto);
+", proto, ignoreLineEndingDifferences: true);
         }
 
         [ProtoContract]

src/Examples/Issues/Issue316.cs

@@ -30,7 +30,7 @@ public void Execute()
 message BinarySerializationSurrogate_MyException {
    optional bytes objectData = 1;
 }
-", proto);
+", proto, ignoreLineEndingDifferences: true);
         }
 
         class MyException : Exception { }

src/Examples/Issues/Issue329.cs

@@ -59,7 +59,7 @@ enum ETheoFlags {
 message Foo {
    optional ETheoFlags Flags = 1 [default = TF_P];
 }
-", proto);
+", proto, ignoreLineEndingDifferences: true);
         }
     }
 }

src/Examples/Issues/Issue647.Generated.cs

@@ -5,7 +5,7 @@
 // </auto-generated>
 
 #region Designer generated code
-#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
+#pragma warning disable CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
 namespace ProtoBuf.Issues.Issue647Types.Bar
 {
 
@@ -54,5 +54,5 @@ public partial class FooClass : global::ProtoBuf.IExtensible
 
 }
 
-#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
+#pragma warning restore CS0612, CS0618, CS1591, CS3021, IDE0079, IDE1006, RCS1036, RCS1057, RCS1085, RCS1192
 #endregion

src/Examples/Issues/Issue647.cs

@@ -51,7 +51,7 @@ public void GeneratedCodeIncludesNamespaces()
             }).Single().Text;
             Log(actualCsharp);
 
-            var expectedCsharp = File.ReadAllText(@"Issues\Issue647.Generated.cs");
+            var expectedCsharp = File.ReadAllText(@"Issues/Issue647.Generated.cs");
             Assert.Equal(expectedCsharp, actualCsharp, ignoreLineEndingDifferences: true);
         }
     }