Skip to content

Commit 4c96873

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/roslyn (#48088)
[main] Update dependencies from dotnet/roslyn - Merge branch 'main' into darc-main-a33347be-45f2-4d0a-8558-17109ed677cd - Delete src/SourceBuild/patches/roslyn/0001-Update-maintenance-packages-versions-78005.patch - Add patch in reaction to new roslyn analyzer - Merge branch 'main' into darc-main-a33347be-45f2-4d0a-8558-17109ed677cd - Fix patch - Fix patch again
1 parent d2e279d commit 4c96873

File tree

4 files changed

+134
-105
lines changed

4 files changed

+134
-105
lines changed

‎eng/Version.Details.xml

+23-23
Original file line numberDiff line numberDiff line change
@@ -125,47 +125,47 @@
125125
<Sha>4ba36db1f42f33a66d9677f0b9d589d39b204a9c</Sha>
126126
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
127127
</Dependency>
128-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25179.1">
128+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25209.15">
129129
<Uri>https://github.com/dotnet/roslyn</Uri>
130-
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
130+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
131131
</Dependency>
132132
<!-- Intermediate is necessary for source build. -->
133-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25179.1">
133+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25209.15">
134134
<Uri>https://github.com/dotnet/roslyn</Uri>
135-
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
135+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
136136
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
137137
</Dependency>
138-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25179.1">
138+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="5.0.0-1.25209.15">
139139
<Uri>https://github.com/dotnet/roslyn</Uri>
140-
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
140+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
141141
</Dependency>
142-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25179.1">
142+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25209.15">
143143
<Uri>https://github.com/dotnet/roslyn</Uri>
144-
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
144+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
145145
</Dependency>
146-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25179.1">
146+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25209.15">
147147
<Uri>https://github.com/dotnet/roslyn</Uri>
148-
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
148+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
149149
</Dependency>
150-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25179.1">
150+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25209.15">
151151
<Uri>https://github.com/dotnet/roslyn</Uri>
152-
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
152+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
153153
</Dependency>
154-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25179.1">
154+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25209.15">
155155
<Uri>https://github.com/dotnet/roslyn</Uri>
156-
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
156+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
157157
</Dependency>
158-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25179.1">
158+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25209.15">
159159
<Uri>https://github.com/dotnet/roslyn</Uri>
160-
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
160+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
161161
</Dependency>
162-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-3.25179.1">
162+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25209.15">
163163
<Uri>https://github.com/dotnet/roslyn</Uri>
164-
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
164+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25179.1">
166+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25209.15">
167167
<Uri>https://github.com/dotnet/roslyn</Uri>
168-
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
168+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
169169
</Dependency>
170170
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.102">
171171
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -467,9 +467,9 @@
467467
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
468468
<Sha>d98c60c0da655de406d3c45d0c82bfd82cc15a66</Sha>
469469
</Dependency>
470-
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25177.1">
471-
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
472-
<Sha>d98c60c0da655de406d3c45d0c82bfd82cc15a66</Sha>
470+
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25209.15">
471+
<Uri>https://github.com/dotnet/roslyn</Uri>
472+
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
473473
</Dependency>
474474
<!-- Intermediate is necessary for source build. -->
475475
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.12.0-beta1.25177.1">

‎eng/Versions.props

+10-10
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
<PropertyGroup>
178178
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
179179
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25177.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
180-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25177.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
180+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25209.15</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
181181
</PropertyGroup>
182182
<PropertyGroup>
183183
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -222,15 +222,15 @@
222222
</PropertyGroup>
223223
<PropertyGroup>
224224
<!-- Dependencies from https://github.com/dotnet/roslyn -->
225-
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25179.1</MicrosoftNetCompilersToolsetVersion>
226-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25179.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
227-
<MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisPackageVersion>
228-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpPackageVersion>
229-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
230-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
231-
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
232-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
233-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
225+
<MicrosoftNetCompilersToolsetVersion>5.0.0-1.25209.15</MicrosoftNetCompilersToolsetVersion>
226+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.0.0-1.25209.15</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
227+
<MicrosoftCodeAnalysisPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisPackageVersion>
228+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpPackageVersion>
229+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
230+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
231+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
232+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
233+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
234234
</PropertyGroup>
235235
<PropertyGroup>
236236
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->

‎src/SourceBuild/patches/roslyn/0001-Update-maintenance-packages-versions-78005.patch

-72
This file was deleted.

‎src/SourceBuild/patches/vstest/0001-Fix-formatting.patch

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
From 0fc879489677500f088774f1e5f0b45f7457680e Mon Sep 17 00:00:00 2001
2+
From: Viktor Hofer <[email protected]>
3+
Date: Thu, 10 Apr 2025 14:05:56 +0200
4+
Subject: [PATCH] Fix formatting in two files
5+
6+
Backport: https://github.com/microsoft/vstest/pull/15047
7+
8+
---
9+
src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs | 1 +
10+
.../ExtensionDecorators/ExtensionDecoratorFactory.cs | 1 +
11+
.../ProtocolVersioning.cs | 1 +
12+
.../EventHandlers/NullPathConverter.cs | 1 +
13+
.../ShowDeprecateDotnetVStestMessageArgumentProcessor.cs | 1 +
14+
test/TestAssets/NetStandard2Library/Class1.cs | 1 +
15+
test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs | 1 +
16+
7 files changed, 7 insertions(+)
17+
18+
diff --git a/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs b/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
19+
index d5dfe8c7d..7e1a0dd8b 100644
20+
--- a/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
21+
+++ b/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
22+
@@ -7,6 +7,7 @@ using Microsoft.Build.Framework;
23+
using Microsoft.Build.Utilities;
24+
25+
namespace Microsoft.TestPlatform.Build.Tasks;
26+
+
27+
public class VSTestLogsTask : Task
28+
{
29+
public string? LogType { get; set; }
30+
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
31+
index 7a82106c7..498593b48 100644
32+
--- a/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
33+
+++ b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
34+
@@ -5,6 +5,7 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
35+
using Microsoft.VisualStudio.TestPlatform.Utilities;
36+
37+
namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionDecorators;
38+
+
39+
internal class ExtensionDecoratorFactory
40+
{
41+
private readonly IFeatureFlag _featureFlag;
42+
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
43+
index 20ce0c44d..577c849a0 100644
44+
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
45+
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
46+
@@ -4,6 +4,7 @@
47+
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
48+
49+
namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
50+
+
51+
internal static class ProtocolVersioning
52+
{
53+
public const int HighestSupportedVersion = Version7;
54+
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
55+
index 9460f19b0..3f699402e 100644
56+
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
57+
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
58+
@@ -10,6 +10,7 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel;
59+
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
60+
61+
namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
62+
+
63+
internal class NullPathConverter : IPathConverter
64+
{
65+
private static readonly Lazy<NullPathConverter> LazyInstance = new(() => new NullPathConverter());
66+
diff --git a/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs b/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
67+
index 71db32aa9..686c3a44a 100644
68+
--- a/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
69+
+++ b/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
70+
@@ -5,6 +5,7 @@ using System;
71+
using System.Linq;
72+
73+
namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
74+
+
75+
internal class ShowDeprecateDotnetVStestMessageArgumentProcessor : IArgumentProcessor
76+
{
77+
public const string CommandName = "/ShowDeprecateDotnetVSTestMessage";
78+
diff --git a/test/TestAssets/NetStandard2Library/Class1.cs b/test/TestAssets/NetStandard2Library/Class1.cs
79+
index 7d5d17aa1..036fa82d3 100644
80+
--- a/test/TestAssets/NetStandard2Library/Class1.cs
81+
+++ b/test/TestAssets/NetStandard2Library/Class1.cs
82+
@@ -4,6 +4,7 @@
83+
using System;
84+
85+
namespace NetStandard2Library;
86+
+
87+
public class Class1
88+
{
89+
90+
diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
91+
index 3a1cb11ab..5be76c100 100644
92+
--- a/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
93+
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
94+
@@ -2,6 +2,7 @@
95+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
96+
97+
namespace vstest.ProgrammerTests.Fakes;
98+
+
99+
internal class FakeTestHostFixture : IDisposable
100+
{
101+
public int Id { get; }

0 commit comments

Comments
 (0)