[BREAKING CHANGE]: drop builtin fsproj support (#8375)

dotnet · Jan 28, 2023 · 310a8d8 · 310a8d8
1 parent 2086320
commit 310a8d8
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 36 deletions.
diff --git a/.vsconfig b/.vsconfig
@@ -6,7 +6,6 @@
     "Microsoft.VisualStudio.Component.NuGet",
     "Microsoft.VisualStudio.Component.Roslyn.Compiler",
     "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
-    "Microsoft.VisualStudio.Component.FSharp",
     "Microsoft.NetCore.Component.SDK",
     "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
     "Microsoft.Component.MSBuild",

diff --git a/README.md b/README.md
@@ -47,7 +47,6 @@ We welcome code contributions through pull requests, issues tagged as **[`help-w
 
 - Install [Visual Studio 2022 (Community or higher)]((https://www.visualstudio.com/)) and make sure you have the latest updates.
   - Need [.NET Core SDK](https://dotnet.microsoft.com/download/dotnet-core) 6.x and 7.x.
-  - Need F# development tools.
 - Install NodeJS (16.x.x).
 - Install wkhtmltopdf on Windows to test PDF using `choco install wkhtmltopdf`.
 

diff --git a/docfx.sln b/docfx.sln
@@ -130,10 +130,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DocAsCode.Markdig
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DocAsCode.MarkdigEngine.Validators", "src\Microsoft.DocAsCode.MarkdigEngine.Validators\Microsoft.DocAsCode.MarkdigEngine.Validators.csproj", "{BD35FD90-4F00-4A19-9530-2279A6A15EE8}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.DocAsCode.Metadata.ManagedReference.FSharp", "src\Microsoft.DocAsCode.Metadata.ManagedReference.FSharp\Microsoft.DocAsCode.Metadata.ManagedReference.FSharp.fsproj", "{98610813-2DD7-4FB7-8F82-272EF3C40E89}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Microsoft.DocAsCode.Metadata.ManagedReference.FSharp.Tests", "test\Microsoft.DocAsCode.Metadata.ManagedReference.FSharp.Tests\Microsoft.DocAsCode.Metadata.ManagedReference.FSharp.Tests.fsproj", "{42D47E04-64AA-4828-9555-8C644F42A665}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Markdown", "Markdown", "{377A4748-C426-4D5E-9A25-6D1809A7B85C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{C533106C-5699-450C-A18C-249364CBF58B}"
@@ -792,30 +788,6 @@ Global
 		{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Release|x64.Build.0 = Release|Any CPU
 		{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Release|x86.ActiveCfg = Release|Any CPU
 		{BD35FD90-4F00-4A19-9530-2279A6A15EE8}.Release|x86.Build.0 = Release|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Debug|x64.Build.0 = Debug|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Debug|x86.Build.0 = Debug|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Release|Any CPU.Build.0 = Release|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Release|x64.ActiveCfg = Release|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Release|x64.Build.0 = Release|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Release|x86.ActiveCfg = Release|Any CPU
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89}.Release|x86.Build.0 = Release|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Debug|x64.Build.0 = Debug|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Debug|x86.Build.0 = Debug|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Release|x64.ActiveCfg = Release|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Release|x64.Build.0 = Release|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Release|x86.ActiveCfg = Release|Any CPU
-		{42D47E04-64AA-4828-9555-8C644F42A665}.Release|x86.Build.0 = Release|Any CPU
 		{4C9CF944-2489-4AC2-9B18-497D12B53769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4C9CF944-2489-4AC2-9B18-497D12B53769}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C9CF944-2489-4AC2-9B18-497D12B53769}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -913,8 +885,6 @@ Global
 		{FD0365CB-3F03-43B0-9FB2-FB50047BF3E5} = {377A4748-C426-4D5E-9A25-6D1809A7B85C}
 		{DD9736B2-8AA2-44AE-B0B3-57510FF0D634} = {926A0726-B806-4215-82EF-AF8E22D0FACF}
 		{BD35FD90-4F00-4A19-9530-2279A6A15EE8} = {377A4748-C426-4D5E-9A25-6D1809A7B85C}
-		{98610813-2DD7-4FB7-8F82-272EF3C40E89} = {3A6BE380-986B-40E9-A048-C9A9AE424D90}
-		{42D47E04-64AA-4828-9555-8C644F42A665} = {926A0726-B806-4215-82EF-AF8E22D0FACF}
 		{377A4748-C426-4D5E-9A25-6D1809A7B85C} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164}
 		{C533106C-5699-450C-A18C-249364CBF58B} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164}
 		{15381BB2-762E-4841-8E5B-ACE727A3F2DA} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164}

diff --git a/src/Microsoft.DocAsCode.Metadata.ManagedReference/ExtractMetadataWorker.cs b/src/Microsoft.DocAsCode.Metadata.ManagedReference/ExtractMetadataWorker.cs
@@ -19,7 +19,6 @@ namespace Microsoft.DocAsCode.Metadata.ManagedReference
     using Microsoft.DocAsCode.DataContracts.ManagedReference;
     using Microsoft.DocAsCode.Exceptions;
     using Microsoft.DocAsCode.Plugins;
-    using Microsoft.DocAsCode.Metadata.ManagedReference.FSharp;
 
     public sealed class ExtractMetadataWorker : IDisposable
     {
@@ -88,8 +87,7 @@ public ExtractMetadataWorker(ExtractMetadataInputModel input)
             });
 
             var roslynLoader = new RoslynProjectLoader(_workspace);
-            var fsharpLoader = new FSharpProjectLoader(msbuildProperties);
-            _loader = new AbstractProjectLoader(new IProjectLoader[] {roslynLoader, fsharpLoader});
+            _loader = new AbstractProjectLoader(new IProjectLoader[] { roslynLoader });
         }
 
         public async Task ExtractMetadataAsync()

diff --git a/....DocAsCode.Metadata.ManagedReference/Microsoft.DocAsCode.Metadata.ManagedReference.csproj b/....DocAsCode.Metadata.ManagedReference/Microsoft.DocAsCode.Metadata.ManagedReference.csproj
@@ -3,7 +3,6 @@
     <ProjectReference Include="..\Microsoft.DocAsCode.Common\Microsoft.DocAsCode.Common.csproj" />
     <ProjectReference Include="..\Microsoft.DocAsCode.DataContracts.Common\Microsoft.DocAsCode.DataContracts.Common.csproj" />
     <ProjectReference Include="..\Microsoft.DocAsCode.DataContracts.ManagedReference\Microsoft.DocAsCode.DataContracts.ManagedReference.csproj" />
-    <ProjectReference Include="..\Microsoft.DocAsCode.Metadata.ManagedReference.FSharp\Microsoft.DocAsCode.Metadata.ManagedReference.FSharp.fsproj" />
     <ProjectReference Include="..\Microsoft.DocAsCode.Metadata.ManagedReference.Roslyn\Microsoft.DocAsCode.Metadata.ManagedReference.Roslyn.csproj" />
     <ProjectReference Include="..\Microsoft.DocAsCode.YamlSerialization\Microsoft.DocAsCode.YamlSerialization.csproj" />
     <ProjectReference Include="..\Microsoft.DocAsCode.Plugins\Microsoft.DocAsCode.Plugins.csproj" />