Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
64cd8a8
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Apr 21, 2026
fbb0ade
Re-generate global.json for PR #25197: [net11.0] Update dependencies …
Apr 21, 2026
39144b5
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-bdac2…
rolfbjarne Apr 21, 2026
6599bf3
[tests] Update expected sizes.
rolfbjarne Apr 21, 2026
9bfed89
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Apr 24, 2026
29cfdc1
Re-generate global.json for PR #25197: [net11.0] Update dependencies …
Apr 24, 2026
1720e32
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Apr 25, 2026
8e20d60
Re-generate global.json for PR #25197: [net11.0] Update dependencies …
Apr 25, 2026
f4ce946
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Apr 26, 2026
cac3aea
Re-generate global.json for PR #25197: [net11.0] Update dependencies …
Apr 26, 2026
1ab36bd
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-bdac2…
rolfbjarne Apr 27, 2026
69e75e2
[tests] Update expected sizes.
rolfbjarne Apr 27, 2026
7c02f3b
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Apr 28, 2026
5c263c8
Re-generate global.json for PR #25197: [net11.0] Update dependencies …
Apr 28, 2026
23c2f62
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-bdac2…
rolfbjarne Apr 28, 2026
88e416b
[tests] Update expected sizes.
rolfbjarne Apr 28, 2026
cf32aa8
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-bdac2…
rolfbjarne Apr 28, 2026
cde1536
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Apr 29, 2026
f692308
Re-generate global.json for PR #25197: [net11.0] Update dependencies …
Apr 29, 2026
e40b72a
Merge remote-tracking branch 'origin/net11.0' into darc-net11.0-bdac2…
rolfbjarne Apr 29, 2026
2824bd7
[tests] Update expected sizes.
rolfbjarne Apr 29, 2026
996f72b
Build me
rolfbjarne Apr 29, 2026
9ec46aa
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Apr 30, 2026
6dbdbd6
Re-generate global.json for PR #25197: [net11.0] Update dependencies …
Apr 30, 2026
e5110b4
[msbuild] Add TrimmerRootAssembly for app extensions when OutputType …
rolfbjarne Apr 28, 2026
90c5639
[tests] Update expected sizes.
rolfbjarne Apr 30, 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 README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,4 @@ However, we provide links to older Xamarin.iOS and Mac packages for macOS downgr

Copyright (c) .NET Foundation Contributors. All rights reserved.
Licensed under the [MIT](https://github.com/dotnet/macios/blob/main/LICENSE) License.

5 changes: 4 additions & 1 deletion dotnet/targets/Xamarin.Shared.Sdk.targets
Original file line number Diff line number Diff line change
Expand Up @@ -1402,10 +1402,13 @@

<!-- https://github.com/dotnet/macios/issues/19037 -->
<!-- The trimmer will set the RootMode for the current assembly to 'EntryPoint', but that doesn't work for app extension projects, because those are library projects that don't have entry points.
So here we set RootMode=Library for these cases. -->
So here we set RootMode=Library for these cases.
Also, since app extensions have OutputType=Library, the trimmer won't add the current assembly to TrimmerRootAssembly at all (it's conditioned on OutputType != Library).
So we also need to add the current assembly as a root assembly if it hasn't been added already. -->
<Target Name="_FixRootAssemblyForAppExtensions" AfterTargets="PrepareForILLink" Condition="'$(IsAppExtension)' == 'true'">
<ItemGroup>
<TrimmerRootAssembly Update="@(TrimmerRootAssembly)" Condition=" '%(TrimmerRootAssembly.RootMode)' == 'EntryPoint' " RootMode="Library" />
<TrimmerRootAssembly Include="@(IntermediateAssembly->'%(Filename)')" RootMode="Library" Condition="'@(TrimmerRootAssembly)' == ''" />
</ItemGroup>
</Target>

Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet-dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26215.121</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26215.121</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26215.121</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26215.121</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.4.26215.121</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.4.26215.121</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.4.26215.121</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.4.26215.121</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.4.26215.121</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.4.26215.121</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26229.113</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26229.113</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26229.113</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26229.113</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>11.0.0-preview.5.26229.113</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-preview.5.26229.113</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-preview.5.26229.113</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.5.26229.113</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-preview.5.26229.113</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-preview.5.26229.113</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet-macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet100_264PackageVersion>26.4.10259</MicrosoftiOSSdknet100_264PackageVersion>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
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.4.26215.121">
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-preview.5.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.4.26215.121">
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-preview.5.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.4.26215.121">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-preview.5.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.4.26215.121">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-preview.5.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</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.4.26215.121">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-preview.5.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26215.121">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</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.26215.121">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26215.121">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.4.26215.121">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-preview.5.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</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.26215.121">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26229.113">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>ab01524bbb2ef1eea0ffaef161b3ef5686e8f256</Sha>
<Sha>4c4e7f410fc876590f219fc6022b6c18d6f6a475</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ stages:
displayName: Validate
inputs:
filePath: eng\common\sdk-task.ps1
arguments: -task SigningValidation -restore
arguments: -task SigningValidation -restore -msbuildEngine dotnet
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
/p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt'
${{ parameters.signingValidationAdditionalParameters }}
Expand Down
20 changes: 17 additions & 3 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,11 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
if ((-not $globalJsonHasRuntimes) -and (-not [string]::IsNullOrEmpty($env:DOTNET_INSTALL_DIR)) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
$dotnetRoot = $env:DOTNET_INSTALL_DIR
} else {
$dotnetRoot = Join-Path $RepoRoot '.dotnet'
if (-not [string]::IsNullOrEmpty($env:DOTNET_GLOBAL_INSTALL_DIR)) {
$dotnetRoot = $env:DOTNET_GLOBAL_INSTALL_DIR
} else {
$dotnetRoot = Join-Path $RepoRoot '.dotnet'
}

if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) {
if ($install) {
Expand Down Expand Up @@ -677,9 +681,19 @@ function InitializeToolset() {
}

$downloadArgs = @("package", "download", "Microsoft.DotNet.Arcade.Sdk@$toolsetVersion", "--verbosity", "minimal", "--prerelease", "--output", "$nugetCache")
if ($env:NUGET_CONFIG) {
$nugetConfig = $env:NUGET_CONFIG
if (-not $nugetConfig) {
# Search for any variation of nuget.config in the RepoRoot
$configFile = Get-ChildItem -Path $RepoRoot -File | Where-Object { $_.Name -ieq "nuget.config" } | Select-Object -First 1

if ($configFile) {
$nugetConfig = $configFile.FullName
}
}

if ($nugetConfig) {
$downloadArgs += "--configfile"
$downloadArgs += $env:NUGET_CONFIG
$downloadArgs += $nugetConfig
}
DotNet @downloadArgs

Expand Down
21 changes: 18 additions & 3 deletions eng/common/tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,11 @@ function InitializeDotNetCli {
if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
dotnet_root="$DOTNET_INSTALL_DIR"
else
dotnet_root="${repo_root}.dotnet"
if [[ -n "${DOTNET_GLOBAL_INSTALL_DIR:-}" ]]; then
dotnet_root="$DOTNET_GLOBAL_INSTALL_DIR"
else
dotnet_root="${repo_root}.dotnet"
fi

export DOTNET_INSTALL_DIR="$dotnet_root"

Expand Down Expand Up @@ -427,8 +431,19 @@ function InitializeToolset {
fi

local download_args=("package" "download" "Microsoft.DotNet.Arcade.Sdk@$toolset_version" "--verbosity" "minimal" "--prerelease" "--output" "$_GetNuGetPackageCachePath")
if [[ -n "${NUGET_CONFIG:-}" ]]; then
download_args+=("--configfile" "$NUGET_CONFIG")
local nuget_config="${NUGET_CONFIG:-}"
if [[ -z "$nuget_config" ]]; then
# Search for any variation of nuget.config in the RepoRoot
local found_config
found_config=$(find "$repo_root" -maxdepth 1 -type f -iname "nuget.config" -print -quit)

if [[ -n "$found_config" ]]; then
nuget_config="$found_config"
fi
fi

if [[ -n "$nuget_config" ]]; then
download_args+=("--configfile" "$nuget_config")
fi
DotNet "${download_args[@]}"

Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "11.0.100-preview.4.26215.121",
"version": "11.0.100-preview.5.26229.113",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "11.0.100-preview.4.26215.121"
"dotnet": "11.0.100-preview.5.26229.113"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26215.121"
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26229.113"
}
}
Loading
Loading