diff --git a/eng/Versions.props b/eng/Versions.props
index 64c006d304..bff1b8730c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -17,6 +17,8 @@
true
true
true
+
+ true
17.0.1056-Dev17PIAs-g9dffd635
16.0.2032702
@@ -48,11 +50,11 @@
Example of surface area usage:
- $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzers)
Example of executable usage:
- $(MicrosoftCodeAnalysisVersionForExecution)
+ $(MicrosoftCodeAnalysisVersionForExecution)
-->
diff --git a/src/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj b/src/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj
index 34a1d4e34a..9f022351bd 100644
--- a/src/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj
+++ b/src/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj
@@ -14,7 +14,7 @@
$(NoWarn);RS0026
- $(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers)
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/CSharp/Microsoft.CodeAnalysis.CSharp.Analyzers.csproj b/src/Microsoft.CodeAnalysis.Analyzers/CSharp/Microsoft.CodeAnalysis.CSharp.Analyzers.csproj
index e243f73824..7aba196f81 100644
--- a/src/Microsoft.CodeAnalysis.Analyzers/CSharp/Microsoft.CodeAnalysis.CSharp.Analyzers.csproj
+++ b/src/Microsoft.CodeAnalysis.Analyzers/CSharp/Microsoft.CodeAnalysis.CSharp.Analyzers.csproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers)
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj b/src/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj
index d2e367a068..e99f0a10ff 100644
--- a/src/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj
+++ b/src/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj
@@ -8,7 +8,7 @@
Restore would conclude that there is a cyclic dependency between Microsoft.CodeAnalysis and Microsoft.CodeAnalysis.Analyzers.
-->
*$(MSBuildProjectFile)*
- $(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers)
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj b/src/Microsoft.CodeAnalysis.Analyzers/UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj
index 36440920cb..f320588f73 100644
--- a/src/Microsoft.CodeAnalysis.Analyzers/UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj
+++ b/src/Microsoft.CodeAnalysis.Analyzers/UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj
@@ -5,7 +5,7 @@
true
- $(MicrosoftCodeAnalysisVersionForTests)
+ $(MicrosoftCodeAnalysisVersionForTests)
diff --git a/src/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj b/src/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj
index c397f53a9b..dc99d9ca69 100644
--- a/src/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj
+++ b/src/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers)
diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.csproj b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.csproj
index 5759c097f3..c1fd63bdc4 100644
--- a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.csproj
+++ b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.BannedApiAnalyzers.csproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisVersionForBannedApiAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForBannedApiAnalyzers)
diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/Microsoft.CodeAnalysis.BannedApiAnalyzers.csproj b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/Microsoft.CodeAnalysis.BannedApiAnalyzers.csproj
index 120cf5f4b3..6758d5e546 100644
--- a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/Microsoft.CodeAnalysis.BannedApiAnalyzers.csproj
+++ b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/Microsoft.CodeAnalysis.BannedApiAnalyzers.csproj
@@ -7,7 +7,7 @@
Restore would conclude that there is a cyclic dependency between us and the Microsoft.CodeAnalysis.BannedApiAnalyzer package.
-->
*$(MSBuildProjectFile)*
- $(MicrosoftCodeAnalysisVersionForBannedApiAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForBannedApiAnalyzers)
diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.BannedApiAnalyzers.UnitTests.csproj b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.BannedApiAnalyzers.UnitTests.csproj
index bce76cb5aa..3f7fc73bd9 100644
--- a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.BannedApiAnalyzers.UnitTests.csproj
+++ b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.BannedApiAnalyzers.UnitTests.csproj
@@ -4,7 +4,7 @@
$(NetCurrent)
true
true
- $(MicrosoftCodeAnalysisVersionForTests)
+ $(MicrosoftCodeAnalysisVersionForTests)
diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.BannedApiAnalyzers.vbproj b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.BannedApiAnalyzers.vbproj
index 92a44dbe1f..7584b961e7 100644
--- a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.BannedApiAnalyzers.vbproj
+++ b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.BannedApiAnalyzers.vbproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisVersionForBannedApiAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForBannedApiAnalyzers)
diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj
index 121341880e..5702275c85 100644
--- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj
+++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp/Microsoft.CodeAnalysis.ResxSourceGenerator.CSharp.csproj
@@ -7,7 +7,7 @@
*$(MSBuildProjectFile)*
- $(MicrosoftCodeAnalysisVersionForResxSourceGenerators)
+ $(MicrosoftCodeAnalysisVersionForResxSourceGenerators)
diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj
index 51e1a94ae8..2a86398736 100644
--- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj
+++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests/Microsoft.CodeAnalysis.ResxSourceGenerator.UnitTests.csproj
@@ -5,7 +5,7 @@
true
true
- $(MicrosoftCodeAnalysisVersionForResxSourceGenerators)
+ $(MicrosoftCodeAnalysisVersionForResxSourceGenerators)
diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj
index a59512a3c4..9be11e1129 100644
--- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj
+++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic/Microsoft.CodeAnalysis.ResxSourceGenerator.VisualBasic.csproj
@@ -7,7 +7,7 @@
*$(MSBuildProjectFile)*
- $(MicrosoftCodeAnalysisVersionForResxSourceGenerators)
+ $(MicrosoftCodeAnalysisVersionForResxSourceGenerators)
diff --git a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj
index 35f916d28c..dfb03f47db 100644
--- a/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj
+++ b/src/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator/Microsoft.CodeAnalysis.ResxSourceGenerator.csproj
@@ -7,7 +7,7 @@
*$(MSBuildProjectFile)*
- $(MicrosoftCodeAnalysisVersionForResxSourceGenerators)
+ $(MicrosoftCodeAnalysisVersionForResxSourceGenerators)
diff --git a/src/NetAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.csproj b/src/NetAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.csproj
index 5323503d4e..8938c81bab 100644
--- a/src/NetAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.csproj
+++ b/src/NetAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.csproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisVersionForNetAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForNetAnalyzers)
diff --git a/src/NetAnalyzers/Core/Microsoft.CodeAnalysis.NetAnalyzers.csproj b/src/NetAnalyzers/Core/Microsoft.CodeAnalysis.NetAnalyzers.csproj
index 3cbe41a6ec..bbd73f89f6 100644
--- a/src/NetAnalyzers/Core/Microsoft.CodeAnalysis.NetAnalyzers.csproj
+++ b/src/NetAnalyzers/Core/Microsoft.CodeAnalysis.NetAnalyzers.csproj
@@ -9,7 +9,7 @@
*$(MSBuildProjectFile)*
true
- $(MicrosoftCodeAnalysisVersionForNetAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForNetAnalyzers)
diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests.csproj b/src/NetAnalyzers/UnitTests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests.csproj
index d5560f7056..03b1ec5dda 100644
--- a/src/NetAnalyzers/UnitTests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests.csproj
+++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests.csproj
@@ -4,9 +4,7 @@
$(NetCurrent)
$(DefineConstants),NET_ANALYZERS_TEST
true
-
- $(MicrosoftCodeAnalysisVersionForTests)
+ $(MicrosoftCodeAnalysisVersionForTests)
diff --git a/src/NetAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.vbproj b/src/NetAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.vbproj
index 26f729cee4..c6c880e69d 100644
--- a/src/NetAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.vbproj
+++ b/src/NetAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.vbproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisVersionForNetAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForNetAnalyzers)
diff --git a/src/PerformanceSensitiveAnalyzers/CSharp/Analyzers/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.csproj b/src/PerformanceSensitiveAnalyzers/CSharp/Analyzers/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.csproj
index f8f2fb148c..b2a94395e1 100644
--- a/src/PerformanceSensitiveAnalyzers/CSharp/Analyzers/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.csproj
+++ b/src/PerformanceSensitiveAnalyzers/CSharp/Analyzers/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.csproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzers)
diff --git a/src/PerformanceSensitiveAnalyzers/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.CodeFixes.csproj b/src/PerformanceSensitiveAnalyzers/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.CodeFixes.csproj
index cce4334dbd..e58c1ab124 100644
--- a/src/PerformanceSensitiveAnalyzers/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.CodeFixes.csproj
+++ b/src/PerformanceSensitiveAnalyzers/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.CodeFixes.csproj
@@ -3,7 +3,7 @@
netstandard2.0
true
- $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzers)
diff --git a/src/PerformanceSensitiveAnalyzers/Core/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.csproj b/src/PerformanceSensitiveAnalyzers/Core/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.csproj
index a0f99de7ed..c8cec27a16 100644
--- a/src/PerformanceSensitiveAnalyzers/Core/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.csproj
+++ b/src/PerformanceSensitiveAnalyzers/Core/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.csproj
@@ -7,7 +7,7 @@
Restore would conclude that there is a cyclic dependency between us and the Microsoft.CodeAnalysis.PerformanceSensitive.Analyzers nuget package.
-->
*$(MSBuildProjectFile)*
- $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzers)
diff --git a/src/PerformanceSensitiveAnalyzers/UnitTests/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.UnitTests.csproj b/src/PerformanceSensitiveAnalyzers/UnitTests/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.UnitTests.csproj
index e855dba308..8e555d9c5c 100644
--- a/src/PerformanceSensitiveAnalyzers/UnitTests/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.UnitTests.csproj
+++ b/src/PerformanceSensitiveAnalyzers/UnitTests/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.UnitTests.csproj
@@ -9,7 +9,7 @@
$(NoWarn);CA2007
true
- $(MicrosoftCodeAnalysisVersionForTests)
+ $(MicrosoftCodeAnalysisVersionForTests)
diff --git a/src/PerformanceTests/Tests/PerformanceTests.csproj b/src/PerformanceTests/Tests/PerformanceTests.csproj
index d5bfd717c0..4382a24b8c 100644
--- a/src/PerformanceTests/Tests/PerformanceTests.csproj
+++ b/src/PerformanceTests/Tests/PerformanceTests.csproj
@@ -15,7 +15,7 @@
Release
false
true
- $(MicrosoftCodeAnalysisVersionForTests)
+ $(MicrosoftCodeAnalysisVersionForTests)
diff --git a/src/PerformanceTests/Utilities/CSharp/CSharpPerfUtilities.csproj b/src/PerformanceTests/Utilities/CSharp/CSharpPerfUtilities.csproj
index 1e97847aa3..ffa85902cb 100644
--- a/src/PerformanceTests/Utilities/CSharp/CSharpPerfUtilities.csproj
+++ b/src/PerformanceTests/Utilities/CSharp/CSharpPerfUtilities.csproj
@@ -4,8 +4,7 @@
net6.0
true
true
-
- $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
+ $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
diff --git a/src/PerformanceTests/Utilities/Common/CommonPerfUtilities.csproj b/src/PerformanceTests/Utilities/Common/CommonPerfUtilities.csproj
index 0393687749..48029c855c 100644
--- a/src/PerformanceTests/Utilities/Common/CommonPerfUtilities.csproj
+++ b/src/PerformanceTests/Utilities/Common/CommonPerfUtilities.csproj
@@ -4,8 +4,7 @@
net6.0
true
true
-
- $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
+ $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
diff --git a/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj b/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj
index 079c1c076a..bba887dbbe 100644
--- a/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj
+++ b/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj
@@ -5,8 +5,7 @@
false
true
true
-
- $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
+ $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
diff --git a/src/PerformanceTests/Utilities/VisualBasic/VisualBasicPerfUtilities.csproj b/src/PerformanceTests/Utilities/VisualBasic/VisualBasicPerfUtilities.csproj
index 3cfe912d09..a60f2bdd98 100644
--- a/src/PerformanceTests/Utilities/VisualBasic/VisualBasicPerfUtilities.csproj
+++ b/src/PerformanceTests/Utilities/VisualBasic/VisualBasicPerfUtilities.csproj
@@ -4,8 +4,7 @@
net6.0
true
true
-
- $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
+ $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
diff --git a/src/PublicApiAnalyzers/Core/Analyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.csproj b/src/PublicApiAnalyzers/Core/Analyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.csproj
index ea9ae2ace5..dc0eb0a536 100644
--- a/src/PublicApiAnalyzers/Core/Analyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.csproj
+++ b/src/PublicApiAnalyzers/Core/Analyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.csproj
@@ -7,7 +7,7 @@
Restore would conclude that there is a cyclic dependency between us and the Microsoft.CodeAnalysis.PublicApiAnalyzer package.
-->
*$(MSBuildProjectFile)*
- $(MicrosoftCodeAnalysisVersionForPublicApiAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForPublicApiAnalyzers)
diff --git a/src/PublicApiAnalyzers/Core/CodeFixes/Microsoft.CodeAnalysis.PublicApiAnalyzers.CodeFixes.csproj b/src/PublicApiAnalyzers/Core/CodeFixes/Microsoft.CodeAnalysis.PublicApiAnalyzers.CodeFixes.csproj
index 9eba43c28c..3a5057c2c9 100644
--- a/src/PublicApiAnalyzers/Core/CodeFixes/Microsoft.CodeAnalysis.PublicApiAnalyzers.CodeFixes.csproj
+++ b/src/PublicApiAnalyzers/Core/CodeFixes/Microsoft.CodeAnalysis.PublicApiAnalyzers.CodeFixes.csproj
@@ -7,7 +7,7 @@
Restore would conclude that there is a cyclic dependency between us and the DotNetAnalyzers.PublicApiAnalyzer.CodeFixes package.
-->
*$(MSBuildProjectFile)*
- $(MicrosoftCodeAnalysisVersionForPublicApiAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForPublicApiAnalyzers)
true
diff --git a/src/PublicApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.PublicApiAnalyzers.UnitTests.csproj b/src/PublicApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.PublicApiAnalyzers.UnitTests.csproj
index a6fa953a9a..c31db32ed3 100644
--- a/src/PublicApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.PublicApiAnalyzers.UnitTests.csproj
+++ b/src/PublicApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.PublicApiAnalyzers.UnitTests.csproj
@@ -3,7 +3,7 @@
$(NetCurrent)
true
- $(MicrosoftCodeAnalysisVersionForTests)
+ $(MicrosoftCodeAnalysisVersionForTests)
diff --git a/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj b/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj
index 82c5ae4867..d1bb076428 100644
--- a/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj
+++ b/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)
+ $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)
diff --git a/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj b/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj
index 60450aee0e..144338a28e 100644
--- a/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj
+++ b/src/Roslyn.Diagnostics.Analyzers/Core/Roslyn.Diagnostics.Analyzers.csproj
@@ -7,7 +7,7 @@
Restore would conclude that there is a cyclic dependency between us and the Roslyn.Diagnostics.Analyzers package.
-->
*$(MSBuildProjectFile)*
- $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)
+ $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)
diff --git a/src/Roslyn.Diagnostics.Analyzers/UnitTests/Roslyn.Diagnostics.Analyzers.UnitTests.csproj b/src/Roslyn.Diagnostics.Analyzers/UnitTests/Roslyn.Diagnostics.Analyzers.UnitTests.csproj
index fa6476ffba..4a06251889 100644
--- a/src/Roslyn.Diagnostics.Analyzers/UnitTests/Roslyn.Diagnostics.Analyzers.UnitTests.csproj
+++ b/src/Roslyn.Diagnostics.Analyzers/UnitTests/Roslyn.Diagnostics.Analyzers.UnitTests.csproj
@@ -3,9 +3,7 @@
$(NetCurrent)
true
-
- $(MicrosoftCodeAnalysisVersionForTests)
+ $(MicrosoftCodeAnalysisVersionForTests)
diff --git a/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj
index 0dd8b95aa0..9b8a84818a 100644
--- a/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj
+++ b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)
+ $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion)
diff --git a/src/Test.Utilities/Test.Utilities.csproj b/src/Test.Utilities/Test.Utilities.csproj
index 060956ac04..af3443556d 100644
--- a/src/Test.Utilities/Test.Utilities.csproj
+++ b/src/Test.Utilities/Test.Utilities.csproj
@@ -5,8 +5,7 @@
true
false
true
-
- $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
+ $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
TEST_UTILITIES
diff --git a/src/Text.Analyzers/CSharp/Text.CSharp.Analyzers.csproj b/src/Text.Analyzers/CSharp/Text.CSharp.Analyzers.csproj
index a54f95ef4a..6a34f46d13 100644
--- a/src/Text.Analyzers/CSharp/Text.CSharp.Analyzers.csproj
+++ b/src/Text.Analyzers/CSharp/Text.CSharp.Analyzers.csproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisVersionForTextAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForTextAnalyzers)
diff --git a/src/Text.Analyzers/Core/Text.Analyzers.csproj b/src/Text.Analyzers/Core/Text.Analyzers.csproj
index ac6af61b51..ae6473a0a1 100644
--- a/src/Text.Analyzers/Core/Text.Analyzers.csproj
+++ b/src/Text.Analyzers/Core/Text.Analyzers.csproj
@@ -7,7 +7,7 @@
Restore would conclude that there is a cyclic dependency between us and the Text.Analyzers nuget package.
-->
*$(MSBuildProjectFile)*
- $(MicrosoftCodeAnalysisVersionForTextAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForTextAnalyzers)
diff --git a/src/Text.Analyzers/UnitTests/Text.Analyzers.UnitTests.csproj b/src/Text.Analyzers/UnitTests/Text.Analyzers.UnitTests.csproj
index 20ec1e1354..a8ea4987f4 100644
--- a/src/Text.Analyzers/UnitTests/Text.Analyzers.UnitTests.csproj
+++ b/src/Text.Analyzers/UnitTests/Text.Analyzers.UnitTests.csproj
@@ -3,9 +3,7 @@
$(NetCurrent)
true
-
- $(MicrosoftCodeAnalysisVersionForTests)
+ $(MicrosoftCodeAnalysisVersionForTests)
diff --git a/src/Text.Analyzers/VisualBasic/Text.VisualBasic.Analyzers.vbproj b/src/Text.Analyzers/VisualBasic/Text.VisualBasic.Analyzers.vbproj
index e129dbfbca..716a6f06af 100644
--- a/src/Text.Analyzers/VisualBasic/Text.VisualBasic.Analyzers.vbproj
+++ b/src/Text.Analyzers/VisualBasic/Text.VisualBasic.Analyzers.vbproj
@@ -2,7 +2,7 @@
netstandard2.0
- $(MicrosoftCodeAnalysisVersionForTextAnalyzers)
+ $(MicrosoftCodeAnalysisVersionForTextAnalyzers)
diff --git a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
index 6b2b8fb0e3..7741e2a263 100644
--- a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
+++ b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj
@@ -5,9 +5,7 @@
true
false
true
-
- $(MicrosoftCodeAnalysisVersionForExecution)
+ $(MicrosoftCodeAnalysisVersionForExecution)
diff --git a/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj b/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj
index 850e282425..6f28ff0c00 100644
--- a/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj
+++ b/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj
@@ -5,9 +5,7 @@
true
false
true
-
- $(MicrosoftCodeAnalysisVersionForExecution)
+ $(MicrosoftCodeAnalysisVersionForExecution)
diff --git a/src/Tools/Metrics/Metrics.Legacy.csproj b/src/Tools/Metrics/Metrics.Legacy.csproj
index e2fb94e01f..10a5db6247 100644
--- a/src/Tools/Metrics/Metrics.Legacy.csproj
+++ b/src/Tools/Metrics/Metrics.Legacy.csproj
@@ -8,8 +8,7 @@
$(NoWarn);CS0436
true
-
- $(MicrosoftCodeAnalysisVersionForMetrics)
+ $(MicrosoftCodeAnalysisVersionForMetrics)
$(MetricsVersionPrefix)
diff --git a/src/Tools/Metrics/Metrics.csproj b/src/Tools/Metrics/Metrics.csproj
index 9a9739240f..20efeeb25e 100644
--- a/src/Tools/Metrics/Metrics.csproj
+++ b/src/Tools/Metrics/Metrics.csproj
@@ -7,8 +7,7 @@
true
$(NoWarn);CS0436
-
- $(MicrosoftCodeAnalysisVersionForMetrics)
+ $(MicrosoftCodeAnalysisVersionForMetrics)
$(MetricsVersionPrefix)
diff --git a/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj
index 9560abfbe1..638258fb42 100644
--- a/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj
+++ b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj
@@ -4,8 +4,7 @@
$(NetCurrent)
true
true
-
- $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
+ $(MicrosoftCodeAnalysisVersionForToolsAndUtilities)
diff --git a/src/Tools/RulesetToEditorconfigConverter/Source/RulesetToEditorconfigConverter.csproj b/src/Tools/RulesetToEditorconfigConverter/Source/RulesetToEditorconfigConverter.csproj
index 3fe9223bb0..31db0f91fa 100644
--- a/src/Tools/RulesetToEditorconfigConverter/Source/RulesetToEditorconfigConverter.csproj
+++ b/src/Tools/RulesetToEditorconfigConverter/Source/RulesetToEditorconfigConverter.csproj
@@ -5,8 +5,7 @@
false
true
true
-
- $(MicrosoftCodeAnalysisVersionForExecution)
+ $(MicrosoftCodeAnalysisVersionForExecution)