Another cpm fix (#195)

serdedotnet · Aug 27, 2024 · 93c794a · 93c794a
1 parent cd3105b
commit 93c794a
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 15 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,25 +1,28 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageVersion Include="Antlr4.Runtime.Standard" Version="4.9.3" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
-    <PackageVersion Include="FsCheck" Version="2.15.3" />
-    <PackageVersion Include="FsCheck.Xunit" Version="2.15.3" />
+    <PackageVersion Include="FsCheck" Version="2.16.6" />
+    <PackageVersion Include="FsCheck.Xunit" Version="2.16.6" />
     <PackageVersion Include="NuGetizer" Version="0.9.0" />
     <PackageVersion Include="StaticCs" Version="0.2.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-1.final" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0-1.final" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="1.1.2" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
     <PackageVersion Include="Newtonsoft.JSON" Version="13.0.1" />
+    <PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
     <PackageVersion Include="PolyKit.Embedded" Version="2.0.30" />
     <PackageVersion Include="Verify.SourceGenerators" Version="2.2.0" />
     <PackageVersion Include="Verify.XUnit" Version="25.0.4" />
     <PackageVersion Include="xunit" Version="2.8.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/generator/Generator.Deserialize.cs b/src/generator/Generator.Deserialize.cs
@@ -95,7 +95,7 @@ private static MethodDeclarationSyntax GenerateEnumDeserializeMethod(
         throw new InvalidDeserializeValueException($"Unexpected value: {errorName}");
     }
     return index switch {
-        {{string.Join("," + Environment.NewLine, members
+        {{string.Join("," + Utilities.NewLine, members
             .Select((m, i) => $"{i} => {typeSyntax}.{m.Name}")) }},
         _ => throw new InvalidDeserializeValueException($"Unexpected index: {index}")
     };

diff --git a/src/generator/Generator.Impl.cs b/src/generator/Generator.Impl.cs
@@ -94,10 +94,10 @@ internal static void GenerateImpl(
             usings: List(new[] { UsingDirective(IdentifierName("System")), UsingDirective(IdentifierName("Serde")) }),
             attributeLists: default,
             members: List<MemberDeclarationSyntax>(new[] { newType }));
-        tree = tree.NormalizeWhitespace(eol: Environment.NewLine);
+        tree = tree.NormalizeWhitespace(eol: Utilities.NewLine);
 
         context.AddSource(srcName,
-            Environment.NewLine + "#nullable enable" + Environment.NewLine + tree.ToFullString());
+            Utilities.NewLine + "#nullable enable" + Utilities.NewLine + tree.ToFullString());
     }
 
     internal static (string FileName, string Body) MakePartialDecl(
@@ -126,7 +126,7 @@ internal static (string FileName, string Body) MakePartialDecl(
 
         newType = typeDeclContext.WrapNewType(newType);
 
-        return (srcName, Environment.NewLine + "#nullable enable" + Environment.NewLine + newType);
+        return (srcName, Utilities.NewLine + "#nullable enable" + Utilities.NewLine + newType);
     }
 
     /// <summary>

diff --git a/src/generator/Generator.Serialize.cs b/src/generator/Generator.Serialize.cs
@@ -45,7 +45,7 @@ internal static (MemberDeclarationSyntax[], BaseListSyntax) GenSerialize(
             statements.Add(ParseStatement($$"""
             var index = value switch
             {
-                {{string.Join("," + Environment.NewLine, fieldsAndProps
+                {{string.Join("," + Utilities.NewLine, fieldsAndProps
                     .Select((m, i) => $"{typeSyntax}.{m.Name} => {i}")) }},
                 var v => throw new InvalidOperationException($"Cannot serialize unnamed enum value '{v}' of enum '{{enumType.Name}}'"),
             };

diff --git a/src/generator/HelpersAndUtilities/Utilities.cs b/src/generator/HelpersAndUtilities/Utilities.cs
@@ -33,6 +33,10 @@ public static bool IsSorted<T>(this ReadOnlySpan<T> span, IComparer<T> comparer)
 
     internal static class Utilities
     {
+#pragma warning disable RS1035
+        public static readonly string NewLine = Environment.NewLine;
+#pragma warning restore RS1035
+
         public static T NotNull<T>(this T? value) where T : struct => value!.Value;
 
         public static string Concat(this string recv, string other)

diff --git a/src/generator/SerdeGenerator.csproj b/src/generator/SerdeGenerator.csproj
@@ -11,6 +11,7 @@
     <DefineConstants>$(DefineConstants);SRCGEN</DefineConstants>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/generator/SerdeInfoGenerator.cs b/src/generator/SerdeInfoGenerator.cs
@@ -57,7 +57,7 @@ public static void GenerateSerdeInfo(
             typeString = typeString + "<" + new string(',', receiverType.TypeParameters.Length - 1) + ">";
         }
 
-        var membersString = string.Join("," + Environment.NewLine,
+        var membersString = string.Join("," + Utilities.NewLine,
             SymbolUtilities.GetDataMembers(receiverType, SerdeUsage.Both).SelectNotNull(GetMemberEntry));
 
         List<string> makeArgs = [ $"\"{receiverType.Name}\"", $"typeof({typeString}).GetCustomAttributesData()" ];
@@ -83,7 +83,7 @@ public static void GenerateSerdeInfo(
     }
 """);
 
-        var argsString = string.Join("," + Environment.NewLine + "        ", makeArgs);
+        var argsString = string.Join("," + Utilities.NewLine + "        ", makeArgs);
 
         var body = $$"""
 static global::Serde.ISerdeInfo global::Serde.ISerdeInfoProvider.SerdeInfo { get; } = Serde.SerdeInfo.Make{{makeFuncSuffix}}(

diff --git a/src/generator/TypeDeclContext.cs b/src/generator/TypeDeclContext.cs
@@ -64,7 +64,7 @@ public string WrapNewType(string newType)
             }
             if (NamespaceNames.Count > 0)
             {
-                newType = "namespace " + string.Join(".", NamespaceNames) + ";" + Environment.NewLine + newType;
+                newType = "namespace " + string.Join(".", NamespaceNames) + ";" + Utilities.NewLine + newType;
             }
 
             return newType;

diff --git a/src/generator/Wrappers.cs b/src/generator/Wrappers.cs
@@ -53,9 +53,9 @@ readonly partial struct {{wrapperName}} { }
             usings: default,
             attributeLists: default,
             members: List<MemberDeclarationSyntax>(new[] { newType }));
-        tree = tree.NormalizeWhitespace(eol: Environment.NewLine);
+        tree = tree.NormalizeWhitespace(eol: Utilities.NewLine);
 
-        context.AddSource(fullWrapperName, Environment.NewLine + tree.ToFullString());
+        context.AddSource(fullWrapperName, Utilities.NewLine + tree.ToFullString());
     }
 
     // If the target is a core type, we can wrap it