Skip to content

Commit 881800c

Browse files
adamintadamint
authored
Merge pull request #9689 from drewnoakes/use-newer-roslyn-api
Use newer Roslyn API
2 parents 2e08d4d + b5bb260 commit 881800c

File tree

133 files changed

+418
-495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+418
-495
lines changed

‎.editorconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ indent_size = 2
3939
[*.{cs,vb}]
4040
# Sort using and Import directives with System.* appearing first
4141
dotnet_sort_system_directives_first = true
42-
dotnet_style_require_accessibility_modifiers = always:warning
42+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
4343

4444
# No blank line between System.* and Microsoft.*
4545
dotnet_separate_import_directive_groups = false
@@ -398,6 +398,7 @@ dotnet_diagnostic.IDE0220.severity = warning # Add explicit cast
398398
dotnet_diagnostic.IDE0250.severity = warning # Struct can be made 'readonly'
399399
dotnet_diagnostic.IDE0251.severity = suggestion # Struct methods can be made 'readonly'
400400
dotnet_diagnostic.IDE0270.severity = suggestion # Use coalesce expression
401+
dotnet_diagnostic.IDE0300.severity = suggestion # Use collection expression
401402
dotnet_diagnostic.IDE1006.severity = warning # Naming styles Task Open() Task OpenAsync()
402403
dotnet_diagnostic.IDE1006WithoutSuggestion.severity = suggestion
403404

‎Directory.Packages.props‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -35,41 +35,42 @@
3535
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.79-alpha" />
3636
<PackageVersion Include="Nerdbank.Streams" Version="2.12.87" />
3737
<PackageVersion Include="System.IO.Pipelines" Version="9.0.0" />
38-
<PackageVersion Include="StreamJsonRpc" Version="2.22.7" />
38+
<PackageVersion Include="StreamJsonRpc" Version="2.23.32-alpha" />
3939

4040
<!-- VS SDK -->
4141
<!-- https://dev.azure.com/azure-public/vside/_artifacts/feed/vssdk -->
42-
<PackageVersion Include="EnvDTE" Version="17.13.38055-preview.1" />
43-
<PackageVersion Include="Microsoft.Internal.VisualStudio.Interop" Version="17.13.38055-preview.1" />
44-
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.8.55" />
45-
<PackageVersion Include="Microsoft.VisualStudio.ComponentModelHost" Version="17.13.13-preview" />
46-
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.13.41" />
47-
<PackageVersion Include="Microsoft.VisualStudio.Data.Core" Version="17.13.38047-preview.1" />
48-
<PackageVersion Include="Microsoft.VisualStudio.Data.Services" Version="17.13.38055-preview.1" />
49-
<PackageVersion Include="Microsoft.VisualStudio.DataDesign.Common" Version="17.13.38055-preview.1" />
50-
<PackageVersion Include="Microsoft.VisualStudio.DataTools.Interop" Version="17.13.38055-preview.1" />
51-
<PackageVersion Include="Microsoft.VisualStudio.Designer.Interfaces" Version="17.13.38055-preview.1" />
52-
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.13.38055-preview.1" />
53-
<PackageVersion Include="Microsoft.VisualStudio.Interop" Version="17.13.38055-preview.1" />
54-
<PackageVersion Include="Microsoft.VisualStudio.ManagedInterfaces" Version="17.13.38047-preview.1" />
55-
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.15.10-pre" />
56-
<PackageVersion Include="Microsoft.VisualStudio.Settings.15.0" Version="17.13.38055-preview.1" />
42+
<PackageVersion Include="EnvDTE" Version="18.0.1755-preview.1" />
43+
<PackageVersion Include="Microsoft.Internal.VisualStudio.Interop" Version="18.0.1755-preview.1" />
44+
<PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.9.11-beta" />
45+
<PackageVersion Include="Microsoft.VisualStudio.ComponentModelHost" Version="17.14.116" />
46+
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.13.50" />
47+
<PackageVersion Include="Microsoft.VisualStudio.Data.Core" Version="18.0.1755-preview.1" />
48+
<PackageVersion Include="Microsoft.VisualStudio.Data.Services" Version="18.0.1755-preview.1" />
49+
<PackageVersion Include="Microsoft.VisualStudio.DataDesign.Common" Version="18.0.1755-preview.1" />
50+
<PackageVersion Include="Microsoft.VisualStudio.DataTools.Interop" Version="18.0.1755-preview.1" />
51+
<PackageVersion Include="Microsoft.VisualStudio.Designer.Interfaces" Version="18.0.1755-preview.1" />
52+
<PackageVersion Include="Microsoft.VisualStudio.Editor" Version="18.0.300-preview" />
53+
<PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="18.0.1755-preview.1" />
54+
<PackageVersion Include="Microsoft.VisualStudio.Interop" Version="18.0.1755-preview.1" />
55+
<PackageVersion Include="Microsoft.VisualStudio.ManagedInterfaces" Version="18.0.1755-preview.1" />
56+
<PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.15.15-pre" />
57+
<PackageVersion Include="Microsoft.VisualStudio.Settings.15.0" Version="18.0.1755-preview.1" />
5758
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.12.2159" />
58-
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.13.38055-preview.1" />
59-
<PackageVersion Include="Microsoft.VisualStudio.Shell.Design" Version="17.13.38055-preview.1" />
60-
<PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="17.13.38055-preview.1" />
61-
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.14.8" />
62-
<PackageVersion Include="Microsoft.VisualStudio.TemplateWizardInterface" Version="17.13.38055-preview.1" />
63-
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.14.14" />
64-
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.14" />
65-
<PackageVersion Include="Microsoft.VisualStudio.Utilities" Version="17.14.39795" />
59+
<PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="18.0.1755-preview.1" />
60+
<PackageVersion Include="Microsoft.VisualStudio.Shell.Design" Version="18.0.1755-preview.1" />
61+
<PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="18.0.1755-preview.1" />
62+
<PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.14.18" />
63+
<PackageVersion Include="Microsoft.VisualStudio.TemplateWizardInterface" Version="18.0.1755-preview.1" />
64+
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.15.3-alpha" />
65+
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.15.3-alpha" />
66+
<PackageVersion Include="Microsoft.VisualStudio.Utilities" Version="18.0.1755-preview.1" />
6667
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
6768
<PackageVersion Include="Microsoft.VisualStudio.XmlEditor" Version="17.13.0-preview-1-35408-014" />
6869
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.13.17-preview1-ga15b669c04" />
6970
<PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.0" />
7071
<PackageVersion Include="System.Formats.Asn1" Version="8.0.1" />
71-
<PackageVersion Include="Microsoft.VSDesigner" Version="17.13.38055-preview.1" />
72-
<PackageVersion Include="VsWebSite.Interop" Version="17.13.38055-preview.1" />
72+
<PackageVersion Include="Microsoft.VSDesigner" Version="18.0.1755-preview.1" />
73+
<PackageVersion Include="VsWebSite.Interop" Version="18.0.1755-preview.1" />
7374

7475
<!-- CPS -->
7576
<!-- Find versions at https://dev.azure.com/azure-public/vside/_artifacts/feed/vs-impl -->
@@ -82,26 +83,26 @@
8283
<PackageVersion Include="Microsoft.VisualStudio.ProjectSystem.XamlTypes" Version="$(CPSPackageVersion)" />
8384

8485
<!-- Roslyn -->
85-
<PackageVersion Include="Microsoft.CodeAnalysis" Version="4.13.0-1.24505.1" />
86-
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.13.0-1.24505.1" />
86+
<PackageVersion Include="Microsoft.CodeAnalysis" Version="5.0.0-1.25321.102" />
87+
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.0.0-1.25321.102" />
8788
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
88-
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="4.13.0-1.24505.1" />
89-
<PackageVersion Include="Microsoft.VisualStudio.LanguageServices" Version="4.13.0-1.24505.1" />
89+
<PackageVersion Include="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25321.102" />
90+
<PackageVersion Include="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-1.25321.102" />
9091

9192
<!-- Analyzers -->
92-
<PackageVersion Include="CSharpIsNullAnalyzer" Version="0.1.329" />
93-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
94-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.13.0-1.24505.1" />
95-
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="4.13.0-1.24505.1" />
96-
<PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="3.11.0-beta1.24454.1" />
93+
<PackageVersion Include="CSharpIsNullAnalyzer" Version="0.1.593" />
94+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.0.0-1.25321.102" />
95+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25321.102" />
96+
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.CodeStyle" Version="5.0.0-1.25321.102" />
97+
<PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="5.0.0-1.25321.102" />
9798

9899
<!-- NuGet -->
99100
<PackageVersion Include="NuGet.VisualStudio" Version="17.13.0-preview.1.10" />
100101

101102
<!-- Framework packages -->
102103
<PackageVersion Include="Microsoft.IO.Redist" Version="6.1.0" />
103104
<!-- Pin version to avoid CVE in System.Text.Json 8.0.4 -->
104-
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
105+
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
105106

106107
<!-- MSBuild (for tests only) -->
107108
<PackageVersion Include="Microsoft.Build" Version="17.13.0-preview-24504-04" />
@@ -137,10 +138,10 @@
137138
<PackageVersion Include="MSTest.TestFramework" Version="2.1.2" />
138139

139140
<!-- Localization -->
140-
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
141+
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
141142

142143
<!-- MessagePack -->
143-
<PackageVersion Include="MessagePack" Version="2.5.192" />
144+
<PackageVersion Include="MessagePack" Version="2.5.198" />
144145
</ItemGroup>
145146

146147
</Project>

‎eng/imports/VisualStudio.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<!-- VS SDK -->
2727
<PackageReference Include="Microsoft.Internal.VisualStudio.Interop" />
2828
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" />
29+
<PackageReference Include="Microsoft.VisualStudio.Editor" />
2930
<PackageReference Include="Microsoft.VisualStudio.Interop" />
3031
<PackageReference Include="Microsoft.VisualStudio.ManagedInterfaces" />
3132
<PackageReference Include="Microsoft.VisualStudio.RpcContracts" />

‎src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Build/SolutionBuildManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public IVsHierarchy[] GetProjectDependencies(IVsHierarchy hierarchy)
143143

144144
if (count == 0)
145145
{
146-
return Array.Empty<IVsHierarchy>();
146+
return [];
147147
}
148148

149149
// Get all of the dependent projects, and add them to our list

‎src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/CreateFileFromTemplateService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public async Task<bool> CreateFileAsync(string templateFile, string path)
5050
{
5151
HierarchyId parentId = _projectVsServices.VsProject.GetHierarchyId(directoryName);
5252
var result = new VSADDRESULT[1];
53-
string[] files = new string[] { templateFilePath };
53+
string[] files = [templateFilePath];
5454
_projectVsServices.VsProject.AddItemWithSpecific(parentId, VSADDITEMOPERATION.VSADDITEMOP_RUNWIZARD, fileName, (uint)files.Length, files, IntPtr.Zero, 0, Guid.Empty, null, Guid.Empty, result);
5555

5656
if (result[0] == VSADDRESULT.ADDRESULT_Success)

‎src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Debug/ProjectLaunchTargetsProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public static void GetExeAndArguments(bool useCmdShell, string? debugExe, string
250250
_outputTypeChecker,
251251
validateSettings);
252252

253-
if (runnableProjectInfo == null)
253+
if (runnableProjectInfo is null)
254254
{
255255
return null;
256256
}

‎src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Debug/StartupProjectHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public ImmutableArray<T> GetExportFromDotNetStartupProjects<T>(string capability
6262
return results.ToImmutableAndFree();
6363
}
6464

65-
return ImmutableArray<T>.Empty;
65+
return [];
6666
}
6767

6868
public ImmutableArray<string> GetFullPathsOfStartupProjects()
@@ -86,6 +86,6 @@ public ImmutableArray<string> GetFullPathsOfStartupProjects()
8686
return results.ToImmutableAndFree();
8787
}
8888

89-
return ImmutableArray<string>.Empty;
89+
return [];
9090
}
9191
}

‎src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/DteEnvironmentOptions.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ public void SetOption<T>(string category, string page, string option, T newValue
3636
{
3737
EnvDTE.Properties? properties = _dte.Value.get_Properties(category, page);
3838

39-
if (properties is not null)
40-
{
41-
properties.Item(option).Value = newValue;
42-
}
39+
properties?.Item(option).Value = newValue;
4340
}
4441
}

‎src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Input/Commands/Ordering/OrderAddItemHintReceiver.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ internal class OrderAddItemHintReceiver : IProjectChangeHintReceiver
1111
{
1212
private readonly IProjectAccessor _accessor;
1313

14-
private ImmutableHashSet<string> _previousIncludes = ImmutableHashSet<string>.Empty;
14+
private ImmutableHashSet<string> _previousIncludes = [];
1515
private OrderingMoveAction _action = OrderingMoveAction.NoOp;
1616
private IProjectTree? _target;
1717
private bool _isHinting;
@@ -78,7 +78,7 @@ private void Reset()
7878
{
7979
_action = OrderingMoveAction.NoOp;
8080
_target = null;
81-
_previousIncludes = ImmutableHashSet<string>.Empty;
81+
_previousIncludes = [];
8282
_isHinting = false;
8383
}
8484

‎src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/ProjectSystem/VS/Input/Commands/Ordering/OrderingHelper.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public static bool TryMoveElementsAbove(Project project, ImmutableArray<ProjectI
122122
Requires.NotNull(project);
123123
Requires.NotNull(target);
124124

125-
ProjectItemElement? referenceElement = TryGetReferenceElement(project, target, ImmutableArray<string>.Empty, MoveAction.Above);
125+
ProjectItemElement? referenceElement = TryGetReferenceElement(project, target, [], MoveAction.Above);
126126
if (referenceElement is null)
127127
{
128128
return false;
@@ -139,7 +139,7 @@ public static bool TryMoveElementsBelow(Project project, ImmutableArray<ProjectI
139139
Requires.NotNull(project);
140140
Requires.NotNull(target);
141141

142-
ProjectItemElement? referenceElement = TryGetReferenceElement(project, target, ImmutableArray<string>.Empty, MoveAction.Below);
142+
ProjectItemElement? referenceElement = TryGetReferenceElement(project, target, [], MoveAction.Below);
143143
if (referenceElement is null)
144144
{
145145
return false;
@@ -436,11 +436,11 @@ private static bool TryMove(Project project, IProjectTree projectTree, IProjectT
436436
if (referenceProjectTree is not null)
437437
{
438438
// The reference element is the element for which moved items will be above or below it.
439-
ProjectItemElement? referenceElement = TryGetReferenceElement(project, referenceProjectTree, ImmutableArray<string>.Empty, moveAction);
439+
ProjectItemElement? referenceElement = TryGetReferenceElement(project, referenceProjectTree, [], moveAction);
440440

441441
if (referenceElement is not null)
442442
{
443-
ImmutableArray<ProjectItemElement> elements = GetItemElements(project, projectTree, ImmutableArray<string>.Empty);
443+
ImmutableArray<ProjectItemElement> elements = GetItemElements(project, projectTree, []);
444444
return TryMoveElements(elements, referenceElement, moveAction);
445445
}
446446
}

0 commit comments

Comments
 (0)