From 25143e7024428f01adf8684332a83801811a1629 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Thu, 22 May 2025 13:23:14 -0700 Subject: [PATCH 01/10] Update Microsoft.CodeAnalysis.Analyzer projects to use project reference in source-build --- src/RoslynAnalyzers/Directory.Build.props | 6 +++++ ...osoft.CodeAnalysis.CSharp.Analyzers.csproj | 24 ++++++++++++++----- .../Microsoft.CodeAnalysis.Analyzers.csproj | 18 ++++++++++---- ....CodeAnalysis.VisualBasic.Analyzers.vbproj | 24 ++++++++++++++----- 4 files changed, 56 insertions(+), 16 deletions(-) diff --git a/src/RoslynAnalyzers/Directory.Build.props b/src/RoslynAnalyzers/Directory.Build.props index c08dda34252f3..3869550fbc4c6 100644 --- a/src/RoslynAnalyzers/Directory.Build.props +++ b/src/RoslynAnalyzers/Directory.Build.props @@ -25,6 +25,12 @@ $(DefineConstants),LEGACY_CODE_METRICS_MODE + + + + $(NoWarn);IDE0079 + + diff --git a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/CSharp/Microsoft.CodeAnalysis.CSharp.Analyzers.csproj b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/CSharp/Microsoft.CodeAnalysis.CSharp.Analyzers.csproj index 322ac96be237e..07ca685101455 100644 --- a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/CSharp/Microsoft.CodeAnalysis.CSharp.Analyzers.csproj +++ b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/CSharp/Microsoft.CodeAnalysis.CSharp.Analyzers.csproj @@ -9,10 +9,22 @@ - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj index 19567869442ea..9e24594133662 100644 --- a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj +++ b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj @@ -10,10 +10,20 @@ *$(MSBuildProjectFile)* Microsoft.CodeAnalysis - - - - + + + + + + + + + + + + + + diff --git a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj index 762346ab5da3f..7268a9278819e 100644 --- a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj +++ b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj @@ -10,10 +10,22 @@ - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8abc53bb34c7263877aca405a503a486246f2658 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 23 May 2025 10:06:49 -0700 Subject: [PATCH 02/10] Update Microsoft.CodeAnalysis.AnalyzerUtilities project --- ...icrosoft.CodeAnalysis.AnalyzerUtilities.csproj | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj index 293fcf122232e..0f01b40f158f7 100644 --- a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj +++ b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj @@ -17,10 +17,21 @@ $(NoWarn);RS0026 - + + + + + + + + + + + + @@ -35,7 +46,7 @@ - + From 20ef22f51e32a9670a07d1f1117ceb3e01c11b5b Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Fri, 23 May 2025 10:13:05 -0700 Subject: [PATCH 03/10] Update ResxSourceGenerator projects --- ...eAnalysis.ResxSourceGenerator.CSharp.csproj | 18 ++++++++++++++---- ...alysis.ResxSourceGenerator.UnitTests.csproj | 2 ++ ...ysis.ResxSourceGenerator.VisualBasic.csproj | 18 ++++++++++++++---- ...oft.CodeAnalysis.ResxSourceGenerator.csproj | 15 +++++++++++++-- 4 files changed, 43 insertions(+), 10 deletions(-) diff --git a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj index 8d90f7ff07965..93aef8f260982 100644 --- a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj +++ b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj @@ -9,10 +9,20 @@ *$(MSBuildProjectFile)* - - - - + + + + + + + + + + + + + + diff --git a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj index 94ce6b82cb444..98e013298f262 100644 --- a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj +++ b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj @@ -14,7 +14,9 @@ + + diff --git a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj index 8544e010e9866..49c651fc18aa9 100644 --- a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj +++ b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj @@ -9,10 +9,20 @@ *$(MSBuildProjectFile)* - - - - + + + + + + + + + + + + + + diff --git a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj index 492d813bdc739..d9374df726fae 100644 --- a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj +++ b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj @@ -17,10 +17,21 @@ - + + + + + + + + + + + + @@ -28,7 +39,7 @@ - + From bb1bc6019309c52891c50fc905ce6147a5be128f Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 23 Jun 2025 23:46:40 -0700 Subject: [PATCH 04/10] Don't build unit test projects in source build --- .../UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj | 1 + .../Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj | 1 + 2 files changed, 2 insertions(+) diff --git a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj index ebbe33408a048..ce32ee839c3ac 100644 --- a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj +++ b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.Analyzers/UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj @@ -3,6 +3,7 @@ $(NetRoslyn) true + true diff --git a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj index 98e013298f262..1a1d829966613 100644 --- a/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj +++ b/src/RoslynAnalyzers/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj @@ -5,6 +5,7 @@ true true + true From ef2331b0ff47d09aadfbd0b93e8d5f5ff8ffc729 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 23 Jun 2025 23:47:02 -0700 Subject: [PATCH 05/10] Update Roslyn.Diagnostics.Analyzers projects --- ...Roslyn.Diagnostics.CSharp.Analyzers.csproj | 30 +++++++++++++------ .../Core/Roslyn.Diagnostics.Analyzers.csproj | 17 +++++++++-- ...lyn.Diagnostics.Analyzers.UnitTests.csproj | 1 + ...n.Diagnostics.VisualBasic.Analyzers.vbproj | 24 +++++++++++---- 4 files changed, 54 insertions(+), 18 deletions(-) diff --git a/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj b/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj index 2c65aeb771ccb..061ad2a47ac2a 100644 --- a/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj +++ b/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj @@ -10,13 +10,25 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj b/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj index c31fff95ec751..cb964a356fe0b 100644 --- a/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj +++ b/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj @@ -17,10 +17,21 @@ - - - + + + + + + + + + + + + + + diff --git a/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/UnitTests/Roslyn.Diagnostics.Analyzers.UnitTests.csproj b/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/UnitTests/Roslyn.Diagnostics.Analyzers.UnitTests.csproj index fd90461e07ee5..c56f55e4c333c 100644 --- a/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/UnitTests/Roslyn.Diagnostics.Analyzers.UnitTests.csproj +++ b/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/UnitTests/Roslyn.Diagnostics.Analyzers.UnitTests.csproj @@ -3,6 +3,7 @@ $(NetRoslyn) true + true diff --git a/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj b/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj index 08b1f3d699736..4f24de5dec847 100644 --- a/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj +++ b/src/RoslynAnalyzers/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj @@ -7,12 +7,24 @@ - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file From f2ef2d14928d785f85da15e1254c2bb915fc62b1 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 23 Jun 2025 23:51:22 -0700 Subject: [PATCH 06/10] Update RoslynAnalyzer Tools projects --- ...GenerateDocumentationAndConfigFiles.csproj | 28 +++++++++++++---- ...ationAndConfigFilesForBrokenRuntime.csproj | 30 ++++++++++++++----- .../RulesetToEditorconfigConverter.csproj | 30 ++++++++++++++----- 3 files changed, 66 insertions(+), 22 deletions(-) diff --git a/src/RoslynAnalyzers/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj b/src/RoslynAnalyzers/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj index 29b28d5ab750a..b8953b75143c0 100644 --- a/src/RoslynAnalyzers/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj +++ b/src/RoslynAnalyzers/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj @@ -17,14 +17,30 @@ .NETStandard build of Microsoft.CodeAnalysis.Workspaces.Common v4.12.0 references Microsoft.BCL.AsyncInterfaces v8.0.0, we need to add it as a dependency. --> - - - - - - + + + + + + + + + + + + + + + + + + + + + + true - + true + + + $(DefineConstants),ROSLYN_4_12_OR_LOWER