Merge pull request #1399 from TelegramBots/develop

Bump dependencies (fix STJ vulnerability)
TelegramBots · Jul 11, 2024 · d5cb767 · d5cb767
2 parents 4b0565d + c60bc10
commit d5cb767
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/.azure-pipelines/variables.yml b/.azure-pipelines/variables.yml
@@ -1,7 +1,7 @@
-variables:
+variables:
  - group: Integration Tests Variables
  - name: versionPrefix
- value: 21.6.0
+ value: 21.6.1
  - name: versionSuffix
  value: ''
  - name: ciVersionSuffix

diff --git a/src/EnumSerializer.Generator/EnumSerializer.Generator.csproj b/src/EnumSerializer.Generator/EnumSerializer.Generator.csproj
@@ -14,10 +14,10 @@
 
  <!-- The following libraries include the source generator interfaces and types we need -->
  <ItemGroup>
- <PackageReference Include="Meziantou.Analyzer" Version="2.0.141" PrivateAssets="all" />
+ <PackageReference Include="Meziantou.Analyzer" Version="2.0.160" PrivateAssets="all" />
  <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
- <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" PrivateAssets="all" />
- <PackageReference Include="Scriban" Version="5.9.1" GeneratePathProperty="true" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" PrivateAssets="all" />
+ <PackageReference Include="Scriban" Version="5.10.0" GeneratePathProperty="true" PrivateAssets="all" />
 
  <!-- This ensures the library will be packaged as a source generator when we use `dotnet pack` -->
  <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />

diff --git a/src/Telegram.Bot/Extensions/FormatExtensions.cs b/src/Telegram.Bot/Extensions/FormatExtensions.cs
@@ -4,6 +4,8 @@
 
 namespace Telegram.Bot.Extensions;
 
+#pragma warning disable MA0001, MA0076
+
 /// <summary>Helpers/Extensions for MarkdownV2 texts</summary>
 public static class Markdown
 {

diff --git a/src/Telegram.Bot/Requests/Stickers/UploadStickerFileRequest.cs b/src/Telegram.Bot/Requests/Stickers/UploadStickerFileRequest.cs
@@ -1,6 +1,6 @@
 namespace Telegram.Bot.Requests;
 
-/// <summary>Use this method to upload a file with a sticker for later use in the <see cref="TelegramBotClientExtensions.CreateNewStickerSetAsync">CreateNewStickerSet</see>, <see cref="TelegramBotClientExtensions.AddStickerToSetAsync">AddStickerToSet</see>, or <see cref="TelegramBotClientExtensions.ReplaceStickerInSetAsync">ReplaceStickerInSet</see> methods (the file can be used multiple times).<para>Returns: The uploaded <see cref="File"/> on success.</para></summary>
+/// <summary>Use this method to upload a file with a sticker for later use in the <see cref="TelegramBotClientExtensions.CreateNewStickerSetAsync">CreateNewStickerSet</see>, <see cref="TelegramBotClientExtensions.AddStickerToSetAsync">AddStickerToSet</see>, or <see cref="TelegramBotClientExtensions.ReplaceStickerInSet">ReplaceStickerInSet</see> methods (the file can be used multiple times).<para>Returns: The uploaded <see cref="File"/> on success.</para></summary>
 public partial class UploadStickerFileRequest : FileRequestBase<File>, IUserTargetable
 {
  /// <summary>User identifier of sticker file owner</summary>

diff --git a/src/Telegram.Bot/Telegram.Bot.csproj b/src/Telegram.Bot/Telegram.Bot.csproj
@@ -59,6 +59,7 @@
  a new exception instance -->
  <NoWarn>$(NoWarn);MA0046</NoWarn> <!-- The delegate must return void -->
  <NoWarn>$(NoWarn);MA0048;MA0051</NoWarn>
+ <NoWarn>$(NoWarn);CS0419</NoWarn> <!-- Ambiguous reference in cref attribute -->
  </PropertyGroup>
 
  <ItemGroup>
@@ -77,7 +78,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="System.Text.Json" Version="8.0.0" />
+ <PackageReference Include="System.Text.Json" Version="8.0.4" />
  <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
  </ItemGroup>
 
@@ -94,9 +95,9 @@
  <ItemGroup Label="Dev">
  <PackageReference Include="IsExternalInit" Version="1.0.3" PrivateAssets="all" />
  <PackageReference Include="Required" Version="1.0.0" PrivateAssets="all" />
- <PackageReference Include="Meziantou.Analyzer" Version="2.0.141" PrivateAssets="all" />
+ <PackageReference Include="Meziantou.Analyzer" Version="2.0.160" PrivateAssets="all" />
  <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
- <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
+ <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" PrivateAssets="All" />
  <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
  <ProjectReference Include="..\EnumSerializer.Generator\EnumSerializer.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
  </ItemGroup>

diff --git a/src/Telegram.Bot/TelegramBotClientExtensions.ApiMethods.cs b/src/Telegram.Bot/TelegramBotClientExtensions.ApiMethods.cs
@@ -2610,7 +2610,7 @@ public static async Task<Sticker[]> GetCustomEmojiStickersAsync(
  CustomEmojiIds = customEmojiIds,
  }, cancellationToken).ConfigureAwait(false);
 
- /// <summary>Use this method to upload a file with a sticker for later use in the <see cref="TelegramBotClientExtensions.CreateNewStickerSetAsync">CreateNewStickerSet</see>, <see cref="TelegramBotClientExtensions.AddStickerToSetAsync">AddStickerToSet</see>, or <see cref="TelegramBotClientExtensions.ReplaceStickerInSetAsync">ReplaceStickerInSet</see> methods (the file can be used multiple times).</summary>
+ /// <summary>Use this method to upload a file with a sticker for later use in the <see cref="TelegramBotClientExtensions.CreateNewStickerSetAsync">CreateNewStickerSet</see>, <see cref="TelegramBotClientExtensions.AddStickerToSetAsync">AddStickerToSet</see>, or <see cref="TelegramBotClientExtensions.ReplaceStickerInSet">ReplaceStickerInSet</see> methods (the file can be used multiple times).</summary>
  /// <param name="botClient">An instance of <see cref="ITelegramBotClient"/></param>
  /// <param name="userId">User identifier of sticker file owner</param>
  /// <param name="sticker">A file with the sticker in .WEBP, .PNG, .TGS, or .WEBM format. See <a href="https://core.telegram.org/stickers">https://core.telegram.org/stickers</a> for technical requirements. <a href="https://core.telegram.org/bots/api#sending-files">More information on Sending Files »</a></param>

diff --git a/test/Telegram.Bot.Tests.Integ/Telegram.Bot.Tests.Integ.csproj b/test/Telegram.Bot.Tests.Integ/Telegram.Bot.Tests.Integ.csproj
@@ -11,13 +11,13 @@
  <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
- <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
+ <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
  <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
  <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
- <PackageReference Include="xunit" Version="2.7.0" />
- <PackageReference Include="xunit.runner.utility" Version="2.7.0" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+ <PackageReference Include="xunit" Version="2.9.0" />
+ <PackageReference Include="xunit.runner.utility" Version="2.9.0" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
  <PrivateAssets>all</PrivateAssets>
  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>

diff --git a/test/Telegram.Bot.Tests.Unit/Telegram.Bot.Tests.Unit.csproj b/test/Telegram.Bot.Tests.Unit/Telegram.Bot.Tests.Unit.csproj
@@ -6,10 +6,10 @@
  <IsPackable>false</IsPackable>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
- <PackageReference Include="xunit" Version="2.7.0" />
- <PackageReference Include="xunit.runner.utility" Version="2.7.0" />
- <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+ <PackageReference Include="xunit" Version="2.9.0" />
+ <PackageReference Include="xunit.runner.utility" Version="2.9.0" />
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
  </ItemGroup>
  <ItemGroup>
  <ProjectReference Include="..\..\src\Telegram.Bot\Telegram.Bot.csproj" />