Skip to content

Commit 99593ca

Browse files
jamescrosswelljamescrosswell
committed
Merge branch 'net10' into assembly-store-v3
2 parents 2e91915 + 5fb3053 commit 99593ca

17 files changed

+63
-137
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,10 @@
2828
<WarningsNotAsErrors>NU1902;NU1903</WarningsNotAsErrors>
2929

3030
<!-- Centralized TFM versions -->
31-
<CurrentTfms>net8.0;net9.0;net10.0</CurrentTfms>
3231
<LatestTfm>net10.0</LatestTfm>
3332
<PreviousTfm>net9.0</PreviousTfm>
33+
<OldestTfm>net8.0</OldestTfm>
34+
<CurrentTfms>net8.0;net9.0;net10.0</CurrentTfms>
3435
<LatestAndroidTfm>net10.0-android36.0</LatestAndroidTfm>
3536
<PreviousAndroidTfm>net9.0-android35.0</PreviousAndroidTfm>
3637
<LatestIosTfm>net9.0-ios26</LatestIosTfm>

‎integration-test/cli.Tests.ps1‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,16 +144,16 @@ Describe 'MAUI (<framework>)' -ForEach @(
144144

145145
It "uploads symbols and sources for an Android build" {
146146
$result = RunDotnetWithSentryCLI 'build' 'maui-app' $True $True "$framework-android$androidTpv"
147+
Write-Host "UploadedDebugFiles: $($result.UploadedDebugFiles() | Out-String)"
147148
$result.UploadedDebugFiles() | Sort-Object -Unique | Should -Be @(
148149
'libsentry-android.so',
149150
'libsentry.so',
150151
'libsentrysupplemental.so',
151152
'libxamarin-app.so',
152153
'maui-app.pdb'
153154
)
154-
$nonZeroNumberRegex = '[1-9][0-9]*';
155155
$result.ScriptOutput | Should -AnyElementMatch 'Uploaded a total of 1 new mapping files'
156-
$result.ScriptOutput | Should -AnyElementMatch "Found $nonZeroNumberRegex debug information files \($nonZeroNumberRegex with embedded sources\)"
156+
$result.ScriptOutput | Should -AnyElementMatch "Found 23 debug information files \(1 with embedded sources\)"
157157
}
158158

159159
It "uploads symbols and sources for an iOS build" -Skip:(!$IsMacOS) {
@@ -183,7 +183,6 @@ Describe 'MAUI (<framework>)' -ForEach @(
183183
'Microsoft.Maui.pdb',
184184
'Sentry'
185185
)
186-
$nonZeroNumberRegex = '[1-9][0-9]*';
187-
$result.ScriptOutput | Should -AnyElementMatch "Found $nonZeroNumberRegex debug information files \($nonZeroNumberRegex with embedded sources\)"
186+
$result.ScriptOutput | Should -AnyElementMatch "Found 77 debug information files \(8 with embedded sources\)"
188187
}
189188
}

‎integration-test/common.ps1‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,49 +84,51 @@ BeforeAll {
8484
{
8585
# Read version directly from Directory.Build.props
8686
$propsFile = Join-Path $PSScriptRoot '..\Directory.Build.props'
87-
87+
8888
if (-not (Test-Path $propsFile)) {
8989
throw "Directory.Build.props not found at $propsFile"
9090
}
91-
91+
9292
# Parse the props file using PowerShell XML parsing
9393
Write-Host "Parsing props file as XML..."
9494
[xml]$propsXml = Get-Content $propsFile
95-
95+
9696
# Look for VersionPrefix and VersionSuffix in PropertyGroup elements
9797
$versionPrefix = ""
9898
$versionSuffix = ""
99-
99+
100100
foreach ($propGroup in $propsXml.Project.PropertyGroup) {
101-
if ($propGroup.VersionPrefix) {
101+
if ($propGroup.PSObject.Properties["VersionPrefix"]) {
102102
$versionPrefix = $propGroup.VersionPrefix
103103
Write-Host "Found VersionPrefix: '$versionPrefix'"
104104
}
105-
105+
106106
# For VersionSuffix, we need to be careful about conditions
107107
# Only use VersionSuffix if it's not in a conditional PropertyGroup
108108
# or if it's explicitly set (not the 'dev' fallback for non-Release)
109-
if ($propGroup.VersionSuffix) {
110-
$condition = $propGroup.Condition
111-
if (-not $condition) {
109+
if ($propGroup.PSObject.Properties["VersionSuffix"]) {
110+
$condition = $null
111+
if ($propGroup.PSObject.Properties["Condition"]) {
112+
$condition = $propGroup.Condition
113+
Write-Host "Ignoring VersionSuffix: '$($propGroup.VersionSuffix)' with condition: '$condition'"
114+
# Skip conditional VersionSuffix as we're building in Release mode
115+
}
116+
else {
112117
# No condition - this is the explicit VersionSuffix we want
113118
$versionSuffix = $propGroup.VersionSuffix
114119
Write-Host "Found VersionSuffix: '$versionSuffix'"
115-
} else {
116-
Write-Host "Ignoring VersionSuffix: '$($propGroup.VersionSuffix)' with condition: '$condition'"
117-
# Skip conditional VersionSuffix as we're building in Release mode
118120
}
119121
}
120122
}
121-
123+
122124
if (-not $versionPrefix) {
123125
throw "Could not find VersionPrefix in $propsFile"
124126
}
125-
127+
126128
# Combine prefix and suffix
127129
$fullVersion = if ($versionSuffix) { "$versionPrefix-$versionSuffix" } else { $versionPrefix }
128130
Write-Host "Full Version: '$fullVersion'"
129-
131+
130132
return $fullVersion
131133
}
132134

‎src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,11 @@
4848
<ItemGroup Condition="$(TargetFramework.StartsWith('net10'))">
4949
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Process" Version="2.9.2.1" />
5050
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Common.Java8" Version="2.9.2.1" />
51-
<!-- MAUI 9 references this version indirectly via Xamarin.AndroidX.SwipeRefreshLayout -->
51+
<!-- MAUI 10 references this version indirectly via Xamarin.AndroidX.SwipeRefreshLayout -->
5252
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.17.0" />
53-
<!-- We need 1.9.24 but there's no NuGet package for that version... the lowest version we can use is 2.0.0 -->
53+
<!-- We have a dependency on 1.9.24 from here:
54+
https://github.com/getsentry/sentry-java/blob/604a2616bebd80ea051cdcec916aa052b509c5a8/buildSrc/src/main/java/Config.kt#L6-L7
55+
... but there's no NuGet package for that version. The lowest version we can use is 2.0.0 -->
5456
<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="2.2.10" />
5557
</ItemGroup>
5658

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,9 @@ interface SentryEnvelopeItemHeader : SentrySerializable
416416
[Export ("initWithType:length:filenname:contentType:")]
417417
NativeHandle Constructor (string type, nuint length, string filename, string contentType);
418418

419-
// -(instancetype _Nonnull)initWithType:(NSString * _Nonnull)type length:(NSUInteger)length contentType:(NSString * _Nonnull)contentType itemCount:(NSNumber * _Nonnull)itemCount;
419+
// -(instancetype _Nonnull)initWithType:(NSString * _Nonnull)type length:(NSUInteger)length contentType:(NSString * _Nullable)contentType itemCount:(NSNumber * _Nonnull)itemCount;
420420
[Export ("initWithType:length:contentType:itemCount:")]
421-
NativeHandle Constructor (string type, nuint length, string contentType, NSNumber itemCount);
421+
NativeHandle Constructor (string type, nuint length, [NullAllowed] string contentType, NSNumber itemCount);
422422

423423
// @property (readonly, copy, nonatomic) NSString * _Nonnull type;
424424
[Export ("type")]

‎src/Sentry.Google.Cloud.Functions/Sentry.Google.Cloud.Functions.csproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,4 @@
1616
<PackageReference Include="Google.Cloud.Functions.Hosting" Version="2.0.0" />
1717
</ItemGroup>
1818

19-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
21-
</ItemGroup>
22-
23-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
25-
</ItemGroup>
26-
2719
</Project>

‎src/Sentry.Maui/Internal/MauiEventsBinder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ internal void HandlePageEvents(Page page, bool bind = true)
299299
page.NavigatedTo -= OnPageOnNavigatedTo;
300300

301301
// Size changed event
302-
// https://learn.microsoft.com/en-us/dotnet/api/microsoft.maui.controls.visualelement.sizechanged
302+
// https://learn.microsoft.com/dotnet/api/microsoft.maui.controls.visualelement.sizechanged
303303
page.SizeChanged -= OnPageOnSizeChanged;
304304

305305
if (bind)
@@ -314,7 +314,7 @@ internal void HandlePageEvents(Page page, bool bind = true)
314314
page.NavigatedTo += OnPageOnNavigatedTo;
315315

316316
// Size changed event
317-
// https://learn.microsoft.com/en-us/dotnet/api/microsoft.maui.controls.visualelement.sizechanged
317+
// https://learn.microsoft.com/dotnet/api/microsoft.maui.controls.visualelement.sizechanged
318318
page.SizeChanged += OnPageOnSizeChanged;
319319
}
320320
}

‎test/Sentry.AspNetCore.Tests/Sentry.AspNetCore.Tests.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
<ProjectReference Include="..\Sentry.Testing\Sentry.Testing.csproj" />
1111
</ItemGroup>
1212

13-
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
14-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-rc.1.25451.107" />
15-
</ItemGroup>
16-
1713
<ItemGroup>
1814
<None Update="*.json">
1915
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎test/Sentry.AspNetCore.Tests/WebIntegrationTests.PreFlightIgnoresTransaction.DotNet.verified.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/Sentry.AspNetCore.Tests/WebIntegrationTests.Versioning.verified.txt‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)