Merge branch 'main' into fix/unbreak-disposing

getsentry · Sep 24, 2024 · 02530d9 · 02530d9
2 parents e486bc3 + 189662d
commit 02530d9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -35,7 +35,7 @@ jobs:
  uses: ./.github/actions/environment
 
  - name: Initialize CodeQL
- uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # pin@v2
+ uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # pin@v2
  with:
  languages: csharp
 
@@ -46,6 +46,6 @@ jobs:
  run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo
 
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # pin@v2
+ uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # pin@v2
  with:
  category: '/language:csharp'
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,14 @@
  Sentry will reject all metrics sent after October 7, 2024.
  Learn more: https://sentry.zendesk.com/hc/en-us/articles/26369339769883-Upcoming-API-Changes-to-Metrics ([#3619](https://github.com/getsentry/sentry-dotnet/pull/3619))
 
+### Dependencies
+
+- Bump CLI from v2.36.1 to v2.36.2 ([#3624](https://github.com/getsentry/sentry-dotnet/pull/3624))
+ - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#2362)
+ - [diff](https://github.com/getsentry/sentry-cli/compare/2.36.1...2.36.2)
+
+## 4.11.0
+
 ### Features
 
 - All exceptions are now added as breadcrumbs on future events. Previously this was only the case for exceptions captured via the `Sentry.SeriLog` or `Sentry.Extensions.Logging` integrations. ([#3584](https://github.com/getsentry/sentry-dotnet/pull/3584))

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
  <PropertyGroup>
- <VersionPrefix>4.10.2</VersionPrefix>
+ <VersionPrefix>4.11.0</VersionPrefix>
  <LangVersion>12</LangVersion>
  <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
  <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -70,7 +70,7 @@
 
  <!-- Set the version and local path for Sentry CLI (downloaded in the restore phase of Sentry.csproj) -->
  <PropertyGroup Condition="'$(SolutionName)' != 'Sentry.Unity'">
- <SentryCLIVersion>2.36.1</SentryCLIVersion>
+ <SentryCLIVersion>2.36.2</SentryCLIVersion>
  <SentryCLIDirectory>$(MSBuildThisFileDirectory)tools\sentry-cli\$(SentryCLIVersion)\</SentryCLIDirectory>
  </PropertyGroup>
 

diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
@@ -116,13 +116,13 @@
  <_OSArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)</_OSArchitecture>
  </PropertyGroup>
  <ItemGroup>
- <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('OSX')) And $(_OSArchitecture) == 'Arm64')" Include="sentry-cli-Darwin-arm64" FileHash="b840504663e5e4c9cbc0e71f9d43081cc85504cfd70c1db01e73b170c4467204" />
- <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('OSX')) And $(_OSArchitecture) == 'X64')" Include="sentry-cli-Darwin-x86_64" FileHash="06efaf6b2c617dbefdb787e0a92ec9a029ef0afbeb808f1865f97e4201d61488" />
- <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'Arm64')" Include="sentry-cli-Linux-aarch64" FileHash="605a94cdc60edce7891457116d2f04ffec3d4f7c21fc51dbcd84eb877f34d50e" />
- <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'X86')" Include="sentry-cli-Linux-i686" FileHash="adad98902ed0e5001c60a2783684417ef147c3229da97812ee18ac75af65e733" />
- <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'X64')" Include="sentry-cli-Linux-x86_64" FileHash="4c3ff70421eecf5c4dbc6d15256a9c7eb28d6804d3e1b6717edf3a1a8b7a05c3" />
- <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Windows')) And $(_OSArchitecture) == 'X86')" Include="sentry-cli-Windows-i686.exe" FileHash="b24621e338ef44892a735fb4d65eac8f0193fbbe4a2a20b2f3a89702ccdaad07" />
- <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Windows')) And $(_OSArchitecture) != 'X86')" Include="sentry-cli-Windows-x86_64.exe" FileHash="cdb452c61daa25d02a2607ed6411216fc67e6feb0f75693931309c3830cd5543" />
+ <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('OSX')) And $(_OSArchitecture) == 'Arm64')" Include="sentry-cli-Darwin-arm64" FileHash="decbca422a4801e390a034f79da236d3f3c658b7ff765a717e67173c0f7b40de" />
+ <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('OSX')) And $(_OSArchitecture) == 'X64')" Include="sentry-cli-Darwin-x86_64" FileHash="301b46354c428d523c8c87b9c5fac52eb14b3bb7bcde912c58d498e170f1b1e4" />
+ <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'Arm64')" Include="sentry-cli-Linux-aarch64" FileHash="bbb704c491eeb46be92877fcc39a712be53388435d256b7e112f76a4a37de91c" />
+ <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'X86')" Include="sentry-cli-Linux-i686" FileHash="9aebde0aafc57a598c53c16ebfe0aa57152d948371e69edacccd241d1888166f" />
+ <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Linux')) And $(_OSArchitecture) == 'X64')" Include="sentry-cli-Linux-x86_64" FileHash="f19511e24fda6c44b62da3fd8d5d7193eada4fa885626b275b930b3cd435435b" />
+ <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Windows')) And $(_OSArchitecture) == 'X86')" Include="sentry-cli-Windows-i686.exe" FileHash="239c1435b982b0e36e1c6c1665a9512cce5ddea27c5645012d3ac0abc739cc2f" />
+ <SentryCLIDownload Condition="'$(CI_PUBLISHING_BUILD)' == 'true' Or ($([MSBuild]::IsOSPlatform('Windows')) And $(_OSArchitecture) != 'X86')" Include="sentry-cli-Windows-x86_64.exe" FileHash="aeef1303382a528aec0793af1c71f4130f34e3b5b7631a497332f9e5069ba655" />
  </ItemGroup>
 
  <!-- Download the files -->