Il repack issue investigation

src/Benchmark/Benchmark.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591;CA1822</NoWarn>
     <DefineConstants>$(DefineConstants);NEW_API</DefineConstants>
     <DefineConstants Condition="'$(TargetFramework)'=='net472'">$(DefineConstants);WRITE_DLL</DefineConstants>

src/BuildToolsUnitTests/RoslynInternals.cs

@@ -3,7 +3,7 @@
 using Microsoft.CodeAnalysis.Text;
 using ProtoBuf.BuildTools.Internal;
 using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysisNew;
 using System.Text;
 using System.Threading;
 
@@ -44,7 +44,7 @@ private class InMemoryConfigOptions : AnalyzerConfigOptions
             private readonly ImmutableDictionary<string, string> _values;
             public InMemoryConfigOptions(ImmutableDictionary<string, string> values)
                 => _values = values;
-            public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value)
+            public override bool TryGetValue(string key, [System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out string? value)
                 => _values.TryGetValue(key, out value);
         }
     }
@@ -92,6 +92,6 @@ public TestAnalyzerConfigOptions(ImmutableDictionary<string, string> properties)
             _backing = properties;
         }
 
-        public override bool TryGetValue(string key, [NotNullWhen(true)] out string? value) => _backing.TryGetValue(key, out value);
+        public override bool TryGetValue(string key, [System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out string? value) => _backing.TryGetValue(key, out value);
     }
 }

src/Directory.Build.props

@@ -24,7 +24,7 @@
         <DefaultLanguage>en-US</DefaultLanguage>
         <IncludeSymbols>false</IncludeSymbols>
         <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
-        <LangVersion>12</LangVersion>
+        <LangVersion>10</LangVersion>
         <Features>strict</Features>
         <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)Shared.ruleset</CodeAnalysisRuleset>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>

src/Examples/Examples.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <TargetFrameworks>net462;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <Configurations>Debug;Release;VS</Configurations>
     <DefineConstants>NO_CODEGEN;NO_WCF;NO_ENYIM</DefineConstants>
     <DefineConstants Condition="$(CI) != 'true'">$(DefineConstants);LONG_RUNNING</DefineConstants>

src/VBTest/VBTest.vbproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>14</LangVersion>
     <RootNamespace />
     <NoWarn>IDE1006</NoWarn>

src/protobuf-net.BuildTools/Analyzers/DataContractAnalyzer.cs

@@ -5,7 +5,7 @@
 using ProtoBuf.BuildTools.Internal;
 using System;
 using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysisNew;
 using System.Linq;
 
 namespace ProtoBuf.BuildTools.Analyzers
@@ -14,7 +14,7 @@ namespace ProtoBuf.BuildTools.Analyzers
     /// Reports common usage errors in code that uses protobuf-net
     /// </summary>
     [DiagnosticAnalyzer(LanguageNames.CSharp)]
-    [SuppressMessage("AnalyzerReferenceCodeFix", "RS1022", Justification = "Its fine to reference codeFix implementations from analyzer directly: https://github.com/dotnet/roslyn-analyzers/issues/5341")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("AnalyzerReferenceCodeFix", "RS1022", Justification = "Its fine to reference codeFix implementations from analyzer directly: https://github.com/dotnet/roslyn-analyzers/issues/5341")]
     public class DataContractAnalyzer : DiagnosticAnalyzer
     {
         internal static readonly DiagnosticDescriptor InvalidFieldNumber = new(

src/protobuf-net.Core/IProtoInputT.cs

@@ -1,5 +1,5 @@
 using ProtoBuf.Internal;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysisNew;
 
 namespace ProtoBuf
 {

src/protobuf-net.Core/IProtoOutputT.cs

@@ -1,5 +1,5 @@
 using ProtoBuf.Internal;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysisNew;
 
 namespace ProtoBuf
 {

src/protobuf-net.Core/Internal/DynamicallyAccessedMembersAttribute.cs

@@ -1,14 +1,6 @@
-#if PLAT_DYNAMIC_ACCESS_ATTR
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-// forwards, just to make it explicit that we mean the same
-[assembly: TypeForwardedTo(typeof(DynamicallyAccessedMembersAttribute))]
-[assembly: TypeForwardedTo(typeof(DynamicallyAccessedMemberTypes))]
-#endif
-
-namespace ProtoBuf.Internal
+namespace ProtoBuf.Internal
 {
-    using System.Diagnostics.CodeAnalysis;
+    using System.Diagnostics.CodeAnalysisNew;
     internal sealed class DynamicAccess
     {
         internal const DynamicallyAccessedMemberTypes ContractType
@@ -22,14 +14,7 @@ internal sealed class DynamicAccess
     }
 }
 
-#if !PLAT_DYNAMIC_ACCESS_ATTR
-// internalized version of https://github.com/dotnet/runtime/blob/master/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/DynamicallyAccessedMembersAttribute.cs
-// and https://github.com/dotnet/runtime/blob/master/src/libraries/System.Private.CoreLib/src/System/Diagnostics/CodeAnalysis/DynamicallyAccessedMemberTypes.cs
-
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-namespace System.Diagnostics.CodeAnalysis
+namespace System.Diagnostics.CodeAnalysisNew
 {
     /// <summary>
     /// Indicates that certain members on a specified <see cref="Type"/> are accessed dynamically,
@@ -53,7 +38,7 @@ namespace System.Diagnostics.CodeAnalysis
         AttributeTargets.Field | AttributeTargets.ReturnValue | AttributeTargets.GenericParameter |
         AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Method,
         Inherited = false)]
-    internal sealed class DynamicallyAccessedMembersAttribute : Attribute
+    public sealed class DynamicallyAccessedMembersAttribute : Attribute
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DynamicallyAccessedMembersAttribute"/> class
@@ -79,7 +64,7 @@ public DynamicallyAccessedMembersAttribute(DynamicallyAccessedMemberTypes member
     /// bitwise combination of its member values.
     /// </summary>
     [Flags]
-    internal enum DynamicallyAccessedMemberTypes
+    public enum DynamicallyAccessedMemberTypes
     {
         /// <summary>
         /// Specifies no members.
@@ -156,5 +141,4 @@ internal enum DynamicallyAccessedMemberTypes
         /// </summary>
         All = ~None
     }
-}
-#endif
+}

src/protobuf-net.Core/MeasureState.cs

@@ -2,7 +2,7 @@
 using ProtoBuf.Meta;
 using System;
 using System.Buffers;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysisNew;
 using System.IO;
 
 namespace ProtoBuf