Skip to content

Commit 712882c

Browse files
committed
Merge branch 'main' into dev/grendel/clr-host-static-link
* main: [CoreCLR] Enable more P/Invokes (#9956) [darc] track previous .NET Android manifests (#9981)
2 parents 89d226b + 8ee23d0 commit 712882c

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,15 @@
2020
<Uri>https://github.com/dotnet/cecil</Uri>
2121
<Sha>f7a78a77069262841fe3c3c6b89ff243fc43cefc</Sha>
2222
</Dependency>
23-
<!-- Previous .NET Android version -->
24-
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.61">
23+
<!-- Previous .NET Android version(s) -->
24+
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-9.0.100" Version="35.0.61">
2525
<Uri>https://github.com/dotnet/android</Uri>
2626
<Sha>e7876a4f92d894b40c191a24c2b74f06d4bf4573</Sha>
2727
</Dependency>
28+
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-8.0.100" Version="34.0.154">
29+
<Uri>https://github.com/dotnet/android</Uri>
30+
<Sha>82d8938cf80f6d5fa6c28529ddfbdb753d805ab4</Sha>
31+
</Dependency>
2832
</ProductDependencies>
2933
<ToolsetDependencies>
3034
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22103.1">

eng/Versions.props

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25125.1</MicrosoftDotNetCecilPackageVersion>
1414
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
1515
<!-- Previous .NET Android version -->
16-
<MicrosoftAndroidSdkWindowsPackageVersion>35.0.61</MicrosoftAndroidSdkWindowsPackageVersion>
17-
<AndroidNetPreviousVersion>$(MicrosoftAndroidSdkWindowsPackageVersion)</AndroidNetPreviousVersion>
16+
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.61</MicrosoftNETSdkAndroidManifest90100PackageVersion>
17+
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
1818
<!-- To be removed before .NET 10 GA -->
19-
<AndroidNet8PreviousVersion>34.0.154</AndroidNet8PreviousVersion>
19+
<MicrosoftNETSdkAndroidManifest80100PackageVersion>34.0.154</MicrosoftNETSdkAndroidManifest80100PackageVersion>
20+
<AndroidNet8PreviousVersion>$(MicrosoftNETSdkAndroidManifest80100PackageVersion)</AndroidNet8PreviousVersion>
2021
</PropertyGroup>
2122
<PropertyGroup>
2223
<!-- Match the first three version numbers and append 00 -->

0 commit comments

Comments
 (0)