Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b101be8
Update dependencies from https://github.com/dotnet/roslyn build 20250…
dotnet-maestro[bot] Apr 2, 2025
1d4bcb1
Update dependencies from https://github.com/dotnet/roslyn build 20250…
dotnet-maestro[bot] Apr 2, 2025
214ef12
Update dependencies from https://github.com/dotnet/roslyn build 20250…
dotnet-maestro[bot] Apr 4, 2025
5499067
Update dependencies from https://github.com/dotnet/roslyn build 20250…
dotnet-maestro[bot] Apr 5, 2025
bacd701
Update dependencies from https://github.com/dotnet/roslyn build 20250…
dotnet-maestro[bot] Apr 7, 2025
7c65076
Update dependencies from https://github.com/dotnet/roslyn build 20250…
dotnet-maestro[bot] Apr 8, 2025
1e8b39d
Update dependencies from https://github.com/dotnet/roslyn build 20250…
dotnet-maestro[bot] Apr 8, 2025
a378145
Merge branch 'main' into darc-main-a33347be-45f2-4d0a-8558-17109ed677cd
ViktorHofer Apr 8, 2025
40646ab
Delete src/SourceBuild/patches/roslyn/0001-Update-maintenance-package…
ViktorHofer Apr 8, 2025
eba322e
Update dependencies from https://github.com/dotnet/roslyn build 20250…
dotnet-maestro[bot] Apr 10, 2025
c3fc8e7
Update dependencies from https://github.com/dotnet/roslyn build 20250…
dotnet-maestro[bot] Apr 10, 2025
0a41346
Add patch in reaction to new roslyn analyzer
ViktorHofer Apr 10, 2025
2a9310e
Merge branch 'main' into darc-main-a33347be-45f2-4d0a-8558-17109ed677cd
ViktorHofer Apr 10, 2025
ebdb3be
Fix patch
ViktorHofer Apr 10, 2025
bf415b2
Fix patch again
ViktorHofer Apr 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -125,47 +125,47 @@
<Sha>4ba36db1f42f33a66d9677f0b9d589d39b204a9c</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25179.1">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25179.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="5.0.0-1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25179.1">
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="5.0.0-1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25179.1">
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25179.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25179.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="5.0.0-1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25179.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25179.1">
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.14.0-3.25179.1">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25179.1">
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>304768b76e90f5d224b745e3a03cfc5e9509baf6</Sha>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.14.0-preview.1.102">
<Uri>https://github.com/nuget/nuget.client</Uri>
Expand Down Expand Up @@ -467,9 +467,9 @@
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>d98c60c0da655de406d3c45d0c82bfd82cc15a66</Sha>
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25177.1">
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>d98c60c0da655de406d3c45d0c82bfd82cc15a66</Sha>
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.12.0-beta1.25209.15">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>2a7692e3f2cc5ba34b9d10228117627d3fad2107</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.12.0-beta1.25177.1">
Expand Down
20 changes: 10 additions & 10 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.0-preview.25177.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25177.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.12.0-beta1.25209.15</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
Expand Down Expand Up @@ -222,15 +222,15 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25179.1</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25179.1</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25179.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftNetCompilersToolsetVersion>5.0.0-1.25209.15</MicrosoftNetCompilersToolsetVersion>
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.0.0-1.25209.15</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
<MicrosoftCodeAnalysisPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisPackageVersion>
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25209.15</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
Expand Down

This file was deleted.

101 changes: 101 additions & 0 deletions src/SourceBuild/patches/vstest/0001-Fix-formatting.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
From 0fc879489677500f088774f1e5f0b45f7457680e Mon Sep 17 00:00:00 2001
From: Viktor Hofer <[email protected]>
Date: Thu, 10 Apr 2025 14:05:56 +0200
Subject: [PATCH] Fix formatting in two files

Backport: https://github.com/microsoft/vstest/pull/15047

---
src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs | 1 +
.../ExtensionDecorators/ExtensionDecoratorFactory.cs | 1 +
.../ProtocolVersioning.cs | 1 +
.../EventHandlers/NullPathConverter.cs | 1 +
.../ShowDeprecateDotnetVStestMessageArgumentProcessor.cs | 1 +
test/TestAssets/NetStandard2Library/Class1.cs | 1 +
test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs | 1 +
7 files changed, 7 insertions(+)

diff --git a/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs b/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
index d5dfe8c7d..7e1a0dd8b 100644
--- a/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
+++ b/src/Microsoft.TestPlatform.Build/Tasks/VSTestLogsTask.cs
@@ -7,6 +7,7 @@ using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

namespace Microsoft.TestPlatform.Build.Tasks;
+
public class VSTestLogsTask : Task
{
public string? LogType { get; set; }
diff --git a/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
index 7a82106c7..498593b48 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionDecorators/ExtensionDecoratorFactory.cs
@@ -5,6 +5,7 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
using Microsoft.VisualStudio.TestPlatform.Utilities;

namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionDecorators;
+
internal class ExtensionDecoratorFactory
{
private readonly IFeatureFlag _featureFlag;
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
index 20ce0c44d..577c849a0 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/ProtocolVersioning.cs
@@ -4,6 +4,7 @@
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;

namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
internal static class ProtocolVersioning
{
public const int HighestSupportedVersion = Version7;
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
index 9460f19b0..3f699402e 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/NullPathConverter.cs
@@ -10,6 +10,7 @@ using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;

namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
+
internal class NullPathConverter : IPathConverter
{
private static readonly Lazy<NullPathConverter> LazyInstance = new(() => new NullPathConverter());
diff --git a/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs b/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
index 71db32aa9..686c3a44a 100644
--- a/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
+++ b/src/vstest.console/Processors/ShowDeprecateDotnetVStestMessageArgumentProcessor.cs
@@ -5,6 +5,7 @@ using System;
using System.Linq;

namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Processors;
+
internal class ShowDeprecateDotnetVStestMessageArgumentProcessor : IArgumentProcessor
{
public const string CommandName = "/ShowDeprecateDotnetVSTestMessage";
diff --git a/test/TestAssets/NetStandard2Library/Class1.cs b/test/TestAssets/NetStandard2Library/Class1.cs
index 7d5d17aa1..036fa82d3 100644
--- a/test/TestAssets/NetStandard2Library/Class1.cs
+++ b/test/TestAssets/NetStandard2Library/Class1.cs
@@ -4,6 +4,7 @@
using System;

namespace NetStandard2Library;
+
public class Class1
{

diff --git a/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs b/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
index 3a1cb11ab..5be76c100 100644
--- a/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
+++ b/test/vstest.ProgrammerTests/Fakes/FakeTestHost.cs
@@ -2,6 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace vstest.ProgrammerTests.Fakes;
+
internal class FakeTestHostFixture : IDisposable
{
public int Id { get; }