diff --git a/Directory.Build.props b/Directory.Build.props index 8fabbde4b2..a8feff3916 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -45,6 +45,12 @@ $(NoWarn),1573,1591,1712 + + + + $(NoWarn);CS1574;CS8602 + + true diff --git a/NuGet.config b/NuGet.config index 1fb0df5480..ea083a19de 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index c1b6dfbf05..53c7785906 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,5 +1,16 @@ + - + + + + + + + + + + - + \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1629ab8888..5ab5953d9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,6 +5,16 @@ https://github.com/dotnet/roslyn 66a912c9463eebe832cf742d2fe8bb2e1a4600ec + + https://github.com/dotnet/source-build-reference-packages + 540ccf1a6831993d8ac8bf10bdfd3fde93ecee2e + + + + https://github.com/dotnet/source-build-externals + de4dda48d0cf31e13182bc24107b2246c61ed483 + + @@ -12,15 +22,22 @@ fb6291b40fa4334dbd167e2071953e83cc8b9fdc - - https://github.com/dotnet/roslyn - 6a5a63bbc9f4449d9bd1e95a8f9624939c3ccdc3 + + + https://github.com/dotnet/runtime + 84a3d0e37e8f22b0b55f8bf932cb788b2bdd728f - - https://github.com/dotnet/roslyn - 6a5a63bbc9f4449d9bd1e95a8f9624939c3ccdc3 + + https://github.com/dotnet/sourcelink + 54eb3b811c57f5e94617d31a102fc9cb664ccdd5 + - + + https://github.com/dotnet/xliff-tasks + 9e7fbcab4e5275f63c0cd37553ba426de9194309 + + + https://github.com/dotnet/roslyn 6a5a63bbc9f4449d9bd1e95a8f9624939c3ccdc3 diff --git a/eng/Versions.props b/eng/Versions.props index d770318df5..728c5f7cd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,18 +1,5 @@ - - - $(SystemCollectionsImmutableVersion) - 5.0.0 - $(SystemReflectionMetadataVersion) - 5.0.0 - $(MicrosoftCodeAnalysisVersion) - 3.8.0 - 3.3.5 beta1 @@ -40,12 +27,57 @@ true 4.5.0 - 4.5.0 - 4.5.0 - - 3.3.1 + + + 3.7.0 + 1.2.1 + 2.9.0 + 3.3.1 + 2.9.0 + 3.3.1 + 4.0.1 + 3.3.1 + 3.3.1 + 3.3.1 + 3.3.1 + + 4.6.0-1.final + 4.6.0-1.final + 4.5.0 + 4.5.0 3.3.4 8.0.0-preview1.22621.6 $(DogfoodAnalyzersVersion) @@ -59,7 +91,7 @@ 1.1.2-beta1.23205.1 0.13.0 - 2.2.0 + 2.14.1 1.4.1 2.0.69 6.0.0-preview.5.21301.5 @@ -72,6 +104,7 @@ 2.0.0-beta1.20074.1 2.0.0-beta1.21216.1 4.7.0 + 8.0.0-preview.4.23259.5 4.7.0 1.2.7 4.5.5 diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 09112d02c2..3288de8a1d 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -33,7 +33,7 @@ - + diff --git a/src/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj b/src/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj index 0cc535e8a0..34a1d4e34a 100644 --- a/src/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj +++ b/src/Microsoft.CodeAnalysis.AnalyzerUtilities/Microsoft.CodeAnalysis.AnalyzerUtilities.csproj @@ -14,6 +14,7 @@ $(NoWarn);RS0026 + $(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 5d4e12d533..e243f73824 100644 --- a/src/Microsoft.CodeAnalysis.Analyzers/CSharp/Microsoft.CodeAnalysis.CSharp.Analyzers.csproj +++ b/src/Microsoft.CodeAnalysis.Analyzers/CSharp/Microsoft.CodeAnalysis.CSharp.Analyzers.csproj @@ -2,6 +2,7 @@ netstandard2.0 + $(MicrosoftCodeAnalysisVersionForCodeAnalysisAnalyzers) diff --git a/src/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj b/src/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj index 809e521cf1..d2e367a068 100644 --- a/src/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj +++ b/src/Microsoft.CodeAnalysis.Analyzers/Core/Microsoft.CodeAnalysis.Analyzers.csproj @@ -8,6 +8,7 @@ Restore would conclude that there is a cyclic dependency between Microsoft.CodeAnalysis and Microsoft.CodeAnalysis.Analyzers. --> *$(MSBuildProjectFile)* + $(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 d55ed40d39..ed6b090897 100644 --- a/src/Microsoft.CodeAnalysis.Analyzers/UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj +++ b/src/Microsoft.CodeAnalysis.Analyzers/UnitTests/Microsoft.CodeAnalysis.Analyzers.UnitTests.csproj @@ -3,9 +3,12 @@ $(NetCurrent) true + + $(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 2faafc428d..c397f53a9b 100644 --- a/src/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj +++ b/src/Microsoft.CodeAnalysis.Analyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.Analyzers.vbproj @@ -2,6 +2,7 @@ netstandard2.0 + $(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 47c3703b5c..5759c097f3 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 - 2.9.0 + $(MicrosoftCodeAnalysisVersionForBannedApiAnalyzers) diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/Microsoft.CodeAnalysis.BannedApiAnalyzers.csproj b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/Microsoft.CodeAnalysis.BannedApiAnalyzers.csproj index 6ec9075648..120cf5f4b3 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)* - 2.9.0 + $(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 91b8d44dc5..6381e3f419 100644 --- a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.BannedApiAnalyzers.UnitTests.csproj +++ b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.BannedApiAnalyzers.UnitTests.csproj @@ -3,6 +3,10 @@ $(NetCurrent) true + true + + $(MicrosoftCodeAnalysisVersionForBannedApiAnalyzersTests) 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 f43d9bcece..92a44dbe1f 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 - 2.9.0 + $(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 201584f8d2..121341880e 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)* - 4.0.1 + $(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 92baad4a68..e7bb092aa9 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 - 4.0.1 + $(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 db8abd352a..a59512a3c4 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)* - 4.0.1 + $(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 17b5607828..35f916d28c 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)* - 4.0.1 + $(MicrosoftCodeAnalysisVersionForResxSourceGenerators) diff --git a/src/NetAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.csproj b/src/NetAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.csproj index 0fb8b73875..79bf0042f0 100644 --- a/src/NetAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.csproj +++ b/src/NetAnalyzers/CSharp/Microsoft.CodeAnalysis.CSharp.NetAnalyzers.csproj @@ -2,6 +2,7 @@ netstandard2.0 + $(MicrosoftCodeAnalysisVersionForNetAnalyzers) diff --git a/src/NetAnalyzers/Core/Microsoft.CodeAnalysis.NetAnalyzers.csproj b/src/NetAnalyzers/Core/Microsoft.CodeAnalysis.NetAnalyzers.csproj index 006c1c8670..3cbe41a6ec 100644 --- a/src/NetAnalyzers/Core/Microsoft.CodeAnalysis.NetAnalyzers.csproj +++ b/src/NetAnalyzers/Core/Microsoft.CodeAnalysis.NetAnalyzers.csproj @@ -9,6 +9,7 @@ *$(MSBuildProjectFile)* true + $(MicrosoftCodeAnalysisVersionForNetAnalyzers) diff --git a/src/NetAnalyzers/UnitTests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests.csproj b/src/NetAnalyzers/UnitTests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests.csproj index f74eea729d..f80e6b7e23 100644 --- a/src/NetAnalyzers/UnitTests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests.csproj +++ b/src/NetAnalyzers/UnitTests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests.csproj @@ -4,9 +4,12 @@ $(NetCurrent) $(DefineConstants),NET_ANALYZERS_TEST true + + $(MicrosoftCodeAnalysisVersionForTests) - + diff --git a/src/NetAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.vbproj b/src/NetAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.vbproj index fd41206976..6b33a55a34 100644 --- a/src/NetAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.vbproj +++ b/src/NetAnalyzers/VisualBasic/Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers.vbproj @@ -2,6 +2,7 @@ netstandard2.0 + $(MicrosoftCodeAnalysisVersionForNetAnalyzers) diff --git a/src/PerformanceSensitiveAnalyzers/CSharp/Analyzers/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.csproj b/src/PerformanceSensitiveAnalyzers/CSharp/Analyzers/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.csproj index 1f4ea3876a..f8f2fb148c 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 - 2.9.0 + $(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 d45eee74b4..cce4334dbd 100644 --- a/src/PerformanceSensitiveAnalyzers/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.CodeFixes.csproj +++ b/src/PerformanceSensitiveAnalyzers/CSharp/CodeFixes/Microsoft.CodeAnalysis.CSharp.PerformanceSensitiveAnalyzers.CodeFixes.csproj @@ -2,8 +2,8 @@ netstandard2.0 - 2.9.0 true + $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzers) diff --git a/src/PerformanceSensitiveAnalyzers/Core/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.csproj b/src/PerformanceSensitiveAnalyzers/Core/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.csproj index 210efb52aa..a0f99de7ed 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)* - 2.9.0 + $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzers) diff --git a/src/PerformanceSensitiveAnalyzers/UnitTests/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.UnitTests.csproj b/src/PerformanceSensitiveAnalyzers/UnitTests/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.UnitTests.csproj index 405a5b45c9..a99d6341b6 100644 --- a/src/PerformanceSensitiveAnalyzers/UnitTests/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.UnitTests.csproj +++ b/src/PerformanceSensitiveAnalyzers/UnitTests/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.UnitTests.csproj @@ -7,6 +7,11 @@ $(NoWarn);CA2007 + + true + + $(MicrosoftCodeAnalysisVersionForPerfSensitiveAnalyzersTests) diff --git a/src/PerformanceTests/Tests/PerformanceTests.csproj b/src/PerformanceTests/Tests/PerformanceTests.csproj index 044a2aba46..7b454a4fbe 100644 --- a/src/PerformanceTests/Tests/PerformanceTests.csproj +++ b/src/PerformanceTests/Tests/PerformanceTests.csproj @@ -15,6 +15,7 @@ Release false true + $(MicrosoftCodeAnalysisVersionForTests) diff --git a/src/PerformanceTests/Utilities/CSharp/CSharpPerfUtilities.csproj b/src/PerformanceTests/Utilities/CSharp/CSharpPerfUtilities.csproj index 67cacfa19c..676fa32fa1 100644 --- a/src/PerformanceTests/Utilities/CSharp/CSharpPerfUtilities.csproj +++ b/src/PerformanceTests/Utilities/CSharp/CSharpPerfUtilities.csproj @@ -4,6 +4,8 @@ net6.0 true true + + $(MicrosoftCodeAnalysisVersionForToolsAndUtilities) diff --git a/src/PerformanceTests/Utilities/Common/CommonPerfUtilities.csproj b/src/PerformanceTests/Utilities/Common/CommonPerfUtilities.csproj index 16f6f1c9cd..b30f0830c9 100644 --- a/src/PerformanceTests/Utilities/Common/CommonPerfUtilities.csproj +++ b/src/PerformanceTests/Utilities/Common/CommonPerfUtilities.csproj @@ -4,6 +4,8 @@ net6.0 true true + + $(MicrosoftCodeAnalysisVersionForToolsAndUtilities) diff --git a/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj b/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj index 5d3a45354b..a6372f82e5 100644 --- a/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj +++ b/src/PerformanceTests/Utilities/ReferenceAssemblies/ReferenceAssemblies.csproj @@ -5,6 +5,8 @@ false true true + + $(MicrosoftCodeAnalysisVersionForToolsAndUtilities) diff --git a/src/PerformanceTests/Utilities/VisualBasic/VisualBasicPerfUtilities.csproj b/src/PerformanceTests/Utilities/VisualBasic/VisualBasicPerfUtilities.csproj index c88990d445..7c05c529ce 100644 --- a/src/PerformanceTests/Utilities/VisualBasic/VisualBasicPerfUtilities.csproj +++ b/src/PerformanceTests/Utilities/VisualBasic/VisualBasicPerfUtilities.csproj @@ -4,6 +4,8 @@ net6.0 true true + + $(MicrosoftCodeAnalysisVersionForToolsAndUtilities) diff --git a/src/PublicApiAnalyzers/Core/Analyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.csproj b/src/PublicApiAnalyzers/Core/Analyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.csproj index a569fafe9a..ea9ae2ace5 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)* - 1.2.1 + $(MicrosoftCodeAnalysisVersionForPublicApiAnalyzers) diff --git a/src/PublicApiAnalyzers/Core/CodeFixes/Microsoft.CodeAnalysis.PublicApiAnalyzers.CodeFixes.csproj b/src/PublicApiAnalyzers/Core/CodeFixes/Microsoft.CodeAnalysis.PublicApiAnalyzers.CodeFixes.csproj index 41430c630f..9eba43c28c 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)* - 1.2.1 + $(MicrosoftCodeAnalysisVersionForPublicApiAnalyzers) true diff --git a/src/PublicApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.PublicApiAnalyzers.UnitTests.csproj b/src/PublicApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.PublicApiAnalyzers.UnitTests.csproj index bf5e3dc40e..a6fa953a9a 100644 --- a/src/PublicApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.PublicApiAnalyzers.UnitTests.csproj +++ b/src/PublicApiAnalyzers/UnitTests/Microsoft.CodeAnalysis.PublicApiAnalyzers.UnitTests.csproj @@ -3,9 +3,10 @@ $(NetCurrent) true + $(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 e62266894f..82c5ae4867 100644 --- a/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj +++ b/src/Roslyn.Diagnostics.Analyzers/CSharp/Roslyn.Diagnostics.CSharp.Analyzers.csproj @@ -2,6 +2,7 @@ netstandard2.0 + $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion) @@ -10,7 +11,7 @@ - + \ No newline at end of file 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 884a46588e..c77cdd389f 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,12 @@ $(NetCurrent) true + + $(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 509a3c0698..0dd8b95aa0 100644 --- a/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj +++ b/src/Roslyn.Diagnostics.Analyzers/VisualBasic/Roslyn.Diagnostics.VisualBasic.Analyzers.vbproj @@ -2,12 +2,13 @@ netstandard2.0 + $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion) - + \ No newline at end of file diff --git a/src/Test.Utilities/Test.Utilities.csproj b/src/Test.Utilities/Test.Utilities.csproj index 496e1dbb10..5d10d284ea 100644 --- a/src/Test.Utilities/Test.Utilities.csproj +++ b/src/Test.Utilities/Test.Utilities.csproj @@ -5,6 +5,8 @@ true false true + + $(MicrosoftCodeAnalysisVersionForToolsAndUtilities) diff --git a/src/Text.Analyzers/CSharp/Text.CSharp.Analyzers.csproj b/src/Text.Analyzers/CSharp/Text.CSharp.Analyzers.csproj index e19a429acc..a54f95ef4a 100644 --- a/src/Text.Analyzers/CSharp/Text.CSharp.Analyzers.csproj +++ b/src/Text.Analyzers/CSharp/Text.CSharp.Analyzers.csproj @@ -2,6 +2,7 @@ netstandard2.0 + $(MicrosoftCodeAnalysisVersionForTextAnalyzers) diff --git a/src/Text.Analyzers/Core/Text.Analyzers.csproj b/src/Text.Analyzers/Core/Text.Analyzers.csproj index fbf8c56d23..ac6af61b51 100644 --- a/src/Text.Analyzers/Core/Text.Analyzers.csproj +++ b/src/Text.Analyzers/Core/Text.Analyzers.csproj @@ -7,6 +7,7 @@ Restore would conclude that there is a cyclic dependency between us and the Text.Analyzers nuget package. --> *$(MSBuildProjectFile)* + $(MicrosoftCodeAnalysisVersionForTextAnalyzers) diff --git a/src/Text.Analyzers/UnitTests/Text.Analyzers.UnitTests.csproj b/src/Text.Analyzers/UnitTests/Text.Analyzers.UnitTests.csproj index e2f5b08da4..54a8c69556 100644 --- a/src/Text.Analyzers/UnitTests/Text.Analyzers.UnitTests.csproj +++ b/src/Text.Analyzers/UnitTests/Text.Analyzers.UnitTests.csproj @@ -3,6 +3,9 @@ $(NetCurrent) true + + $(MicrosoftCodeAnalysisVersionForTests) diff --git a/src/Text.Analyzers/VisualBasic/Text.VisualBasic.Analyzers.vbproj b/src/Text.Analyzers/VisualBasic/Text.VisualBasic.Analyzers.vbproj index 534865e81d..e129dbfbca 100644 --- a/src/Text.Analyzers/VisualBasic/Text.VisualBasic.Analyzers.vbproj +++ b/src/Text.Analyzers/VisualBasic/Text.VisualBasic.Analyzers.vbproj @@ -2,6 +2,7 @@ netstandard2.0 + $(MicrosoftCodeAnalysisVersionForTextAnalyzers) diff --git a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj index d2ea921afd..d69615a16a 100644 --- a/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj +++ b/src/Tools/GenerateDocumentationAndConfigFiles/GenerateDocumentationAndConfigFiles.csproj @@ -5,7 +5,9 @@ true false true - $(MicrosoftCodeAnalysisForRoslynDiagnosticsAnalyzersVersion) + + $(MicrosoftCodeAnalysisVersionForExecution) diff --git a/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj b/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj index 8712631690..0984549680 100644 --- a/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj +++ b/src/Tools/GenerateDocumentationAndConfigFilesForBrokenRuntime/GenerateDocumentationAndConfigFilesForBrokenRuntime.csproj @@ -5,6 +5,9 @@ true false true + + $(MicrosoftCodeAnalysisVersionForExecution) @@ -12,8 +15,7 @@ - - - + + diff --git a/src/Tools/Metrics/Metrics.Legacy.csproj b/src/Tools/Metrics/Metrics.Legacy.csproj index 9f438f7a14..e13ecc72dd 100644 --- a/src/Tools/Metrics/Metrics.Legacy.csproj +++ b/src/Tools/Metrics/Metrics.Legacy.csproj @@ -6,6 +6,8 @@ $(DefineConstants),LEGACY_CODE_METRICS_MODE true true + + $(MicrosoftCodeAnalysisVersionForToolsAndUtilities) diff --git a/src/Tools/Metrics/Metrics.csproj b/src/Tools/Metrics/Metrics.csproj index 7d3c434f84..1feb945505 100644 --- a/src/Tools/Metrics/Metrics.csproj +++ b/src/Tools/Metrics/Metrics.csproj @@ -5,6 +5,8 @@ Exe true true + + $(MicrosoftCodeAnalysisVersionForToolsAndUtilities) diff --git a/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj index 8652932055..5ae3defd1a 100644 --- a/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj +++ b/src/Tools/ReleaseNotesUtil/ReleaseNotesUtil.csproj @@ -3,6 +3,9 @@ Exe $(NetCurrent) true + true + + $(MicrosoftCodeAnalysisVersionForToolsAndUtilities) diff --git a/src/Tools/RulesetToEditorconfigConverter/Source/RulesetToEditorconfigConverter.csproj b/src/Tools/RulesetToEditorconfigConverter/Source/RulesetToEditorconfigConverter.csproj index cc4b0fee60..7089033ad6 100644 --- a/src/Tools/RulesetToEditorconfigConverter/Source/RulesetToEditorconfigConverter.csproj +++ b/src/Tools/RulesetToEditorconfigConverter/Source/RulesetToEditorconfigConverter.csproj @@ -5,6 +5,8 @@ false true true + + $(MicrosoftCodeAnalysisVersionForExecution)