Fix namespace errors and update final package to release versions

ashmind · Nov 15, 2024 · ebba857 · ebba857
1 parent b01367f
commit ebba857
Show file tree

Hide file tree

Showing 20 changed files with 124 additions and 109 deletions.
diff --git a/Internal.Roslyn410/CodeActionInternals.cs b/Internal.Roslyn410/CodeActionInternals.cs
@@ -3,7 +3,7 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using MirrorSharp.Internal.Roslyn.Internals;
 
-namespace MirrorSharp.Internal.Roslyn47 {
+namespace MirrorSharp.Internal.Roslyn410 {
     [Shared]
     [Export(typeof(ICodeActionInternals))]
     internal class CodeActionInternals : ICodeActionInternals {

diff --git a/Internal.Roslyn410/Internal.Roslyn410.csproj b/Internal.Roslyn410/Internal.Roslyn410.csproj
@@ -11,13 +11,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IgnoresAccessChecksToGenerator" Version="0.5.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0-3.final" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.10.0-3.final" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.10.0-3.final" PrivateAssets="All" />
+    <PackageReference Include="IgnoresAccessChecksToGenerator" Version="0.7.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.10.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Internal.RoslynInternals\Internal.RoslynInternals.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/Internal.Roslyn410/MirrorSharpDiagnosticAnalyzerService.cs b/Internal.Roslyn410/MirrorSharpDiagnosticAnalyzerService.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Composition;
 using System.Threading;
@@ -9,7 +10,7 @@
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Text;
 
-namespace MirrorSharp.Internal.Roslyn47 {
+namespace MirrorSharp.Internal.Roslyn410 {
     [Shared]
     [Export(typeof(IDiagnosticAnalyzerService))]
     internal class MirrorSharpDiagnosticAnalyzerService : IDiagnosticAnalyzerService {
@@ -18,7 +19,7 @@ internal class MirrorSharpDiagnosticAnalyzerService : IDiagnosticAnalyzerService
         Task IDiagnosticAnalyzerService.ForceAnalyzeProjectAsync(Project project, CancellationToken cancellationToken) => throw new NotSupportedException();
         Task<ImmutableArray<DiagnosticData>> IDiagnosticAnalyzerService.GetCachedDiagnosticsAsync(Workspace workspace, ProjectId? projectId, DocumentId? documentId, bool includeSuppressedDiagnostics, bool includeLocalDocumentDiagnostics, bool includeNonLocalDocumentDiagnostics, CancellationToken cancellationToken) => throw new NotSupportedException();
         Task<ImmutableArray<DiagnosticData>> IDiagnosticAnalyzerService.GetDiagnosticsAsync(Solution solution, ProjectId? projectId, DocumentId? documentId, bool includeSuppressedDiagnostics, bool includeNonLocalDocumentDiagnostics, CancellationToken cancellationToken) => throw new NotSupportedException();
-        Task<ImmutableArray<DiagnosticData>> IDiagnosticAnalyzerService.GetDiagnosticsForIdsAsync(Solution solution, ProjectId? projectId, DocumentId? documentId, ImmutableHashSet<string>? diagnosticIds, Func<DiagnosticAnalyzer, bool>? shouldIncludeAnalyzer, bool includeSuppressedDiagnostics, bool includeLocalDocumentDiagnostics, bool includeNonLocalDocumentDiagnostics, CancellationToken cancellationToken) => throw new NotSupportedException();
+        public Task<ImmutableArray<DiagnosticData>> GetDiagnosticsForIdsAsync(Solution solution, ProjectId? projectId, DocumentId? documentId, ImmutableHashSet<string>? diagnosticIds, Func<DiagnosticAnalyzer, bool>? shouldIncludeAnalyzer, Func<Project, DocumentId?, IReadOnlyList<DocumentId>>? getDocumentIds, bool includeSuppressedDiagnostics, bool includeLocalDocumentDiagnostics, bool includeNonLocalDocumentDiagnostics, CancellationToken cancellationToken) => throw new NotImplementedException();
         Task<ImmutableArray<DiagnosticData>> IDiagnosticAnalyzerService.GetDiagnosticsForSpanAsync(TextDocument document, TextSpan? range, Func<string, bool>? shouldIncludeDiagnostic, bool includeCompilerDiagnostics, bool includeSuppressedDiagnostics, ICodeActionRequestPriorityProvider priorityProvider, Func<string, IDisposable?>? addOperationScope, DiagnosticKind diagnosticKind, bool isExplicit, CancellationToken cancellationToken) => throw new NotSupportedException();
         Task<ImmutableArray<DiagnosticData>> IDiagnosticAnalyzerService.GetProjectDiagnosticsForIdsAsync(Solution solution, ProjectId? projectId, ImmutableHashSet<string>? diagnosticIds, Func<DiagnosticAnalyzer, bool>? shouldIncludeAnalyzer, bool includeSuppressedDiagnostics, bool includeNonLocalDocumentDiagnostics, CancellationToken cancellationToken) => throw new NotSupportedException();
         void IDiagnosticAnalyzerService.RequestDiagnosticRefresh() => throw new NotSupportedException();

diff --git a/Internal.Roslyn410/SignatureHelpProviderWrapper.cs b/Internal.Roslyn410/SignatureHelpProviderWrapper.cs
@@ -6,7 +6,7 @@
 using MirrorSharp.Internal.Roslyn.Internals;
 using SignatureHelpTriggerReason = Microsoft.CodeAnalysis.SignatureHelp.SignatureHelpTriggerReason;
 
-namespace MirrorSharp.Internal.Roslyn47 {
+namespace MirrorSharp.Internal.Roslyn410 {
     internal class SignatureHelpProviderWrapper : ISignatureHelpProviderWrapper {
         private readonly ISignatureHelpProvider _provider;
 

diff --git a/Internal.Roslyn410/SignatureHelpProviderWrapperResolver.cs b/Internal.Roslyn410/SignatureHelpProviderWrapperResolver.cs
@@ -7,7 +7,7 @@
 using Microsoft.CodeAnalysis.SignatureHelp;
 using MirrorSharp.Internal.Roslyn.Internals;
 
-namespace MirrorSharp.Internal.Roslyn47 {
+namespace MirrorSharp.Internal.Roslyn410 {
     [Export(typeof(ISignatureHelpProviderWrapperResolver))]
     internal class SignatureHelpProviderWrapperResolver : ISignatureHelpProviderWrapperResolver {
         private readonly IList<Lazy<ISignatureHelpProvider, OrderableLanguageMetadata>> _allProviders;

diff --git a/Internal.Roslyn410/WorkspaceAnalyzerOptionsInternals.cs b/Internal.Roslyn410/WorkspaceAnalyzerOptionsInternals.cs
@@ -3,7 +3,7 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using MirrorSharp.Internal.Roslyn.Internals;
 
-namespace MirrorSharp.Internal.Roslyn47 {
+namespace MirrorSharp.Internal.Roslyn410 {
     [Shared]
     [Export(typeof(IWorkspaceAnalyzerOptionsInternals))]
     internal class WorkspaceAnalyzerOptionsInternals : IWorkspaceAnalyzerOptionsInternals {

diff --git a/Internal.Roslyn410/packages.lock.json b/Internal.Roslyn410/packages.lock.json
@@ -4,21 +4,21 @@
     ".NETStandard,Version=v2.0": {
       "IgnoresAccessChecksToGenerator": {
         "type": "Direct",
-        "requested": "[0.5.0, )",
-        "resolved": "0.5.0",
-        "contentHash": "p0ZdbdGRAmRAhSm1HWZ4luy/RjLZlhGPmg9OWmVFYhrq526AtxmL5Pik7uZWf3Hr3PQRR8iTH+Kyf3eHyLAGCQ=="
+        "requested": "[0.7.0, )",
+        "resolved": "0.7.0",
+        "contentHash": "EJAf6FpUFmFjWWuKQ9swJe87KmE7mW32QDwjUWXMP4HKMJOjznm2Zol+zlMohG3j1jtXAgHG0CX2rvjAINxvfQ=="
       },
       "Microsoft.CodeAnalysis": {
         "type": "Direct",
-        "requested": "[4.10.0-3.final, )",
-        "resolved": "4.10.0-3.final",
-        "contentHash": "A3NrUaPNJcSmvQwgmU44QU2uoT2vzstBoxxs1UFi6sSdpjOziceyKgsraHxVs3b280P+uoPQ6YYTJ3c0xHS+yw==",
+        "requested": "[4.10.0, )",
+        "resolved": "4.10.0",
+        "contentHash": "UcAcN8FmV9Xesj9XQKqpeJxyOqofb0fsgMn97gnTeSQINrmbxMe5j2NlhHGkVl2qEZ/rXQcRcGth8K4AXdbprQ==",
         "dependencies": {
           "Humanizer.Core": "2.14.1",
           "Microsoft.Bcl.AsyncInterfaces": "8.0.0",
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-          "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.10.0-3.final]",
-          "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "[4.10.0-3.final]",
+          "Microsoft.CodeAnalysis.CSharp.Workspaces": "[4.10.0]",
+          "Microsoft.CodeAnalysis.VisualBasic.Workspaces": "[4.10.0]",
           "System.Buffers": "4.5.1",
           "System.Collections.Immutable": "8.0.0",
           "System.Composition": "8.0.0",
@@ -34,18 +34,18 @@
       },
       "Microsoft.CodeAnalysis.Features": {
         "type": "Direct",
-        "requested": "[4.10.0-3.final, )",
-        "resolved": "4.10.0-3.final",
-        "contentHash": "1Fd0T+3x/6UQUkntc+HsCpn0gaG4g4UTOtLvNa/T/gaY8LUdcXLxbs8cg6XQs0BeZ4A5GCsPyeSELfMmiVbWDQ==",
+        "requested": "[4.10.0, )",
+        "resolved": "4.10.0",
+        "contentHash": "me9ngfonU2Kkx+uMM2IC7HLQUaC8pDnQa5LW3GRlk5mcGJ1KLWeab+2+qgr1ltScAzh41vXkkwf8RbXiWBBR1g==",
         "dependencies": {
           "Humanizer.Core": "2.14.1",
           "Microsoft.Bcl.AsyncInterfaces": "8.0.0",
           "Microsoft.CodeAnalysis.AnalyzerUtilities": "3.3.0",
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-          "Microsoft.CodeAnalysis.Common": "[4.10.0-3.final]",
+          "Microsoft.CodeAnalysis.Common": "[4.10.0]",
           "Microsoft.CodeAnalysis.Elfie": "1.0.0",
-          "Microsoft.CodeAnalysis.Scripting.Common": "[4.10.0-3.final]",
-          "Microsoft.CodeAnalysis.Workspaces.Common": "[4.10.0-3.final]",
+          "Microsoft.CodeAnalysis.Scripting.Common": "[4.10.0]",
+          "Microsoft.CodeAnalysis.Workspaces.Common": "[4.10.0]",
           "Microsoft.DiaSymReader": "2.0.0",
           "System.Buffers": "4.5.1",
           "System.Collections.Immutable": "8.0.0",
@@ -66,20 +66,20 @@
       },
       "Microsoft.CodeAnalysis.PublicApiAnalyzers": {
         "type": "Direct",
-        "requested": "[3.3.0, )",
-        "resolved": "3.3.0",
-        "contentHash": "upaG6u/PxjkOj39Kk0DLmmA75acYChmv6/HnOUxvSgGWul53uPcVaPxBWCzkHDfIljyiq5qeIG+CatT8x8FAEA=="
+        "requested": "[3.3.4, )",
+        "resolved": "3.3.4",
+        "contentHash": "kNLTfXtXUWDHVt5iaPkkiPuyHYlMgLI6SOFT4w88bfeI2vqSeGgHunFkdvlaCM8RDfcY0t2+jnesQtidRJJ/DA=="
       },
       "Microsoft.CodeAnalysis.Workspaces.Common": {
         "type": "Direct",
-        "requested": "[4.10.0-3.final, )",
-        "resolved": "4.10.0-3.final",
-        "contentHash": "sPyN2bU+b7i0GGkXMuT2JQ6JKZAQCHmbzRnWghtpVPs/g4ox/hC15GzWNBmCzzWHYX+yBcLYP/WH9g/o7QUd+Q==",
+        "requested": "[4.10.0, )",
+        "resolved": "4.10.0",
+        "contentHash": "lSMNGNeROSbxvbgzJyQfJpLJM0BFRrSgxYs4BZuZvpL8TuyUorEYa/HCJDcclhSRhr76LGiTT5lfLu5QFoFF6A==",
         "dependencies": {
           "Humanizer.Core": "2.14.1",
           "Microsoft.Bcl.AsyncInterfaces": "8.0.0",
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-          "Microsoft.CodeAnalysis.Common": "[4.10.0-3.final]",
+          "Microsoft.CodeAnalysis.Common": "[4.10.0]",
           "System.Buffers": "4.5.1",
           "System.Collections.Immutable": "8.0.0",
           "System.Composition": "8.0.0",
@@ -127,8 +127,8 @@
       },
       "Microsoft.CodeAnalysis.Common": {
         "type": "Transitive",
-        "resolved": "4.10.0-3.final",
-        "contentHash": "dGgrhSNyRSPMyt0X7M8lEP69LyDCVxIFq5aRTi44jPNV3Me1JjjWiyoIYnWYnnQxovhoP9OkFKIjn1HiPSMAgg==",
+        "resolved": "4.10.0",
+        "contentHash": "7O4+dn0fNKykPpEB1i8/5EKzwD3fuu/shdbbnnsBmdiHMaBz6telOubDFwPwLQQ/PvOAWTFIWWTyAOmWvXRD2g==",
         "dependencies": {
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
           "System.Buffers": "4.5.1",
@@ -143,11 +143,11 @@
       },
       "Microsoft.CodeAnalysis.CSharp": {
         "type": "Transitive",
-        "resolved": "4.10.0-3.final",
-        "contentHash": "c2wZ9WvxrWTnTM8TKgsfMGXloghcAp7l+QSZU/R2646GRyGuGMS5T+56O5OkWd51IHgLeS5dFmd0nDeSi/SxZQ==",
+        "resolved": "4.10.0",
+        "contentHash": "iifqKy3KvCgPABHFbFlSxjEoE+OItZGuZ191NM/TWV750m1jMypr7BtrP65ET+OK2KNVupO8S8xCtxbNqw056A==",
         "dependencies": {
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-          "Microsoft.CodeAnalysis.Common": "[4.10.0-3.final]",
+          "Microsoft.CodeAnalysis.Common": "[4.10.0]",
           "System.Buffers": "4.5.1",
           "System.Collections.Immutable": "8.0.0",
           "System.Memory": "4.5.5",
@@ -160,15 +160,15 @@
       },
       "Microsoft.CodeAnalysis.CSharp.Workspaces": {
         "type": "Transitive",
-        "resolved": "4.10.0-3.final",
-        "contentHash": "A9F5B6GvbM/MuWpxqOyEdTsGfDuGbvRL9BGCWB/ZXCIMs9A/GWZOYzxj8x/BKcV6d5UVsfteyZklV93EB144uQ==",
+        "resolved": "4.10.0",
+        "contentHash": "s8qbD2i3zdol8QNcrCVw9URW71DUdg1UF0XCxxIaQoYbdpcKVy2DG127560psiqLEKxAEWA/DOFwL9CY2qGq1g==",
         "dependencies": {
           "Humanizer.Core": "2.14.1",
           "Microsoft.Bcl.AsyncInterfaces": "8.0.0",
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-          "Microsoft.CodeAnalysis.CSharp": "[4.10.0-3.final]",
-          "Microsoft.CodeAnalysis.Common": "[4.10.0-3.final]",
-          "Microsoft.CodeAnalysis.Workspaces.Common": "[4.10.0-3.final]",
+          "Microsoft.CodeAnalysis.CSharp": "[4.10.0]",
+          "Microsoft.CodeAnalysis.Common": "[4.10.0]",
+          "Microsoft.CodeAnalysis.Workspaces.Common": "[4.10.0]",
           "System.Buffers": "4.5.1",
           "System.Collections.Immutable": "8.0.0",
           "System.Composition": "8.0.0",
@@ -193,11 +193,11 @@
       },
       "Microsoft.CodeAnalysis.Scripting.Common": {
         "type": "Transitive",
-        "resolved": "4.10.0-3.final",
-        "contentHash": "Zyj2eeawROGFowJpQhLPhz1OT1h2VwwtMUe0k9+vdyzVIk4ZCJ46FIPUInqMejsaxvAPTE3jbBFrmY4Pa/N3AQ==",
+        "resolved": "4.10.0",
+        "contentHash": "L+IbItJyxtLcbSxRXvdJRCGMW9IgHXZvNl5VcuFMcb49nFnhqrm79y50GOukSyBccF0WlnalbjRK/Beb2aKJbw==",
         "dependencies": {
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-          "Microsoft.CodeAnalysis.Common": "[4.10.0-3.final]",
+          "Microsoft.CodeAnalysis.Common": "[4.10.0]",
           "System.Buffers": "4.5.1",
           "System.Collections.Immutable": "8.0.0",
           "System.Memory": "4.5.5",
@@ -210,11 +210,11 @@
       },
       "Microsoft.CodeAnalysis.VisualBasic": {
         "type": "Transitive",
-        "resolved": "4.10.0-3.final",
-        "contentHash": "nMEr4FkbRgTaeqMd+IR79umDgGwZujj6OzbQkHQ9HQqhalI2vBMbg773xM2y0kpPBraayb5DdGYlnq8x++4W/A==",
+        "resolved": "4.10.0",
+        "contentHash": "rqdpLqrACQwhr7pr21OCEpmSZthdWF7TfimCH9IUt+FCXLfpqNTkgB7qAF2ypVJTT5sc+hY1IQWeDPjSyJ3REg==",
         "dependencies": {
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-          "Microsoft.CodeAnalysis.Common": "[4.10.0-3.final]",
+          "Microsoft.CodeAnalysis.Common": "[4.10.0]",
           "System.Buffers": "4.5.1",
           "System.Collections.Immutable": "8.0.0",
           "System.Memory": "4.5.5",
@@ -227,15 +227,15 @@
       },
       "Microsoft.CodeAnalysis.VisualBasic.Workspaces": {
         "type": "Transitive",
-        "resolved": "4.10.0-3.final",
-        "contentHash": "7ije0gGO/JBuW2rL5vdU3VZ43p7B/4E0j06uGRpi+ORUEbKy9eCEqX5MxwoMU7UctBnkm8K/PK0zM6tDNBTx5Q==",
+        "resolved": "4.10.0",
+        "contentHash": "i0dtZ531kx7DiCBAzyrvEcYpK/tZQAJDmSKIQW3kENl5wPenOkQePvYNFZRrvOGzSgK5uZVs0Y3xW/B1ZCcQFA==",
         "dependencies": {
           "Humanizer.Core": "2.14.1",
           "Microsoft.Bcl.AsyncInterfaces": "8.0.0",
           "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
-          "Microsoft.CodeAnalysis.Common": "[4.10.0-3.final]",
-          "Microsoft.CodeAnalysis.VisualBasic": "[4.10.0-3.final]",
-          "Microsoft.CodeAnalysis.Workspaces.Common": "[4.10.0-3.final]",
+          "Microsoft.CodeAnalysis.Common": "[4.10.0]",
+          "Microsoft.CodeAnalysis.VisualBasic": "[4.10.0]",
+          "Microsoft.CodeAnalysis.Workspaces.Common": "[4.10.0]",
           "System.Buffers": "4.5.1",
           "System.Collections.Immutable": "8.0.0",
           "System.Composition": "8.0.0",

diff --git a/Internal.Roslyn411/CodeActionInternals.cs b/Internal.Roslyn411/CodeActionInternals.cs
@@ -3,7 +3,7 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using MirrorSharp.Internal.Roslyn.Internals;
 
-namespace MirrorSharp.Internal.Roslyn47 {
+namespace MirrorSharp.Internal.Roslyn411 {
     [Shared]
     [Export(typeof(ICodeActionInternals))]
     internal class CodeActionInternals : ICodeActionInternals {

diff --git a/Internal.Roslyn411/Internal.Roslyn411.csproj b/Internal.Roslyn411/Internal.Roslyn411.csproj
@@ -19,13 +19,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IgnoresAccessChecksToGenerator" Version="0.5.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.11.0-3.24281.8" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.11.0-3.24281.8" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.11.0-3.24281.8" PrivateAssets="All" />
+    <PackageReference Include="IgnoresAccessChecksToGenerator" Version="0.7.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="4.11.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.11.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.11.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Internal.RoslynInternals\Internal.RoslynInternals.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>