Revert "Attempting to fix strange .NET Framework build errors"

This reverts commit 9651c80.
Lombiq · Oct 3, 2023 · 42884e6 · 42884e6
1 parent 9651c80
commit 42884e6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/Lombiq.Analyzers/Build.props b/Lombiq.Analyzers/Build.props
@@ -29,11 +29,6 @@
     <_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
   </PropertyGroup>
 
-  <!-- .NET-only packages. -->
-  <ItemGroup>
-    <AnalyzerPackage Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.7.0"/>
-  </ItemGroup>
-
   <Import Project="$(MSBuildThisFileDirectory)CommonPackages.props" />
 
   <ItemGroup>

diff --git a/Lombiq.Analyzers/CommonPackages.props b/Lombiq.Analyzers/CommonPackages.props
@@ -7,6 +7,7 @@
     <AnalyzerPackage Include="AsyncFixer" Version="1.6.0"/>
     <AnalyzerPackage Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59"/>
     <AnalyzerPackage Include="Meziantou.Analyzer" Version="2.0.85"/>
+    <AnalyzerPackage Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.7.0"/>
     <AnalyzerPackage Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.4"/>
     <AnalyzerPackage Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.7.30"/>
     <AnalyzerPackage Include="SecurityCodeScan.VS2019" Version="5.6.7"/>

diff --git a/Lombiq.Analyzers/NetFx.Build.props b/Lombiq.Analyzers/NetFx.Build.props
@@ -28,11 +28,6 @@
     <_SkipUpgradeNetAnalyzersNuGetWarning>true</_SkipUpgradeNetAnalyzersNuGetWarning>
   </PropertyGroup>
 
-  <!-- .NET Framework-only packages. -->
-  <ItemGroup>
-    <AnalyzerPackage Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.6.0"/>
-  </ItemGroup>
-
   <Import Project="$(MSBuildThisFileDirectory)CommonPackages.props" />
 
   <ItemGroup>
@@ -47,7 +42,7 @@
          'C:\Users\runneradmin\.nuget\packages\microsoft.codeanalysis.csharp.codestyle\4.7.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.CodeStyle.dll' #spell-check-ignore-line
          references version '4.7.0.0' of the compiler, which is newer than the currently running version '4.6.0.0'."
          kind. -->
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.6.0">
+    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="4.7.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers;</IncludeAssets>
     </PackageReference>