Skip to content
32 changes: 16 additions & 16 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.3.26179.102">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.4.26214.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d70206844a95b337601237466bfc6cbb7d52d6d4</Sha>
<Sha>b94d039caa166db357a3b806a4ec698e429f0cae</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.3.26179.102">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.4.26214.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d70206844a95b337601237466bfc6cbb7d52d6d4</Sha>
<Sha>b94d039caa166db357a3b806a4ec698e429f0cae</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.3.26179.102">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.4.26214.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d70206844a95b337601237466bfc6cbb7d52d6d4</Sha>
<Sha>b94d039caa166db357a3b806a4ec698e429f0cae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26179.102">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26214.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d70206844a95b337601237466bfc6cbb7d52d6d4</Sha>
<Sha>b94d039caa166db357a3b806a4ec698e429f0cae</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.3" Version="11.0.0-preview.3.26179.102">
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-11.0.100-preview.4" Version="11.0.100-preview.4.26214.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d70206844a95b337601237466bfc6cbb7d52d6d4</Sha>
<Sha>b94d039caa166db357a3b806a4ec698e429f0cae</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.3" Version="11.0.100-preview.3.26179.102">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.4" Version="11.0.100-preview.4.26214.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d70206844a95b337601237466bfc6cbb7d52d6d4</Sha>
<Sha>b94d039caa166db357a3b806a4ec698e429f0cae</Sha>
</Dependency>
<!-- Previous .NET version -->
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-9.0.100" Version="9.0.12">
Expand All @@ -36,13 +36,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26179.102">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26214.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d70206844a95b337601237466bfc6cbb7d52d6d4</Sha>
<Sha>b94d039caa166db357a3b806a4ec698e429f0cae</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.3.26179.102">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.4.26214.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d70206844a95b337601237466bfc6cbb7d52d6d4</Sha>
<Sha>b94d039caa166db357a3b806a4ec698e429f0cae</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
20 changes: 10 additions & 10 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.3.26179.102</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.4.26214.103</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.3.26179.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.3.26179.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.4.26214.103</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.4.26214.103</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<!-- Last version built for net10.0, needed for CI steps that only have the .NET 10 SDK installed (e.g., BAR manifest publishing) -->
<MicrosoftDotNetBuildTasksFeedPackageVersionNet10>11.0.0-beta.26060.102</MicrosoftDotNetBuildTasksFeedPackageVersionNet10>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26179.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>11.0.0-preview.3.26179.102</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>11.0.100-preview.3.26179.102</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.3.26179.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26179.102</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26214.103</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion>11.0.100-preview.4.26214.103</MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion>11.0.100-preview.4.26214.103</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview4PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.4.26214.103</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26214.103</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
<SystemReflectionMetadataPackageVersion>11.0.0-preview.1.26104.118</SystemReflectionMetadataPackageVersion>
<!-- Previous .NET Android version -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,17 @@ This file contains the NativeAOT-specific MSBuild logic for .NET for Android.
DependsOnTargets="_GenerateNativeAotAndroidAppAssemblerSources">
</Target>

<!--
dotnet/runtime#125629 moved the NativeAOT entry point from ComputeLinkedFilesToPublish
(AfterTargets="ComputeResolvedFilesToPublishList") to NativeCompile (an SDK Publish hook).
Android uses `dotnet build` not `dotnet publish`, so NativeCompile never fires.
Restore the old scheduling so NativeCompile runs after ComputeResolvedFilesToPublishList
in the inner per-RID build.
-->
<Target Name="_AndroidRunNativeCompile"
AfterTargets="ComputeResolvedFilesToPublishList"
DependsOnTargets="NativeCompile" />

<Target Name="_AndroidFixNativeLibraryFileName" AfterTargets="ComputeFilesToPublish">
<ItemGroup>
<!-- Fix paths to contain lib-prefix -->
Expand Down