Upgrade packages and resolve CVEs (#179)

maca88 · web-flow · commit 6376705a1014 · 2024-08-04T23:59:38.000+02:00
diff --git a/Common.props b/Common.props
@@ -11,12 +11,12 @@
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <TreatSpecificWarningsAsErrors />
-    <LibTargetFrameworks Condition ="$(LibTargetFrameworks) == ''">netstandard2.0;net6.0;net8.0</LibTargetFrameworks>
-    <AppTargetFrameworks Condition ="$(AppTargetFrameworks) == ''">net472;netcoreapp3.1;net6.0;net8.0</AppTargetFrameworks>
+    <LibTargetFrameworks Condition ="$(LibTargetFrameworks) == ''">netstandard2.0;net8.0</LibTargetFrameworks>
+    <AppTargetFrameworks Condition ="$(AppTargetFrameworks) == ''">net472;net8.0</AppTargetFrameworks>
     <TestTargetFramework Condition ="$(TestTargetFramework) == ''">net8.0</TestTargetFramework>
-    <ToolTargetFrameworks Condition ="$(ToolTargetFrameworks) == ''">netcoreapp3.1;net6.0;net8.0</ToolTargetFrameworks>
-    <MicrosoftCodeAnalysisVersion>3.11.0</MicrosoftCodeAnalysisVersion>
-    <MicrosoftBuildLocatorVersion>1.4.1</MicrosoftBuildLocatorVersion>
-    <SQLitePCLRawVersion>2.1.1</SQLitePCLRawVersion>
+    <ToolTargetFrameworks Condition ="$(ToolTargetFrameworks) == ''">net8.0</ToolTargetFrameworks>
+    <MicrosoftCodeAnalysisVersion>4.10.0</MicrosoftCodeAnalysisVersion>
+    <MicrosoftBuildLocatorVersion>1.7.8</MicrosoftBuildLocatorVersion>
+    <SQLitePCLRawVersion>2.1.8</SQLitePCLRawVersion>
   </PropertyGroup>
 </Project>
diff --git a/Source/AsyncGenerator.CommandLine/AsyncGenerator.CommandLine.csproj b/Source/AsyncGenerator.CommandLine/AsyncGenerator.CommandLine.csproj
@@ -5,7 +5,6 @@
     <TargetFrameworks>$(AppTargetFrameworks)</TargetFrameworks>
     <ServerGarbageCollection>true</ServerGarbageCollection>
     <LangVersion>7.3</LangVersion>
-    <NoWarn Condition="'$(TargetFramework)' == 'netcoreapp3.1'">CS8032</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -38,17 +37,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <!-- https://stackoverflow.com/a/73422940 -->
-    <PackageReference Include="System.Memory" Version="4.5.5" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
     <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" /> <!-- https://github.com/advisories/GHSA-447r-wph3-92pm -->
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
@@ -61,7 +59,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(MicrosoftCodeAnalysisVersion)">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.6.0">
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.1">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="SQLitePCLRaw.core" Version="$(SQLitePCLRawVersion)"> <!-- Needed for mono 5.16+ -->
diff --git a/Source/AsyncGenerator.Configuration.Yaml/AsyncGenerator.Configuration.Yaml.csproj b/Source/AsyncGenerator.Configuration.Yaml/AsyncGenerator.Configuration.Yaml.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="YamlDotNet" Version="12.0.0" />
+    <PackageReference Include="YamlDotNet" Version="16.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/AsyncGenerator.Core/AsyncGenerator.Core.csproj b/Source/AsyncGenerator.Core/AsyncGenerator.Core.csproj
@@ -13,11 +13,4 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="$(MicrosoftCodeAnalysisVersion)" />
   </ItemGroup>
-  <ItemGroup>
-    <!-- Fix for RS1024 error -->
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>
diff --git a/Source/AsyncGenerator.Tests/AsyncGenerator.Tests.csproj b/Source/AsyncGenerator.Tests/AsyncGenerator.Tests.csproj
@@ -4,7 +4,6 @@
     <TargetFramework>$(TestTargetFramework)</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>9.0</LangVersion>
-    <NoWarn Condition="'$(TargetFramework)' == 'netcoreapp3.1'">CS8032</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -21,27 +20,24 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Microsoft.Build.Locator" Version="$(MicrosoftBuildLocatorVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="System.Interactive.Async" Version="4.1.1" />
-    <!-- https://stackoverflow.com/a/73422940 -->
-    <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Transactions" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.6.0" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
     <PackageReference Include="SQLitePCLRaw.core" Version="$(SQLitePCLRawVersion)" /> <!-- Needed for MONO 5.16+ -->
   </ItemGroup>
 
diff --git a/Source/AsyncGenerator.Tests/DocumentationComments/CommentsFixture.cs b/Source/AsyncGenerator.Tests/DocumentationComments/CommentsFixture.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
diff --git a/Source/AsyncGenerator.Tool/AsyncGenerator.Tool.csproj b/Source/AsyncGenerator.Tool/AsyncGenerator.Tool.csproj
@@ -7,7 +7,6 @@
     <Product>AsyncGenerator.Tool</Product>
     <Description>dotnet tool for generating async C# code</Description>
     <LangVersion>7.3</LangVersion>
-    <NoWarn Condition="'$(TargetFramework)' == 'netcoreapp3.1'">CS8032</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' != 'net472'">
@@ -35,9 +34,9 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Source/AsyncGenerator/AsyncGenerator.csproj b/Source/AsyncGenerator/AsyncGenerator.csproj
@@ -7,7 +7,6 @@
     <Description>Library for generating async C# code</Description>
     <IncludeSymbols>true</IncludeSymbols>
     <LangVersion>7.3</LangVersion>
-    <NoWarn Condition="'$(TargetFramework)' == 'netcoreapp3.1'">CS8032</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
@@ -28,20 +27,20 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="$(MicrosoftCodeAnalysisVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="$(MicrosoftCodeAnalysisVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" /> <!-- https://github.com/advisories/GHSA-hq7w-xv5x-g34j -->
   </ItemGroup>
   <ItemGroup>
-    <!-- Fix for RS1024 error -->
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Framework" Version="16.8.0" ExcludeAssets="Runtime" PrivateAssets="all">
+    <PackageReference Include="Microsoft.Build.Framework" Version="17.10.4" ExcludeAssets="Runtime" PrivateAssets="all">
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <PackageReference Include="Microsoft.IO.Redist" Version="6.0.1" /> <!-- https://github.com/advisories/GHSA-hq7w-xv5x-g34j -->
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
+    <PackageReference Include="System.Formats.Asn1" Version="8.0.1" /> <!-- https://github.com/advisories/GHSA-447r-wph3-92pm -->
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AsyncGenerator.Core\AsyncGenerator.Core.csproj" />
   </ItemGroup>
diff --git a/Source/AsyncGenerator/Internal/ProjectData.cs b/Source/AsyncGenerator/Internal/ProjectData.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
diff --git a/Source/AsyncGenerator/Transformation/Internal/ProjectTransformer.Document.cs b/Source/AsyncGenerator/Transformation/Internal/ProjectTransformer.Document.cs
@@ -65,6 +65,7 @@ private DocumentTransformationResult TransformDocument(IDocumentAnalyzationResul
 			var newMembers = transformResults
 				.OrderBy(o => o.OriginalStartSpan)
 				.SelectMany(o => o.GetTransformedNodes())
+				.OfType<MemberDeclarationSyntax>()
 				.ToList();
 
 			if (!newMembers.Any())
diff --git a/appveyor.yml b/appveyor.yml
@@ -3,26 +3,19 @@ skip_branch_with_pr: true
 skip_tags: true
 image:
 - Visual Studio 2022
-- Ubuntu
+- Ubuntu2004
 - macos-sonoma
 environment:
   matrix:
-  - Target: TestCore
-    ScriptArgs: '--netcoreVersion="3.1.200" --netcore="netcoreapp3.1"'
-  - Target: TestCore
-    ScriptArgs: '--netcore="net6.0"'
   - Target: TestCore
     ScriptArgs: '--netcore="net8.0"'
   - Target: Test
     ScriptArgs: ''
 matrix:
   exclude:
-  - image: Ubuntu
-    Target: TestCore
-    ScriptArgs: '--netcore="net8.0"'
   - image: macos-sonoma
     Target: Test
-  - image: Ubuntu
+  - image: Ubuntu2004
     Target: Test
 install:
   - dotnet tool restore

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using System;`
	`1`	`+using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Text;`