From 2497e0dbbf29460cde4688e1ef5df7e3dc60beb8 Mon Sep 17 00:00:00 2001
From: filzrev <103790468+filzrev@users.noreply.github.com>
Date: Sat, 2 Mar 2024 19:25:32 +0900
Subject: [PATCH] chore: update roslyn packages
---
Directory.Packages.props | 21 ++++++++------------
src/Docfx.Dotnet/Docfx.Dotnet.csproj | 2 --
src/Docfx.Dotnet/DotnetApiCatalog.Compile.cs | 5 +++++
src/Docfx.Dotnet/DotnetApiCatalog.cs | 21 --------------------
4 files changed, 13 insertions(+), 36 deletions(-)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 79006176924..9678a159b1e 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -10,19 +10,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/Docfx.Dotnet/Docfx.Dotnet.csproj b/src/Docfx.Dotnet/Docfx.Dotnet.csproj
index ac8b613730d..4ed680f0d49 100644
--- a/src/Docfx.Dotnet/Docfx.Dotnet.csproj
+++ b/src/Docfx.Dotnet/Docfx.Dotnet.csproj
@@ -35,8 +35,6 @@
-
-
diff --git a/src/Docfx.Dotnet/DotnetApiCatalog.Compile.cs b/src/Docfx.Dotnet/DotnetApiCatalog.Compile.cs
index e61b0e076de..3473f2b6182 100644
--- a/src/Docfx.Dotnet/DotnetApiCatalog.Compile.cs
+++ b/src/Docfx.Dotnet/DotnetApiCatalog.Compile.cs
@@ -28,6 +28,11 @@ partial class DotnetApiCatalog
msbuildProperties["Configuration"] = "Release";
}
+ // NOTE:
+ // logger parameter is not works when using Roslyn 4.9.0 or later.
+ // It'll be fixed in later releases.
+ // - https://github.com/dotnet/roslyn/discussions/71950
+ // - https://github.com/dotnet/roslyn/issues/72202
var msbuildLogger = new ConsoleLogger(Logger.LogLevelThreshold switch
{
LogLevel.Verbose => LoggerVerbosity.Normal,
diff --git a/src/Docfx.Dotnet/DotnetApiCatalog.cs b/src/Docfx.Dotnet/DotnetApiCatalog.cs
index c6f0b116169..f39584a7d64 100644
--- a/src/Docfx.Dotnet/DotnetApiCatalog.cs
+++ b/src/Docfx.Dotnet/DotnetApiCatalog.cs
@@ -6,7 +6,6 @@
using Docfx.Common;
using Docfx.Exceptions;
using Docfx.Plugins;
-using Microsoft.Build.Locator;
using Newtonsoft.Json.Linq;
using YamlDotNet.Serialization;
@@ -59,8 +58,6 @@ internal static async Task Exec(MetadataJsonConfig config, DotnetApiOptions opti
{
var stopwatch = Stopwatch.StartNew();
- EnsureMSBuildLocator();
-
try
{
string originalGlobalNamespaceId = VisitorHelper.GlobalNamespaceId;
@@ -126,24 +123,6 @@ void WriteYaml(string outputFolder, string id, Build.ApiPage.ApiPage apiPage)
}
}
- private static void EnsureMSBuildLocator()
- {
- try
- {
- if (!MSBuildLocator.IsRegistered)
- {
- var vs = MSBuildLocator.RegisterDefaults() ?? throw new ExtractMetadataException(
- $"Cannot find a supported .NET Core SDK. Install .NET Core SDK {Environment.Version.Major}.{Environment.Version.Minor}.x to build .NET API docs.");
-
- Logger.LogInfo($"Using {vs.Name} {vs.Version}");
- }
- }
- catch (Exception e)
- {
- throw new ExtractMetadataException(e.Message, e);
- }
- }
-
private static ExtractMetadataConfig ConvertConfig(MetadataJsonItemConfig configModel, string configDirectory, string outputDirectory)
{
var projects = configModel.Src;