Merge pull request #8888 from NuGet/dev

[2021-11-21] RI dev to main

Author: agr

Directory.Build.props

@@ -1,9 +1,10 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers">
-      <Version>3.3.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
+      <Version>6.0.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
+  <Import Project="$(NuGetCodeAnalyzerExtensions)" Condition="'$(NuGetCodeAnalyzerExtensions)' != '' And Exists('$(NuGetCodeAnalyzerExtensions)')" />
 </Project>

src/NuGet.Services.Entities/NuGet.Services.Entities.csproj

@@ -15,7 +15,7 @@
       <Version>10.0.3</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Frameworks">
-      <Version>6.0.0</Version>
+      <Version>5.9.0</Version>
     </PackageReference>
   </ItemGroup>
 

src/NuGetGallery.Core/Frameworks/FrameworkCompatibilityService.cs

@@ -82,8 +82,6 @@
     <Compile Include="Cookies\CookieExpirationServiceFacts.cs" />
     <Compile Include="Features\FeatureFlagClientExtensionsFacts.cs" />
     <Compile Include="Features\EditableFeatureFlagFileStorageServiceFacts.cs" />
-    <Compile Include="Frameworks\FrameworkCompatibilityServiceFacts.cs" />
-    <Compile Include="Frameworks\SupportedFrameworksFacts.cs" />
     <Compile Include="GitHub\GitHubUsageConfigurationFacts.cs" />
     <Compile Include="Infrastructure\ElmahExceptionFacts.cs" />
     <Compile Include="Extensions\UserExtensionsCoreFacts.cs" />