chore: Add PolySharp libarary to use latest C# syntax (dotnet#9960)

filzrev · May 28, 2024 · e79f0cf · e79f0cf
1 parent 4211d09
commit e79f0cf
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 30 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -45,6 +45,13 @@
     <None Include="$(MSBuildThisFileDirectory)\README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="PolySharp">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub">
       <PrivateAssets>all</PrivateAssets>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -17,6 +17,7 @@
     <PackageVersion Include="OneOf.SourceGenerator" Version="3.0.271" />
     <PackageVersion Include="PdfPig" Version="0.1.9-alpha-20240510-d86c2" />
     <PackageVersion Include="PlantUml.Net" Version="1.4.80" />
+    <PackageVersion Include="PolySharp" Version="1.14.1" />
     <PackageVersion Include="Spectre.Console" Version="0.49.1" />
     <PackageVersion Include="Spectre.Console.Cli" Version="0.49.1" />
     <PackageVersion Include="Stubble.Core" Version="1.10.8" />

diff --git a/src/Docfx.Build/ApiPage/ApiPage.cs b/src/Docfx.Build/ApiPage/ApiPage.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NET7_0_OR_GREATER
-
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using OneOf;
@@ -160,5 +158,3 @@ static ApiPage()
     public string? languageId { get; init; }
     public Dictionary<string, OneOf<string, string[]>>? metadata { get; init; }
 }
-
-#endif
diff --git a/src/Docfx.Build/ApiPage/ApiPageHtmlTemplate.cs b/src/Docfx.Build/ApiPage/ApiPageHtmlTemplate.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NET7_0_OR_GREATER
-
 using System.Net;
 using OneOf;
 using static Docfx.Build.HtmlTemplate;
@@ -158,5 +156,3 @@ LinkSpan link when string.IsNullOrEmpty(link.url) => Html($"{link.text}"),
         };
     }
 }
-
-#endif
diff --git a/src/Docfx.Build/ApiPage/ApiPageMarkdownTemplate.cs b/src/Docfx.Build/ApiPage/ApiPageMarkdownTemplate.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NET7_0_OR_GREATER
-
 using System.Text;
 
 #nullable enable
@@ -124,5 +122,3 @@ internal static string Escape(string text)
         return sb.ToString();
     }
 }
-
-#endif
diff --git a/src/Docfx.Build/ApiPage/ApiPageProcessor.cs b/src/Docfx.Build/ApiPage/ApiPageProcessor.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NET7_0_OR_GREATER
-
 using System.Collections.Immutable;
 using System.Text.Json;
 using Docfx.Common;
@@ -74,5 +72,3 @@ public SaveResult Save(FileModel model)
         };
     }
 }
-
-#endif
diff --git a/src/Docfx.Build/DocumentBuilder.cs b/src/Docfx.Build/DocumentBuilder.cs
@@ -50,9 +50,7 @@ public void Build(IList<DocumentBuildParameters> parameters, string outputDirect
 
         var markdownService = CreateMarkdigMarkdownService(parameters[0]);
 
-#if NET7_0_OR_GREATER
         Processors = Processors.Append(new ApiPage.ApiPageDocumentProcessor(markdownService));
-#endif
 
         Logger.LogInfo($"{Processors.Count()} plug-in(s) loaded.");
         foreach (var processor in Processors)

diff --git a/src/Docfx.Dotnet/DotnetApiCatalog.ApiPage.cs b/src/Docfx.Dotnet/DotnetApiCatalog.ApiPage.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#if NET7_0_OR_GREATER
-
 using System.Collections.Concurrent;
 using System.Text.RegularExpressions;
 using Docfx.Build.ApiPage;
@@ -774,5 +772,3 @@ static string HtmlInnerText(string html)
         return doc.DocumentNode.InnerText;
     }
 }
-
-#endif
diff --git a/src/Docfx.Dotnet/DotnetApiCatalog.cs b/src/Docfx.Dotnet/DotnetApiCatalog.cs
@@ -89,20 +89,15 @@ async Task Build(ExtractMetadataConfig config, DotnetApiOptions options)
             switch (config.OutputFormat)
             {
                 case MetadataOutputFormat.Markdown:
-#if NET7_0_OR_GREATER
                     CreatePages(WriteMarkdown, assemblies, config, options);
 
                     void WriteMarkdown(string outputFolder, string id, Build.ApiPage.ApiPage apiPage)
                     {
                         File.WriteAllText(Path.Combine(outputFolder, $"{id}.md"), Docfx.Build.ApiPage.ApiPageMarkdownTemplate.Render(apiPage));
                     }
-#else
-                    Logger.LogError($"Markdown output format is only supported for docfx built against .NET 7 or greater.");
-#endif
                     break;
 
                 case MetadataOutputFormat.ApiPage:
-#if NET7_0_OR_GREATER
                     var serializer = new DeserializerBuilder().WithAttemptingUnquotedStringTypeDeserialization().Build();
                     CreatePages(WriteYaml, assemblies, config, options);
 
@@ -112,9 +107,6 @@ void WriteYaml(string outputFolder, string id, Build.ApiPage.ApiPage apiPage)
                         var obj = serializer.Deserialize(json);
                         YamlUtility.Serialize(Path.Combine(outputFolder, $"{id}.yml"), obj, "YamlMime:ApiPage");
                     }
-#else
-                    Logger.LogError($"ApiPage output format is only supported for docfx built against .NET 7 or greater.");
-#endif
                     break;
 
                 case MetadataOutputFormat.Mref: