diff --git a/Moq.sln b/Moq.sln
index 5ce04bbd6..9c56d0abd 100644
--- a/Moq.sln
+++ b/Moq.sln
@@ -1,82 +1,80 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.33913.275
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5A5B8C3-D43F-43C6-AEC7-6FA7C35B8BE9}"
- ProjectSection(SolutionItems) = preProject
- .netconfig = .netconfig
- .github\workflows\build.yml = .github\workflows\build.yml
- CHANGELOG.md = CHANGELOG.md
- CONTRIBUTING.md = CONTRIBUTING.md
- src\Directory.props = src\Directory.props
- License.txt = License.txt
- .github\workflows\publish.yml = .github\workflows\publish.yml
- readme.md = readme.md
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq", "src\Moq\Moq.csproj", "{1C91AC30-5977-4BE5-BA67-8EB186C03514}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Tests", "src\Moq.Tests\Moq.Tests.csproj", "{81BBC911-4916-4E10-A955-752AE47CB2B9}"
-EndProject
-Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Moq.Tests.VisualBasic", "src\Moq.Tests.VisualBasic\Moq.Tests.VisualBasic.vbproj", "{840A8B2E-3D4B-4521-A61A-0291562CDC8B}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Moq.Tests.FSharpTypes", "src\Moq.Tests.FSharpTypes\Moq.Tests.FSharpTypes.fsproj", "{2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Moq.CodeAnalysis", "src\Moq.CodeAnalysis\Moq.CodeAnalysis.csproj", "{FB06ED30-2AFD-44AF-A378-99C8B13BF29D}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Debug|x86 = Debug|x86
- Release|Any CPU = Release|Any CPU
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|x86.Build.0 = Debug|Any CPU
- {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|Any CPU.Build.0 = Release|Any CPU
- {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|x86.ActiveCfg = Release|Any CPU
- {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|x86.Build.0 = Release|Any CPU
- {81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|x86.ActiveCfg = Debug|Any CPU
- {81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|x86.Build.0 = Debug|Any CPU
- {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|Any CPU.Build.0 = Release|Any CPU
- {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|x86.ActiveCfg = Release|Any CPU
- {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|x86.Build.0 = Release|Any CPU
- {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|x86.Build.0 = Debug|Any CPU
- {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Release|Any CPU.Build.0 = Release|Any CPU
- {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Release|x86.ActiveCfg = Release|Any CPU
- {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Release|x86.Build.0 = Release|Any CPU
- {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Debug|x86.Build.0 = Debug|Any CPU
- {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Release|Any CPU.Build.0 = Release|Any CPU
- {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Release|x86.ActiveCfg = Release|Any CPU
- {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Release|x86.Build.0 = Release|Any CPU
- {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Debug|x86.Build.0 = Debug|Any CPU
- {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Release|Any CPU.Build.0 = Release|Any CPU
- {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Release|x86.ActiveCfg = Release|Any CPU
- {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {07E41389-7E3D-4881-AD8C-63655354D617}
- EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.33913.275
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A5A5B8C3-D43F-43C6-AEC7-6FA7C35B8BE9}"
+ ProjectSection(SolutionItems) = preProject
+ .netconfig = .netconfig
+ .github\workflows\build.yml = .github\workflows\build.yml
+ CHANGELOG.md = CHANGELOG.md
+ CONTRIBUTING.md = CONTRIBUTING.md
+ src\Directory.props = src\Directory.props
+ License.txt = License.txt
+ .github\workflows\publish.yml = .github\workflows\publish.yml
+ readme.md = readme.md
+ EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq", "src\Moq\Moq.csproj", "{1C91AC30-5977-4BE5-BA67-8EB186C03514}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Moq.Tests", "src\Moq.Tests\Moq.Tests.csproj", "{81BBC911-4916-4E10-A955-752AE47CB2B9}"
+EndProject
+Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Moq.Tests.VisualBasic", "src\Moq.Tests.VisualBasic\Moq.Tests.VisualBasic.vbproj", "{840A8B2E-3D4B-4521-A61A-0291562CDC8B}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Moq.Tests.FSharpTypes", "src\Moq.Tests.FSharpTypes\Moq.Tests.FSharpTypes.fsproj", "{2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|x86 = Debug|x86
+ Release|Any CPU = Release|Any CPU
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Debug|x86.Build.0 = Debug|Any CPU
+ {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|x86.ActiveCfg = Release|Any CPU
+ {1C91AC30-5977-4BE5-BA67-8EB186C03514}.Release|x86.Build.0 = Release|Any CPU
+ {81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {81BBC911-4916-4E10-A955-752AE47CB2B9}.Debug|x86.Build.0 = Debug|Any CPU
+ {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|x86.ActiveCfg = Release|Any CPU
+ {81BBC911-4916-4E10-A955-752AE47CB2B9}.Release|x86.Build.0 = Release|Any CPU
+ {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Debug|x86.Build.0 = Debug|Any CPU
+ {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Release|x86.ActiveCfg = Release|Any CPU
+ {840A8B2E-3D4B-4521-A61A-0291562CDC8B}.Release|x86.Build.0 = Release|Any CPU
+ {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Debug|x86.Build.0 = Debug|Any CPU
+ {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Release|x86.ActiveCfg = Release|Any CPU
+ {2D9EE4E0-8433-4F9C-A330-C4D74B956E0B}.Release|x86.Build.0 = Release|Any CPU
+ {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Debug|x86.Build.0 = Debug|Any CPU
+ {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Release|x86.ActiveCfg = Release|Any CPU
+ {FB06ED30-2AFD-44AF-A378-99C8B13BF29D}.Release|x86.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {07E41389-7E3D-4881-AD8C-63655354D617}
+ EndGlobalSection
+EndGlobal
diff --git a/src/Moq.CodeAnalysis/Moq.CodeAnalysis.csproj b/src/Moq.CodeAnalysis/Moq.CodeAnalysis.csproj
deleted file mode 100644
index c9a0b3c98..000000000
--- a/src/Moq.CodeAnalysis/Moq.CodeAnalysis.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- netstandard2.0
- analyzers/dotnet/roslyn4.0
- false
- true
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Moq.CodeAnalysis/Properties/Resources.es.resx b/src/Moq.CodeAnalysis/Properties/Resources.es.resx
deleted file mode 100644
index 16d828456..000000000
--- a/src/Moq.CodeAnalysis/Properties/Resources.es.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- Gracias desde Argentina con 💟!
-
-
- Tu patrocinio ayudará al desarrollo de un Moq incluso mejor para todos!
-
-
\ No newline at end of file
diff --git a/src/Moq.CodeAnalysis/Properties/Resources.resx b/src/Moq.CodeAnalysis/Properties/Resources.resx
deleted file mode 100644
index 5d50b54dd..000000000
--- a/src/Moq.CodeAnalysis/Properties/Resources.resx
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- Thank you from Argentina with 💟!
-
-
- Your sponsorship will help fund the development of an even greater Moq for all!
-
-
\ No newline at end of file
diff --git a/src/Moq.CodeAnalysis/SponsorLinker.cs b/src/Moq.CodeAnalysis/SponsorLinker.cs
deleted file mode 100644
index b7edf245d..000000000
--- a/src/Moq.CodeAnalysis/SponsorLinker.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-using System.Collections.Immutable;
-using System.Linq;
-using Devlooped;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Diagnostics;
-
-namespace Moq;
-
-[DiagnosticAnalyzer(LanguageNames.CSharp, LanguageNames.VisualBasic, LanguageNames.FSharp)]
-class SponsorLinker : SponsorLink
-{
- static readonly SponsorLinkSettings settings;
-
- static SponsorLinker()
- {
- settings = SponsorLinkSettings.Create("devlooped", "Moq",
- version: new Version(ThisAssembly.Info.Version).ToString(3),
- diagnosticsIdPrefix: "MOQ"
-#if DEBUG
- , quietDays: 0
-#endif
- );
-
- settings.SupportedDiagnostics = settings.SupportedDiagnostics
- .Select(x => x.IsKind(DiagnosticKind.UserNotSponsoring) ?
- x.With(messageFormat: Properties.Resources.UserNotSponsoring_Message) :
- x)
- .Select(x => x.IsKind(DiagnosticKind.Thanks) ?
- x.With(messageFormat: Properties.Resources.Thanks_Message) :
- x)
- .ToImmutableArray();
- }
-
- public SponsorLinker() : base(settings) { }
-}
\ No newline at end of file