Skip to content

Commit eb9fc8f

Browse files
bruno-garciabruno-garcia
committed
Merge remote-tracking branch 'origin' into feat/blazor
2 parents c4334b8 + df0799e commit eb9fc8f

File tree

12 files changed

+81
-25
lines changed

12 files changed

+81
-25
lines changed

‎.github/workflows/device-tests-android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
run: dotnet tool install Microsoft.DotNet.XHarness.CLI --global --version "1.*-*"
8585

8686
- name: Setup Gradle
87-
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # pin@v2
87+
uses: gradle/gradle-build-action@243af859f8ca30903d9d7f7936897ca0358ba691 # pin@v2
8888

8989
# Cached AVD setup per https://github.com/ReactiveCircus/android-emulator-runner/blob/main/README.md
9090

‎CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
# Changelog
22

3-
## Unreleased
3+
## 3.36.0
44

55
### Features
66

77
- Graphql client ([#2538](https://github.com/getsentry/sentry-dotnet/pull/2538))
88

9+
### Fixes
10+
11+
- Android: Fix proguard/r8 mapping file upload ([#2574](https://github.com/getsentry/sentry-dotnet/pull/2574))
12+
913
### Dependencies
1014

1115
- Bump Cocoa SDK from v8.9.5 to v8.10.0 ([#2546](https://github.com/getsentry/sentry-dotnet/pull/2546), [#2550](https://github.com/getsentry/sentry-dotnet/pull/2550))
1216
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8100)
1317
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.9.5...8.10.0)
18+
- Bump gradle/gradle-build-action from 2.7.0 to 2.7.1 ([2564](https://github.com/getsentry/sentry-dotnet/pull/2564))
19+
- [diff](https://github.com/gradle/gradle-build-action/compare/v2.7.0...v2.7.1)
1420

1521
## 3.35.1
1622

‎Directory.Build.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Version>3.35.1</Version>
4+
<Version>3.36.0</Version>
55
<LangVersion>11</LangVersion>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
77
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory).assets\Sentry.snk</AssemblyOriginatorKeyFile>
@@ -10,6 +10,9 @@
1010
<Features>strict</Features>
1111
<ImplicitUsings>true</ImplicitUsings>
1212

13+
<!-- Ignore EOL warnings... we need to support old stuff -->
14+
<CheckEolWorkloads>false</CheckEolWorkloads>
15+
1316
<!-- Allow references to unsigned assemblies (like MAUI) from signed projects -->
1417
<NoWarn>$(NoWarn);CS8002</NoWarn>
1518
</PropertyGroup>

‎before.Sentry.sln.targets

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project InitialTargets="RestoreSubmodule">
2-
<!-- If Ben.Demystifer is not found, restore git submodules -->
3-
<Target Name="RestoreSubmodule"
4-
Condition="!Exists('modules\Ben.Demystifier\Ben.Demystifier.sln')">
5-
<Message Importance="High" Text="Ben.Demystifer not found. Restoring git submodules." />
2+
<!-- Always restore, to apply changes when we change branches. If no changes happened, this is pretty quick so no need to optimize by adding a Condition -->
3+
<Target Name="RestoreSubmodule">
64
<Exec Command="git submodule update --init --recursive" />
75
</Target>
86
</Project>

‎lib/sentrysupplemental/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/bin/bash
2+
set -e
23

34
# this should point at the Android SDK root directory
45
: ${ANDROID_HOME:=~/Library/Android/sdk}
@@ -15,7 +16,8 @@ find obj bin -mindepth 1 -delete
1516

1617
# use the latest NDK installed, if not already specified
1718
: ${ANDROID_NDK:=$(dirname $(find $ANDROID_HOME/ndk/*/build -maxdepth 0 | sort -V | tail -1))}
18-
echo "Using Android NDK at $ANDROID_NDK"
19+
[ -z "$ANDROID_NDK" ] || [ ! -d $ANDROID_NDK ] && echo "NDK not installed." && exit 1
20+
echo "Using Android NDK at '$ANDROID_NDK'"
1921

2022
# compile for each ABI
2123
cd obj

‎samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
<ApplicationId>io.sentry.dotnet.samples.android</ApplicationId>
88
<ApplicationVersion>1</ApplicationVersion>
99
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
10+
<!-- XA0119: Using fast deployment and a code shrinker at the same time is not recommended. Use fast deployment for Debug configurations and a code shrinker for Release configurations.-->
11+
<NoWarn>$(NoWarn);XA0119</NoWarn>
1012
</PropertyGroup>
1113

1214
<ItemGroup>
@@ -27,7 +29,13 @@
2729
<PropertyGroup>
2830
<SentryUploadSources>true</SentryUploadSources>
2931
<SentryUploadSymbols>true</SentryUploadSymbols>
32+
<!-- Use ProGuard (R8), and upload mapping to Sentry-->
33+
<AndroidLinkTool Condition=" '$(AndroidLinkTool)' == '' ">r8</AndroidLinkTool>
34+
<AndroidDexTool Condition=" '$(AndroidDexTool)' == '' ">d8</AndroidDexTool>
3035
<SentryUploadAndroidProguardMapping>true</SentryUploadAndroidProguardMapping>
36+
<!-- Since we're doing this in Debug builds: https://github.com/xamarin/xamarin-android/issues/6612#issuecomment-1006125892-->
37+
<PublishTrimmed>true</PublishTrimmed>
38+
<AndroidLinkMode>full</AndroidLinkMode>
3139
</PropertyGroup>
3240

3341
</Project>

‎scripts/dirty-check.ps1

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Set-StrictMode -Version Latest
2+
3+
$pathToCheck = $args[0]
4+
5+
$ErrorActionPreference = 'Stop'
6+
7+
# Any value will be truthy in PS so if our check returns something, we've got tracked changes
8+
$changes = git diff --name-only $pathToCheck
9+
if($changes){
10+
Write-Output "Path: $pathToCheck"
11+
Write-Output "Changes:`n$changes"
12+
Write-Error 'Dirty files detected.' `
13+
-CategoryActivity Error -ErrorAction Stop
14+
}
15+
else
16+
{
17+
Write-Output 'Working directory clean excluding untracked files'
18+
}
19+

‎src/Sentry.Bindings.Android/Transforms/Metadata.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
-->
5050
<attr path="/api/package[@name='io.sentry']/class[@name='SentryBaseEvent']/field[@name='throwable']" name="managedName">ThrowableValue</attr>
5151
<attr path="/api/package[@name='io.sentry']/class[@name='SpanContext']/field[@name='description']" name="managedName">DescriptionValue</attr>
52+
<attr path="/api/package[@name='io.sentry']/class[@name='SpanContext']/field[@name='origin']" name="managedName">OriginValue</attr>
5253
<attr path="/api/package[@name='io.sentry']/class[@name='SpanContext']/field[@name='status']" name="managedName">StatusValue</attr>
5354
<attr path="/api/package[@name='io.sentry']/class[@name='SpanContext']/field[@name='tags']" name="managedName">TagsValue</attr>
5455

‎src/Sentry.Bindings.Cocoa/ApiDefinitions.cs

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,10 @@ interface SentryFrame : SentrySerializable
560560
[NullAllowed, Export ("instructionAddress")]
561561
string InstructionAddress { get; set; }
562562

563+
// @property (nonatomic) NSUInteger instruction;
564+
[Export ("instruction")]
565+
nuint Instruction { get; set; }
566+
563567
// @property (copy, nonatomic) NSNumber * _Nullable lineNumber;
564568
[NullAllowed, Export ("lineNumber", ArgumentSemantic.Copy)]
565569
NSNumber LineNumber { get; set; }
@@ -871,9 +875,9 @@ interface SentryOptions
871875
[Export ("enableMetricKit")]
872876
bool EnableMetricKit { get; set; }
873877

874-
// @property (nonatomic) BOOL enableTimeToFullDisplay;
875-
[Export ("enableTimeToFullDisplay")]
876-
bool EnableTimeToFullDisplay { get; set; }
878+
// @property (nonatomic) BOOL enableTimeToFullDisplayTracing;
879+
[Export ("enableTimeToFullDisplayTracing")]
880+
bool EnableTimeToFullDisplayTracing { get; set; }
877881

878882
// @property (assign, nonatomic) BOOL swiftAsyncStacktraces;
879883
[Export ("swiftAsyncStacktraces")]
@@ -2294,7 +2298,7 @@ interface SentryEnvelope
22942298
SentryEnvelopeItem[] Items { get; }
22952299
}
22962300

2297-
// @interface SentryScreenFrames : NSObject
2301+
// @interface SentryScreenFrames : NSObject <NSCopying>
22982302
[BaseType (typeof(NSObject))]
22992303
[DisableDefaultCtor]
23002304
[Internal]
@@ -2393,6 +2397,17 @@ interface PrivateSentrySDKOnly
23932397
[Export ("getExtraContext")]
23942398
NSDictionary ExtraContext { get; }
23952399

2400+
// +(uint64_t)startProfilingForTrace:(SentryId * _Nonnull)traceId;
2401+
[Static]
2402+
[Export ("startProfilingForTrace:")]
2403+
ulong StartProfilingForTrace (SentryId traceId);
2404+
2405+
// +(NSDictionary<NSString *,id> * _Nullable)collectProfileForTrace:(SentryId * _Nonnull)traceId since:(uint64_t)startSystemTime;
2406+
[Static]
2407+
[Export ("collectProfileForTrace:since:")]
2408+
[return: NullAllowed]
2409+
NSDictionary<NSString, NSObject> CollectProfileForTrace (SentryId traceId, ulong startSystemTime);
2410+
23962411
// @property (copy, nonatomic, class) SentryOnAppStartMeasurementAvailable _Nullable onAppStartMeasurementAvailable;
23972412
[Static]
23982413
[NullAllowed, Export ("onAppStartMeasurementAvailable", ArgumentSemantic.Copy)]

‎src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,13 @@
5555

5656
<!-- Generate bindings -->
5757
<Target Name="_GenerateSentryCocoaBindings" AfterTargets="_BuildSentryCocoaSDK" Condition="$([MSBuild]::IsOSPlatform('OSX'))"
58-
Inputs="..\..\modules\sentry-cocoa\Carthage\.built-from-sha" Outputs="ApiDefinitions.cs;StructsAndEnums.cs">
58+
Inputs="..\..\modules\sentry-cocoa\Carthage\.built-from-sha" Outputs="ApiDefinitions.cs;StructsAndEnums.cs">
5959
<MSBuild Projects="$(MSBuildProjectFile)" Targets="_InnerGenerateSentryCocoaBindings" Properties="TargetFramework=once" />
6060
</Target>
6161
<Target Name="_InnerGenerateSentryCocoaBindings">
6262
<Exec Command="pwsh ../../scripts/generate-cocoa-bindings.ps1" />
63+
<!-- See https://github.com/getsentry/sentry-dotnet/pull/2558 -->
64+
<Exec Condition="'$(GITHUB_ACTIONS)' == 'true'" Command="pwsh ../../scripts/dirty-check.ps1 $(MSBuildThisFileDirectory)" />
6365
</Target>
6466

6567
<!-- Workaround for https://github.com/xamarin/xamarin-macios/issues/15299 -->

0 commit comments

Comments
 (0)