Switch to upstream patches for roslyn-analyzers (#1902)

This reduces the size/complexity of the "WIP for source-build" patch
by adding individual patches that were merged into roslyn-analyzers:

- dotnet/roslyn-analyzers#4419
- dotnet/roslyn-analyzers#4436

As part of that, it replaces an Exec-dotnet with MSBuild call, which
should fix the build flakiness with GenerateAnalyzerNuspec.deps.json.

Fixes: #1900

Author: omajid

patches/roslyn-analyzers/0001-WIP-for-source-build.patch

@@ -0,0 +1,149 @@
+From fed5a94a2b5a39d227b9337c22d5ac2f91288904 Mon Sep 17 00:00:00 2001
+From: Omair Majid <[email protected]>
+Date: Tue, 17 Nov 2020 19:14:37 -0500
+Subject: [PATCH] Fix ./build.sh --pack to work on Linux
+
+There's no csi.exe in the .NET 5 (or .NET Core) SDK.  So move away from
+a csx script to a full-blown tool written in C#.
+
+For ease of review, I have kept the original tool code unmodified (not
+even indentation has been fixed). To work around build warnings/errors,
+disable the warnings.
+
+Also fix the case of path to the dll in the local nuget cache. It
+doesn't matter on Windows, but most file systems on Linux are
+case-sensitive.
+---
+ eng/GenerateAnalyzerNuspec.targets            | 23 +++++++++++--------
+ ...osoft.CodeQuality.Analyzers.Package.csproj |  4 ++--
+ .../GenerateAnalyzerNuspec.csproj             |  7 ++++++
+ .../Tools/GenerateAnalyzerNuspec/Program.cs   | 19 +++++++++++++--
+ 4 files changed, 39 insertions(+), 14 deletions(-)
+ create mode 100644 src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj
+ rename eng/GenerateAnalyzerNuspec.csx => src/Tools/GenerateAnalyzerNuspec/Program.cs (96%)
+
+diff --git a/eng/GenerateAnalyzerNuspec.targets b/eng/GenerateAnalyzerNuspec.targets
+index 9b90519cf..74244690a 100644
+--- a/eng/GenerateAnalyzerNuspec.targets
++++ b/eng/GenerateAnalyzerNuspec.targets
+@@ -22,6 +22,12 @@
+     <PackageLicenseExpression Condition="'$(PackageLicenseExpression)' == ''">Apache-2.0</PackageLicenseExpression>
+   </PropertyGroup>
+ 
++  <PropertyGroup>
++    <DotNetExecutable Condition="'$(OS)' == 'Windows_NT'">$(DotNetRoot)dotnet.exe</DotNetExecutable>
++    <DotNetExecutable Condition="'$(DotNetExecutable)' == ''">$(DotNetRoot)dotnet</DotNetExecutable>
++    <EscapeDirectorySuffix Condition="'$(OS)' == 'Windows_NT'">\</EscapeDirectorySuffix>
++  </PropertyGroup>
++
+   <Target Name="GenerateAnalyzerConfigAndDocumentationFiles"
+           DependsOnTargets="InitializeSourceControlInformation" 
+           Condition="'@(AnalyzerNupkgAssembly)' != '' or '@(AnalyzerRulesetAssembly)' != ''">
+@@ -88,13 +88,13 @@
+       <AnalyzerRulesetAssembly Condition="'@(AnalyzerNupkgAssembly)' != '' and '@(AnalyzerRulesetAssembly)' == ''" Include="@(AnalyzerNupkgAssembly)"/>
+       <AnalyzerRulesetAssembly Update="@(AnalyzerRulesetAssembly)" Condition="'%(AnalyzerRulesetAssembly.TargetFramework)' == ''" TargetFramework="$(TargetFramework)" />
+     </ItemGroup>
+-    <Exec Command='"$(DotNetRoot)dotnet.exe" "$(_GenerateDocumentationAndConfigFilesPath)" "$(_GeneratedRulesetsDir)" "$(_GeneratedEditorconfigsDir)" "$(ArtifactsBinDir)\" "$(Configuration)" "%(AnalyzerRulesetAssembly.TargetFramework)" "@(AnalyzerRulesetAssembly)" "$(PackagePropsFileDir)" "$(PackagePropsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(VersionPrefix)" $(NuspecPackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile)' />
++    <Exec Command='"$(DotNetExecutable)" "$(_GenerateDocumentationAndConfigFilesPath)" "$(_GeneratedRulesetsDir)" "$(_GeneratedEditorconfigsDir)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "%(AnalyzerRulesetAssembly.TargetFramework)" "@(AnalyzerRulesetAssembly)" "$(PackagePropsFileDir)" "$(PackagePropsFileName)" "$(DisableNETAnalyzersPackagePropsFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(VersionPrefix)" $(NuspecPackageId) $(ContainsPortedFxCopRules) $(GenerateAnalyzerRulesMissingDocumentationFile)' />
+ 
+     <MSBuild Projects="$(RepoRoot)src\Tools\GenerateGlobalAnalyzerConfigs\GenerateGlobalAnalyzerConfigs.csproj" Targets="Build">
+       <Output TaskParameter="TargetOutputs" PropertyName="_GenerateGlobalAnalyzerConfigsPath"/>
+     </MSBuild>
+ 
+-    <Exec Command='"$(DotNetRoot)dotnet.exe" "$(_GenerateGlobalAnalyzerConfigsPath)" "$(_GeneratedGlobalAnalyzerConfigsDir)" "$(NuspecPackageId)" "$(PackageTargetsFileDir)" "$(PackageTargetsFileName)" "@(AnalyzerRulesetAssembly)" "$(ArtifactsBinDir)\" "$(Configuration)" "%(AnalyzerRulesetAssembly.TargetFramework)" "$(ReleaseTrackingOptOut)"' />
++    <Exec Command='"$(DotNetExecutable)" "$(_GenerateGlobalAnalyzerConfigsPath)" "$(_GeneratedGlobalAnalyzerConfigsDir)" "$(NuspecPackageId)" "$(PackageTargetsFileDir)" "$(PackageTargetsFileName)" "@(AnalyzerRulesetAssembly)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(Configuration)" "%(AnalyzerRulesetAssembly.TargetFramework)" "$(ReleaseTrackingOptOut)"' />
+ 
+     <ItemGroup Condition="Exists('$(PackageTargetsFileDir)\$(PackageTargetsFileName)')">
+       <AnalyzerNupkgFile Include="$(PackageTargetsFileDir)\$(PackageTargetsFileName)"/>
+@@ -131,13 +137,10 @@
+       <_NuspecMetadata Include="repositoryUrl=$(PrivateRepositoryUrl)" />
+     </ItemGroup>
+ 
+-    <PropertyGroup>
+-      <_CscToolPath>$(RoslynTargetsPath)</_CscToolPath>
+-      <_CscToolPath Condition="'$(_CscToolPath)' == ''">$(CscToolPath)</_CscToolPath>
+-      <_CscToolPath Condition="'$(_CscToolPath)' == ''">$(MSBuildBinPath)\Roslyn</_CscToolPath>
+-      <_CscToolPath Condition="!HasTrailingSlash('$(_CscToolPath)')">$(_CscToolPath)\</_CscToolPath>
+-    </PropertyGroup>
++    <MSBuild Projects="$(RepoRoot)src\Tools\GenerateAnalyzerNuspec\GenerateAnalyzerNuspec.csproj" Targets="Restore;Build">
++      <Output TaskParameter="TargetOutputs" PropertyName="_GenerateAnalyzerNuspecPath"/>
++    </MSBuild>
+ 
+-    <Exec Command='"$(_CscToolPath)csi.exe" "$(RepoRoot)eng\GenerateAnalyzerNuspec.csx" "$(NuspecFile)" "$(AssetsDir)\" "$(MSBuildProjectDirectory)" "$(Configuration)" "$(TargetFrameworksForPackage)" "@(_NuspecMetadata)" "@(AnalyzerNupkgFile)" "@(AnalyzerNupkgFolder)" "@(AnalyzerNupkgAssembly)" "@(AnalyzerNupkgDependency)" "@(AnalyzerNupkgLibrary)" "$(_GeneratedRulesetsDir)" "$(_GeneratedEditorconfigsDir)" "@(AnalyzerLegacyRuleset)" "$(ArtifactsBinDir)\" "$(AnalyzerDocumentationFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(AnalyzerConfigurationFileDir)" "$(AnalyzerConfigurationFileName)" "$(_GeneratedGlobalAnalyzerConfigsDir)"' />
++    <Exec Command='"$(DotNetExecutable)" "$(_GenerateAnalyzerNuspecPath)" "$(NuspecFile)" "$(AssetsDir)$(EscapeDirectorySuffix)" "$(MSBuildProjectDirectory)" "$(Configuration)" "$(TargetFrameworksForPackage)" "@(_NuspecMetadata)" "@(AnalyzerNupkgFile)" "@(AnalyzerNupkgFolder)" "@(AnalyzerNupkgAssembly)" "@(AnalyzerNupkgDependency)" "@(AnalyzerNupkgLibrary)" "$(_GeneratedRulesetsDir)" "$(_GeneratedEditorconfigsDir)" "@(AnalyzerLegacyRuleset)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(AnalyzerDocumentationFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(AnalyzerConfigurationFileDir)" "$(AnalyzerConfigurationFileName)" "$(_GeneratedGlobalAnalyzerConfigsDir)"' />
+   </Target>
+-</Project>
+\ No newline at end of file
++</Project>
+diff --git a/nuget/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.Package.csproj b/nuget/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.Package.csproj
+index 397f6484c..65728e66a 100644
+--- a/nuget/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.Package.csproj
++++ b/nuget/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.Package.csproj
+@@ -18,7 +18,7 @@
+     <AnalyzerNupkgAssembly Include="Microsoft.CodeQuality.Analyzers.dll" />
+     <AnalyzerNupkgAssembly Include="Microsoft.CodeQuality.CSharp.Analyzers.dll" />
+     <AnalyzerNupkgAssembly Include="Microsoft.CodeQuality.VisualBasic.Analyzers.dll" />
+-    <AnalyzerNupkgAssembly Include="$(NuGetPackageRoot)Humanizer.Core\$(HumanizerVersion)\lib\netstandard1.0\Humanizer.dll" />
++    <AnalyzerNupkgAssembly Include="$(NuGetPackageRoot)humanizer.core\$(HumanizerVersion)\lib\netstandard1.0\Humanizer.dll" />
+ 	</ItemGroup>
+   
+   <ItemGroup>
+@@ -26,4 +26,4 @@
+     <ProjectReference Include="..\..\src\NetAnalyzers\CSharp\Microsoft.CodeQuality.Analyzers\Microsoft.CodeQuality.CSharp.Analyzers.csproj" />
+     <ProjectReference Include="..\..\src\NetAnalyzers\VisualBasic\Microsoft.CodeQuality.Analyzers\Microsoft.CodeQuality.VisualBasic.Analyzers.vbproj" />
+   </ItemGroup>
+-</Project>
+\ No newline at end of file
++</Project>
+diff --git a/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj b/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj
+new file mode 100644
+index 000000000..42b47952b
+--- /dev/null
++++ b/src/Tools/GenerateAnalyzerNuspec/GenerateAnalyzerNuspec.csproj
+@@ -0,0 +1,7 @@
++<Project Sdk="Microsoft.NET.Sdk">
++  <PropertyGroup>
++    <OutputType>Exe</OutputType>
++    <TargetFramework>netcoreapp3.1</TargetFramework>
++    <NonShipping>true</NonShipping>
++  </PropertyGroup>
++</Project>
+diff --git a/eng/GenerateAnalyzerNuspec.csx b/src/Tools/GenerateAnalyzerNuspec/Program.cs
+similarity index 96%
+rename from eng/GenerateAnalyzerNuspec.csx
+rename to src/Tools/GenerateAnalyzerNuspec/Program.cs
+index 1d40d0096..5ca8fbfcc 100644
+--- a/eng/GenerateAnalyzerNuspec.csx
++++ b/src/Tools/GenerateAnalyzerNuspec/Program.cs
+@@ -1,5 +1,17 @@
+-using System.Diagnostics;
++#pragma warning disable CA1820, CS8600, IDE0055, IDE0057, IDE0062, IDE0078, IDE0073
++
++using System;
++using System.Collections.Generic;
+ using System.IO;
++using System.Linq;
++using System.Text;
++
++namespace GenerateAnalyzerNuspec
++{
++    public static class Program
++    {
++        public static void Main(string[] Args)
++        {
+ 
+ string nuspecFile = Args[0];
+ string assetsDir = Args[1];
+@@ -280,4 +292,7 @@
+ 
+ result.AppendLine(@"</package>");
+ 
+-File.WriteAllText(nuspecFile, result.ToString());
+\ No newline at end of file
++File.WriteAllText(nuspecFile, result.ToString());
++        }
++    }
++}
+-- 
+2.26.2
+

patches/roslyn-analyzers/0002-Enable-building-on-Linux.patch

@@ -125,19 +125,17 @@ diff --git a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/Microsoft.CodeAn
 index f3a0b0e5f..b8c947767 100644
 --- a/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/Microsoft.CodeAnalysis.BannedApiAnalyzers.csproj
 +++ b/src/Microsoft.CodeAnalysis.BannedApiAnalyzers/Core/Microsoft.CodeAnalysis.BannedApiAnalyzers.csproj
-@@ -1,7 +1,7 @@
+@@ -1,13 +1,15 @@
  <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
  <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
 -    <TargetFramework>netstandard1.3</TargetFramework>
 +    <TargetFramework>netstandard2.0</TargetFramework>
      <!--
-         PackageId is used by Restore. If we set it to Microsoft.CodeAnalysis.Analyzers,
-         Restore would conclude that there is a cyclic dependency between Microsoft.CodeAnalysis and
-@@ -13,7 +13,9 @@
-         about where the package name ends and where the version begins.
+       PackageId is used by Restore. If we set it to Microsoft.CodeAnalysis.BannedApiAnalyzer,
+       Restore would conclude that there is a cyclic dependency between us and the Microsoft.CodeAnalysis.BannedApiAnalyzer package.
      -->
-     <PackageId>*$(MSBuildProjectFullPath.Replace('/', '\\'))*</PackageId>
+     <PackageId>*$(MSBuildProjectFile)*</PackageId>
 +    <!--
      <MicrosoftCodeAnalysisVersion>2.9.0</MicrosoftCodeAnalysisVersion>
 +    -->
@@ -200,19 +198,17 @@ diff --git a/src/PerformanceSensitiveAnalyzers/Core/Microsoft.CodeAnalysis.Perfo
 index ac9455cac..366db8ae4 100644
 --- a/src/PerformanceSensitiveAnalyzers/Core/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.csproj
 +++ b/src/PerformanceSensitiveAnalyzers/Core/Microsoft.CodeAnalysis.PerformanceSensitiveAnalyzers.csproj
-@@ -1,7 +1,7 @@
+@@ -1,13 +1,15 @@
  <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
  <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
 -    <TargetFramework>netstandard1.3</TargetFramework>
 +    <TargetFramework>netstandard2.0</TargetFramework>
      <!--
-         PackageId is used by Restore. If we set it to Microsoft.CodeAnalysis.Analyzers,
-         Restore would conclude that there is a cyclic dependency between Microsoft.CodeAnalysis and
-@@ -13,7 +13,9 @@
-         about where the package name ends and where the version begins.
+       PackageId is used by Restore. If we set it to Microsoft.CodeAnalysis.PerformanceSensitive.Analyzers,
+       Restore would conclude that there is a cyclic dependency between us and the Microsoft.CodeAnalysis.PerformanceSensitive.Analyzers nuget package.
      -->
-     <PackageId>*$(MSBuildProjectFullPath.Replace('/', '\\'))*</PackageId>
+     <PackageId>*$(MSBuildProjectFile)*</PackageId>
 +    <!--
      <MicrosoftCodeAnalysisVersion>2.9.0</MicrosoftCodeAnalysisVersion>
 +    -->
@@ -263,19 +259,17 @@ diff --git a/src/PublicApiAnalyzers/Core/Analyzers/Microsoft.CodeAnalysis.Public
 index 8ac0061a4..ba8bac56e 100644
 --- a/src/PublicApiAnalyzers/Core/Analyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.csproj
 +++ b/src/PublicApiAnalyzers/Core/Analyzers/Microsoft.CodeAnalysis.PublicApiAnalyzers.csproj
-@@ -1,7 +1,7 @@
+@@ -1,13 +1,15 @@
  <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
  <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
 -    <TargetFramework>netstandard1.3</TargetFramework>
 +    <TargetFramework>netstandard2.0</TargetFramework>
      <!--
-         PackageId is used by Restore. If we set it to Microsoft.CodeAnalysis.Analyzers,
-         Restore would conclude that there is a cyclic dependency between Microsoft.CodeAnalysis and
-@@ -13,7 +13,9 @@
-         about where the package name ends and where the version begins.
+       PackageId is used by Restore. If we set it to Microsoft.CodeAnalysis.PublicApiAnalyzer,
+       Restore would conclude that there is a cyclic dependency between us and the Microsoft.CodeAnalysis.PublicApiAnalyzer package.
      -->
-     <PackageId>*$(MSBuildProjectFullPath.Replace('/', '\\'))*</PackageId>
+     <PackageId>*$(MSBuildProjectFile)*</PackageId>
 +    <!--
      <MicrosoftCodeAnalysisVersion>1.2.1</MicrosoftCodeAnalysisVersion>
 +    -->
@@ -330,19 +324,17 @@ diff --git a/src/PublicApiAnalyzers/Core/CodeFixes/Microsoft.CodeAnalysis.Public
 index bdb00b382..3178f5d2b 100644
 --- a/src/PublicApiAnalyzers/Core/CodeFixes/Microsoft.CodeAnalysis.PublicApiAnalyzers.CodeFixes.csproj
 +++ b/src/PublicApiAnalyzers/Core/CodeFixes/Microsoft.CodeAnalysis.PublicApiAnalyzers.CodeFixes.csproj
-@@ -1,7 +1,7 @@
+@@ -1,13 +1,15 @@
  <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
  <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
 -    <TargetFramework>netstandard1.3</TargetFramework>
 +    <TargetFramework>netstandard2.0</TargetFramework>
      <!--
-         PackageId is used by Restore. If we set it to Microsoft.CodeAnalysis.Analyzers,
-         Restore would conclude that there is a cyclic dependency between Microsoft.CodeAnalysis and
-@@ -13,7 +13,9 @@
-         about where the package name ends and where the version begins.
+       PackageId is used by Restore. If we set it to DotNetAnalyzers.PublicApiAnalyzer.CodeFixes,
+       Restore would conclude that there is a cyclic dependency between us and the DotNetAnalyzers.PublicApiAnalyzer.CodeFixes package.
      -->
-     <PackageId>*$(MSBuildProjectFullPath.Replace('/', '\\'))*</PackageId>
+     <PackageId>*$(MSBuildProjectFile)*</PackageId>
 +    <!--
      <MicrosoftCodeAnalysisVersion>1.2.1</MicrosoftCodeAnalysisVersion>
 +    -->

patches/roslyn-analyzers/0003-Fix-.-build.sh-pack-to-work-on-Linux.patch

@@ -0,0 +1,73 @@
+From 8e4efb29244e1673b8ac84394158a98d394b7e5f Mon Sep 17 00:00:00 2001
+From: Omair Majid <[email protected]>
+Date: Fri, 20 Nov 2020 13:00:40 -0500
+Subject: [PATCH] Reduce rebuilding GenerateAnalyzerNuspec.csproj
+
+PR #4442 has reports where the build fails because the project is being
+rebuilt multiple time with highly parallel builds and that causes file
+conflicts.
+
+I am not sure why that's happening, to be honest. Or at least why it's
+only happening for GenerateAnalyzerNuspec. That project uses the
+`MSBuild` + `Exec` pattern:
+
+https://github.com/dotnet/roslyn-analyzers/blob/37eba3a5aa2d706745f37692ad7ba7cb0a66a115/eng/GenerateAnalyzerNuspec.targets#L140-L144
+
+That's the same pattern used elsewhere in the same file:
+
+https://github.com/dotnet/roslyn-analyzers/blob/37eba3a5aa2d706745f37692ad7ba7cb0a66a115/eng/GenerateAnalyzerNuspec.targets#L105-L109
+
+Still, this PR tries to reduce how many times that project is rebuilt,
+which should (hopefully) reduce the frequency of the error, if not
+eliminate it.
+
+Any suggestions on what could be causing this specifically in
+GenerateAnalyzerNuspec?
+---
+ eng/GenerateAnalyzerNuspec.targets | 21 ++++++++++++++++-----
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/eng/GenerateAnalyzerNuspec.targets b/eng/GenerateAnalyzerNuspec.targets
+index 74244690a..b7210a770 100644
+--- a/eng/GenerateAnalyzerNuspec.targets
++++ b/eng/GenerateAnalyzerNuspec.targets
+@@ -113,9 +113,24 @@
+     </ItemGroup>
+   </Target>
+   
++  <PropertyGroup>
++    <!-- Ideally, we would extract this from the MSBuild task, but we need this as the Target Output before that task is executed -->
++    <_GenerateAnalyzerNuspecPath>$(ArtifactsBinDir)GenerateAnalyzerNuspec\$(Configuration)\netcoreapp3.1\GenerateAnalyzerNuspec.dll</_GenerateAnalyzerNuspecPath>
++  </PropertyGroup>
++
++  <Target Name="BuildGenerateAnalyzerNuspecFile"
++          Inputs="$(RepoRoot)src\Tools\GenerateAnalyzerNuspec\Program.cs"
++          Outputs="$(_GenerateAnalyzerNuspecPath)">
++
++    <MSBuild Projects="$(RepoRoot)src\Tools\GenerateAnalyzerNuspec\GenerateAnalyzerNuspec.csproj"
++             Targets="Restore;Build" >
++    </MSBuild>
++
++  </Target>
++
+   <Target Name="GenerateAnalyzerNuspecFile"
+           BeforeTargets="GenerateNuspec"
+-          DependsOnTargets="InitializeSourceControlInformation;GenerateAnalyzerConfigAndDocumentationFiles" 
++          DependsOnTargets="InitializeSourceControlInformation;GenerateAnalyzerConfigAndDocumentationFiles;BuildGenerateAnalyzerNuspecFile"
+           Condition="'@(AnalyzerNupkgFile)' != '' or '@(AnalyzerNupkgFolder)' != '' or '@(AnalyzerNupkgAssembly)' != '' or '@(AnalyzerNupkgDependency)' != '' or '@(AnalyzerNupkgLibrary)' != ''">
+     <ItemGroup>
+       <_NuspecMetadata Include="version=$(PackageVersion)" />
+@@ -137,10 +152,6 @@
+       <_NuspecMetadata Include="repositoryUrl=$(PrivateRepositoryUrl)" />
+     </ItemGroup>
+ 
+-    <MSBuild Projects="$(RepoRoot)src\Tools\GenerateAnalyzerNuspec\GenerateAnalyzerNuspec.csproj" Targets="Restore;Build">
+-      <Output TaskParameter="TargetOutputs" PropertyName="_GenerateAnalyzerNuspecPath"/>
+-    </MSBuild>
+-
+     <Exec Command='"$(DotNetExecutable)" "$(_GenerateAnalyzerNuspecPath)" "$(NuspecFile)" "$(AssetsDir)$(EscapeDirectorySuffix)" "$(MSBuildProjectDirectory)" "$(Configuration)" "$(TargetFrameworksForPackage)" "@(_NuspecMetadata)" "@(AnalyzerNupkgFile)" "@(AnalyzerNupkgFolder)" "@(AnalyzerNupkgAssembly)" "@(AnalyzerNupkgDependency)" "@(AnalyzerNupkgLibrary)" "$(_GeneratedRulesetsDir)" "$(_GeneratedEditorconfigsDir)" "@(AnalyzerLegacyRuleset)" "$(ArtifactsBinDir)$(EscapeDirectorySuffix)" "$(AnalyzerDocumentationFileDir)" "$(AnalyzerDocumentationFileName)" "$(AnalyzerSarifFileDir)" "$(AnalyzerSarifFileName)" "$(AnalyzerConfigurationFileDir)" "$(AnalyzerConfigurationFileName)" "$(_GeneratedGlobalAnalyzerConfigsDir)"' />
+   </Target>
+ </Project>
+-- 
+2.28.0
+