[automated] Merge branch 'release/10.0.1xx' => 'release/10.0.2xx'

src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.Package.csproj

@@ -17,9 +17,15 @@
     <GeneratedRulesetsDir>$(BaseOutputPath)Rulesets</GeneratedRulesetsDir>
     <GeneratedEditorconfigsDir>$(BaseOutputPath)Editorconfig</GeneratedEditorconfigsDir>
     <GeneratedGlobalAnalyzerConfigsDir>$(BaseOutputPath)GlobalAnalyzerConfigs</GeneratedGlobalAnalyzerConfigsDir>
+    <GeneratedDocumentationDir>$(BaseOutputPath)Documentation</GeneratedDocumentationDir>
+    <GeneratedSarifFilePath>$(GeneratedDocumentationDir)\$(PackageId).sarif</GeneratedSarifFilePath>
     <PackagePropsTargetsFileDir>$(BaseOutputPath)Build</PackagePropsTargetsFileDir>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Templating" PrivateAssets="All" />
+  </ItemGroup>
+
   <ItemGroup>
     <AnalyzerNupkgAssembly Include="Microsoft.CodeAnalysis.NetAnalyzers.dll" />
     <AnalyzerNupkgAssembly Include="Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
@@ -32,7 +38,7 @@
     <None Include="README.md" Pack="true" PackagePath="/documentation" />
     <None Include="..\docs\Analyzer Configuration.md" Pack="true" PackagePath="/documentation" />
     <None Include="$(PackageId).md" Pack="true" PackagePath="/documentation" />
-    <None Include="$(PackageId).sarif" Pack="true" PackagePath="/documentation" />
+    <None Include="$(GeneratedSarifFilePath)" Pack="true" PackagePath="/documentation" Visible="false" />
 
     <None Include="assets\install.ps1" Pack="true" PackagePath="/tools" />
     <None Include="assets\uninstall.ps1" Pack="true" PackagePath="/tools" />
@@ -74,6 +80,7 @@
       <DisableNETAnalyzersPackagePropsFileName>DisableNETAnalyzersForNuGetPackage.props</DisableNETAnalyzersPackagePropsFileName>
       <AnalyzerDocumentationFileName>$(PackageId).md</AnalyzerDocumentationFileName>
       <AnalyzerSarifFileName>$(PackageId).sarif</AnalyzerSarifFileName>
+      <AnalyzerSarifTemplateProperties>AnalyzerVersion=$(VersionPrefix)</AnalyzerSarifTemplateProperties>
       <AnalyzerConfigurationFileName>Analyzer Configuration.md</AnalyzerConfigurationFileName>
 
       <!-- Only run validate only in CI builds. Running them in local builds will prevent refreshing auto-generated files. -->
@@ -89,7 +96,13 @@
       <_GenerateDocumentationAndConfigFilesPath>%(_GenerateDocumentationAndConfigFilesPath.Identity)</_GenerateDocumentationAndConfigFilesPath>
     </PropertyGroup>
 
+    <MakeDir Directories="$(GeneratedDocumentationDir)" />
+    <GenerateFileFromTemplate
+      TemplateFile="$(AnalyzerSarifFileDir)\$(AnalyzerSarifFileName)"
+      Properties="$(AnalyzerSarifTemplateProperties)"
+      OutputPath="$(GeneratedSarifFilePath)" />
+
     <Exec Command='"$(DotNetTool)" "$(_GenerateDocumentationAndConfigFilesPath)" "-validateOnly:$(ValidateOnlyFlag)" "$(GeneratedRulesetsDir)" "$(GeneratedEditorconfigsDir)" "$(GeneratedGlobalAnalyzerConfigsDir)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "$(TargetFramework)" "@(AnalyzerNupkgAssembly)" "$(PackagePropsTargetsFileDir)" "$(PackagePropsFileName)" "$(PackagePropsTargetsFileDir)" "$(PackageTargetsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerDocumentationFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(VersionPrefix)" $(PackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile) $(ReleaseTrackingOptOut) $(_ValidateOffline)' />
   </Target>
 
-</Project>
+</Project>

src/Microsoft.CodeAnalysis.NetAnalyzers/src/Microsoft.CodeAnalysis.NetAnalyzers.sarif

@@ -5,7 +5,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.CSharp.NetAnalyzers",
-        "version": "10.0.202",
+        "version": "${AnalyzerVersion}",
         "language": "en-US"
       },
       "rules": {
@@ -708,7 +708,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.NetAnalyzers",
-        "version": "10.0.202",
+        "version": "${AnalyzerVersion}",
         "language": "en-US"
       },
       "rules": {
@@ -6503,7 +6503,7 @@
     {
       "tool": {
         "name": "Microsoft.CodeAnalysis.VisualBasic.NetAnalyzers",
-        "version": "10.0.202",
+        "version": "${AnalyzerVersion}",
         "language": "en-US"
       },
       "rules": {

src/Microsoft.CodeAnalysis.NetAnalyzers/tools/GenerateDocumentationAndConfigFiles/Program.cs

@@ -32,6 +32,7 @@ public static async Task<int> Main(string[] args)
         {
             const int expectedArguments = 23;
             const string validateOnlyPrefix = "-validateOnly:";
+            const string analyzerVersionTemplate = "${AnalyzerVersion}";
 
             if (args.Length != expectedArguments)
             {
@@ -450,7 +451,9 @@ void createAnalyzerSarifFile()
 
                     if (!string.IsNullOrWhiteSpace(analyzerVersion))
                     {
-                        writer.Write("version", analyzerVersion);
+                        // Keep the checked-in SARIF stable across SDK version updates.
+                        // The build resolves this placeholder into the intermediate output that gets packed.
+                        writer.Write("version", analyzerVersionTemplate);
                     }
 
                     writer.Write("language", culture.Name);