Skip to content

[mobile] .NET 11 mobile runtime configuration updates #25672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kotlarmilos wants to merge 4 commits into
base: net11.0
Choose a base branch
from
+31 −366
Open

[mobile] .NET 11 mobile runtime configuration updates #25672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e569b84
Update SDK workload pipeline configuration
kotlarmilos Jun 11, 2026
b533d15
Update .NET 11 SDK to preview 6 (build 20260610.6)
kotlarmilos Jun 10, 2026
8d74b0f
Use validation package feed for SDK packages
kotlarmilos Jun 10, 2026
b0e9a9c
[mobile] Remove Mono mobile dotnet build tests
kotlarmilos Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
</config>
<packageSources>
<clear />
<add key="general-testing" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json" />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
Comment thread
kotlarmilos marked this conversation as resolved.
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-6efb055" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-6efb055f/nuget/v3/index.json" />
Expand Down
1 change: 0 additions & 1 deletion builds/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ package-download/all-package-references.csproj: $(GIT_DIRECTORY)/HEAD $(GIT_DIRE
download-packages.csproj \
/t:WriteBundledNETCorePlatformsPackageVersion \
/p:WriteFilePath=$(CURDIR)/BundledNETCorePlatformsPackageVersion.txt \
/p:PackageRuntimeIdentifiersMonoVM="$(DOTNET_MONOVM_RUNTIME_IDENTIFIERS)" \
/p:PackageRuntimeIdentifiersCoreCLR="$(DOTNET_CORECLR_RUNTIME_IDENTIFIERS)" \
/p:CustomDotNetVersion="$(DOWNLOAD_DOTNET_VERSION)" \
/p:TrackingDotNetRuntimeSeparately="$(TRACKING_DOTNET_RUNTIME_SEPARATELY)" \
Expand Down
2 changes: 0 additions & 2 deletions builds/package-download/download-packages.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,9 @@
<ItemGroup>
<!-- Download any runtime packs as specified using the PackageRuntimeIdentifiers property -->
<PackageRuntimeIdentifiers Include="$(PackageRuntimeIdentifiers.Split(' '))" />
<PackageRuntimeIdentifiersMonoVM Include="$(PackageRuntimeIdentifiersMonoVM.Split(' '))" />
<PackageRuntimeIdentifiersCoreCLR Include="$(PackageRuntimeIdentifiersCoreCLR.Split(' '))" />

<!-- download the runtime packs -->
<PackageDownload Include="@(PackageRuntimeIdentifiersMonoVM -> 'Microsoft.NETCore.App.Runtime.Mono.%(Identity)')" Version="[$(ActualPackageVersion)]" />
<PackageDownload Include="@(PackageRuntimeIdentifiersCoreCLR -> 'Microsoft.NETCore.App.Runtime.%(Identity)')" Version="[$(ActualPackageVersion)]" />

<!-- download the reference assemblies -->
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.5.26256.105">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.6.26310.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>8d5d82abe13ac88cf5b2343e77460243b5272a6b</Sha>
</Dependency>
Comment thread
kotlarmilos marked this conversation as resolved.
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.5.26256.105">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.6.26310.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>8d5d82abe13ac88cf5b2343e77460243b5272a6b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.5.26256.105">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.6.26310.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>8d5d82abe13ac88cf5b2343e77460243b5272a6b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.5.26256.105">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.6.26310.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>8d5d82abe13ac88cf5b2343e77460243b5272a6b</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26256.105">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.6.26310.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>8d5d82abe13ac88cf5b2343e77460243b5272a6b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26256.105">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26310.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>8d5d82abe13ac88cf5b2343e77460243b5272a6b</Sha>
</Dependency>
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
Expand Down Expand Up @@ -61,25 +61,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26256.105">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26310.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>8d5d82abe13ac88cf5b2343e77460243b5272a6b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26256.105">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26310.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>8d5d82abe13ac88cf5b2343e77460243b5272a6b</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.5.26256.105">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.6.26310.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>8d5d82abe13ac88cf5b2343e77460243b5272a6b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26217.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>866707736d49c2323628744716cda2475b3af9ee</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26256.105">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26310.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>d64191f29ec9042e2696d8b7d8326c4bd10ba268</Sha>
<Sha>8d5d82abe13ac88cf5b2343e77460243b5272a6b</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "11.0.100-preview.5.26256.105",
"version": "11.0.100-preview.6.26310.106",
"paths": [
"builds/downloads/dotnet",
Comment thread
kotlarmilos marked this conversation as resolved.
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "11.0.100-preview.5.26256.105"
"dotnet": "11.0.100-preview.6.26310.106"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26256.105"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26310.106"
}
}
16 changes: 0 additions & 16 deletions tests/dotnet/UnitTests/BundleStructureTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,22 +634,6 @@ public enum CodeSignature {
All,
}

[Test]
// Debug
[TestCase (ApplePlatform.iOS, "ios-arm64", CodeSignature.All, "Debug")]
[TestCase (ApplePlatform.iOS, "iossimulator-x64", CodeSignature.All, "Debug")]
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-x64", CodeSignature.All, "Debug")]
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-x64;maccatalyst-arm64", CodeSignature.All, "Debug")]
[TestCase (ApplePlatform.TVOS, "tvos-arm64", CodeSignature.All, "Debug")]
// Release
[TestCase (ApplePlatform.iOS, "ios-arm64", CodeSignature.All, "Release")]
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-x64;maccatalyst-arm64", CodeSignature.All, "Release")]
[TestCase (ApplePlatform.TVOS, "tvos-arm64", CodeSignature.All, "Release")]
public void Build_Mono (ApplePlatform platform, string runtimeIdentifiers, CodeSignature signature, string configuration)
{
Build (platform, runtimeIdentifiers, signature, configuration, true);
}

[Test]
// Debug
[TestCase (ApplePlatform.iOS, "ios-arm64", CodeSignature.All, "Debug")]
Expand Down
125 changes: 0 additions & 125 deletions tests/dotnet/UnitTests/IncrementalBuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@

namespace Xamarin.Tests {
public class IncrementalBuildTest : TestBaseClass {
[Test]
// this test is fairly slow, so execute on one arch only
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")]
public void Link_Mono (ApplePlatform platform, string runtimeIdentifiers)
{
LinkImpl (platform, runtimeIdentifiers, useMonoRuntime: true);
}

[Test]
// this test is fairly slow, so execute on one arch only
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")]
Expand Down Expand Up @@ -123,113 +115,6 @@ static IEnumerable<string> GetLoadCommands (string dylib)
}
}

[Test]
[TestCase (ApplePlatform.iOS, "ios-arm64")]
public void NativeLink (ApplePlatform platform, string runtimeIdentifiers)
{
Configuration.IgnoreIfIgnoredPlatform (platform);
Configuration.AssertRuntimeIdentifiersAvailable (platform, runtimeIdentifiers);

var project_path = GenerateProject (platform, name: nameof (NativeLink), runtimeIdentifiers: runtimeIdentifiers, out var appPath);
var properties = new Dictionary<string, string> (verbosity);
properties ["UseMonoRuntime"] = "true"; // this test is only applicable to Mono.
SetRuntimeIdentifiers (properties, runtimeIdentifiers);

var mainContents = @"
class MainClass {
static int Main ()
{
return 123;
}
}
";
var mainFile = Path.Combine (Path.GetDirectoryName (project_path)!, "Main.cs");

File.WriteAllText (mainFile, mainContents);

// Build the first time
var rv = DotNet.AssertBuild (project_path, properties);
var allTargets = BinLog.GetAllTargets (rv.BinLogPath);
AssertTargetExecuted (allTargets, "_AOTCompile", "A");
AssertTargetExecuted (allTargets, "_CompileNativeExecutable", "A");
AssertTargetExecuted (allTargets, "_LinkNativeExecutable", "A");

// Capture the current time
var timestamp = DateTime.UtcNow;
File.WriteAllText (mainFile, mainContents);

// Build again
rv = DotNet.AssertBuild (project_path, properties);

// Check that some targets executed
allTargets = BinLog.GetAllTargets (rv.BinLogPath);
AssertTargetExecuted (allTargets, "_AOTCompile", "B");
AssertTargetNotExecuted (allTargets, "_CompileNativeExecutable", "B");
AssertTargetExecuted (allTargets, "_LinkNativeExecutable", "B");

// Verify that the timestamp of the executable has been updated
var executable = GetNativeExecutable (platform, appPath!);
Assert.That (File.GetLastWriteTimeUtc (executable), Is.GreaterThan (timestamp), "B: Executable modified");
}

[Test]
// this test is fairly slow, so execute on one arch only
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")]
public void Interpreter (ApplePlatform platform, string runtimeIdentifiers)
{
var project = "MySimpleApp";
Configuration.IgnoreIfIgnoredPlatform (platform);
Configuration.AssertRuntimeIdentifiersAvailable (platform, runtimeIdentifiers);

var project_path = GetProjectPath (project, runtimeIdentifiers: runtimeIdentifiers, platform: platform, out var appPath);
Clean (project_path);
var properties = GetDefaultProperties (runtimeIdentifiers);

properties ["UseMonoRuntime"] = "true"; // only applicable when using MonoVM.

// Build with the interpreter disabled
properties ["UseInterpreter"] = "false";
DotNet.AssertBuild (project_path, properties);

// Make sure it runs successfully (if on desktop)
var appExecutable = GetNativeExecutable (platform, appPath);
ExecuteWithMagicWordAndAssert (platform, runtimeIdentifiers, appExecutable);

// Capture when executable was created
var appExecutableTimestamp = File.GetLastWriteTimeUtc (appExecutable);

// Build again, now enabling the interpreter
Configuration.Touch (project_path);
properties ["UseInterpreter"] = "true";
DotNet.AssertBuild (project_path, properties);

// Executing should work just fine
ExecuteWithMagicWordAndAssert (platform, runtimeIdentifiers, appExecutable);

// The main executable must be modified
Assert.That (File.GetLastWriteTimeUtc (appExecutable), Is.GreaterThan (appExecutableTimestamp), "Modified A");

// Capture when executable was rebuilt
appExecutableTimestamp = File.GetLastWriteTimeUtc (appExecutable);

// Build again, not doing anything
DotNet.AssertBuild (project_path, properties);

// Executing should work just fine
ExecuteWithMagicWordAndAssert (platform, runtimeIdentifiers, appExecutable);

// The main executable must not be modified
Assert.That (File.GetLastWriteTimeUtc (appExecutable), Is.EqualTo (appExecutableTimestamp), "Modified B");
}

[Test]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64", true)]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64", false)]
public void CodeChangeSkipsTargets_Mono (ApplePlatform platform, string runtimeIdentifiers, bool interpreterEnabled)
{
CodeChangeSkipsTargetsImpl (platform, runtimeIdentifiers, useMonoRuntime: true, interpreterEnabled: interpreterEnabled);
}

[Test]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64")]
public void CodeChangeSkipsTargets_CoreCLR (ApplePlatform platform, string runtimeIdentifiers)
Expand All @@ -239,16 +124,6 @@ public void CodeChangeSkipsTargets_CoreCLR (ApplePlatform platform, string runti
CodeChangeSkipsTargetsImpl (platform, runtimeIdentifiers, useMonoRuntime: false, interpreterEnabled: false);
}

[Test]
[Category ("RemoteWindows")]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64", true)]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64", false)]
public void CodeChangeSkipsTargetsOnRemoteWindows_Mono (ApplePlatform platform, string runtimeIdentifiers, bool interpreterEnabled)
{
Configuration.IgnoreIfNotOnWindows ();
CodeChangeSkipsTargetsImpl (platform, runtimeIdentifiers, useMonoRuntime: true, interpreterEnabled: interpreterEnabled);
}

[Test]
[Category ("RemoteWindows")]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64")]
Expand Down
17 changes: 0 additions & 17 deletions tests/dotnet/UnitTests/PostBuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,6 @@ public void ArchiveTest (ApplePlatform platform, string runtimeIdentifiers)
AssertDSymDirectory (appPath);
}

[Test]
[TestCase (ApplePlatform.iOS, "ios-arm64")]
[TestCase (ApplePlatform.TVOS, "tvos-arm64")]
public void BuildIpaTest_Mono (ApplePlatform platform, string runtimeIdentifiers)
{
BuildIpaTestImpl (platform, runtimeIdentifiers, useMonoRuntime: true);
}

[Test]
[TestCase (ApplePlatform.iOS, "ios-arm64")]
[TestCase (ApplePlatform.TVOS, "tvos-arm64")]
Expand Down Expand Up @@ -229,15 +221,6 @@ public void BuildPackageTest (string project, ApplePlatform platform, string run
Assert.That (pkgPath, Does.Exist, "pkg creation");
}

[TestCase (ApplePlatform.iOS, "ios-arm64")]
[TestCase (ApplePlatform.TVOS, "tvos-arm64")]
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")]
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64;maccatalyst-x64")]
public void PublishTest_Mono (ApplePlatform platform, string runtimeIdentifiers)
{
PublishTestImpl (platform, runtimeIdentifiers, useMonoRuntime: true);
}

[TestCase (ApplePlatform.iOS, "ios-arm64")]
[TestCase (ApplePlatform.TVOS, "tvos-arm64")]
[TestCase (ApplePlatform.MacCatalyst, "maccatalyst-arm64")]
Expand Down
Loading
Loading